diff --git a/GUI/src/main/java/cz/fidentis/analyst/registration/RegistrationPanel.java b/GUI/src/main/java/cz/fidentis/analyst/registration/RegistrationPanel.java
index 2efbe1f21312cbbce6735c32f7b95b7dd4b69729..217e073af1e8932479dc47b50e8547f2433e7bc5 100644
--- a/GUI/src/main/java/cz/fidentis/analyst/registration/RegistrationPanel.java
+++ b/GUI/src/main/java/cz/fidentis/analyst/registration/RegistrationPanel.java
@@ -18,7 +18,7 @@ public class RegistrationPanel extends ControlPanel {
     /*
      * Mandatory design elements
      */
-    public static final String ICON = "distance28x28.png";
+    public static final String ICON = "registration28x28.png";
     public static final String NAME = "Registration";
     
     public static final double TRANSFORMATION_FINESS = 1.0;
diff --git a/GUI/src/main/java/cz/fidentis/analyst/toolbar/RenderingToolBar.java b/GUI/src/main/java/cz/fidentis/analyst/toolbar/RenderingToolBar.java
index a287d213d87f65abf4af7f0bb14f1c9bc62a7582..3d8464133ce5bc2d9472f960efecf3462fca2d9a 100644
--- a/GUI/src/main/java/cz/fidentis/analyst/toolbar/RenderingToolBar.java
+++ b/GUI/src/main/java/cz/fidentis/analyst/toolbar/RenderingToolBar.java
@@ -31,7 +31,7 @@ public class RenderingToolBar extends JToolBar {
     public static final String POINTS_BUTTON_ICON = "points-tri28x28.png";
     public static final String PRIMARY_FACE_BUTTON_ICON = "primaryFace28x28.png";
     public static final String SECONDARY_FACE_BUTTON_ICON = "secondaryFace28x28.png";
-    //public static final String FEATURE_POINTS_BUTTON_ICON = "wireframe-tri28x28.png";
+    public static final String FEATURE_POINTS_BUTTON_ICON = "fps28x28.png";
         
     private final Canvas canvas;
     
@@ -149,9 +149,9 @@ public class RenderingToolBar extends JToolBar {
         JToggleButton button = new JToggleButton();
         button.addActionListener(new RenderingModeAction(canvas));
         button.setActionCommand(RenderingModeAction.ACTION_COMMAND_SHOW_HIDE_FEATURE_POINTS);
-        //button.setIcon(new ImageIcon(getClass().getResource("/" + RenderingToolBar.FEATURE_POINTS_BUTTON_ICON)));
-        button.setToolTipText(NbBundle.getMessage(RenderingToolBar.class, "RenderingToolBar.secondaryfaces.text"));
-        button.setText("FPs");
+        button.setIcon(new ImageIcon(getClass().getResource("/" + RenderingToolBar.FEATURE_POINTS_BUTTON_ICON)));
+        button.setToolTipText(NbBundle.getMessage(RenderingToolBar.class, "RenderingToolBar.featurepoints.text"));
+        //button.setText("FPs");
         button.setSelected(true);
         button.setFocusable(false);
         add(button);
diff --git a/GUI/src/main/resources/cz/fidentis/analyst/toolbar/Bundle.properties b/GUI/src/main/resources/cz/fidentis/analyst/toolbar/Bundle.properties
index aadc7b5b49c15e99edc0a34836fe4c077bc890b4..41b6952bd0b6c1c0879cd4965227aa92e97ba4ef 100644
--- a/GUI/src/main/resources/cz/fidentis/analyst/toolbar/Bundle.properties
+++ b/GUI/src/main/resources/cz/fidentis/analyst/toolbar/Bundle.properties
@@ -10,4 +10,5 @@ FaceToFaceToolBar.distance.text=distance
 FaceToFaceToolBar.registration.text=registration
 RenderingToolBar.primaryface.text=show/hide the primary face
 RenderingToolBar.secondaryfaces.text=show/hide secondary faces
+RenderingToolBar.featurepoints.text=feature points
 
diff --git a/GUI/src/main/resources/fps.png b/GUI/src/main/resources/fps.png
new file mode 100644
index 0000000000000000000000000000000000000000..eb7be7593d038a4c88b2eed57cfc15b92198815c
Binary files /dev/null and b/GUI/src/main/resources/fps.png differ
diff --git a/GUI/src/main/resources/fps28x28.png b/GUI/src/main/resources/fps28x28.png
new file mode 100644
index 0000000000000000000000000000000000000000..a75503f5c8dda6a0f70067ff6c01ae4bb5eec0c1
Binary files /dev/null and b/GUI/src/main/resources/fps28x28.png differ
diff --git a/GUI/src/main/resources/registration.png b/GUI/src/main/resources/registration.png
new file mode 100644
index 0000000000000000000000000000000000000000..61649fe0169af68ddba3862c00b3ccfc143af908
Binary files /dev/null and b/GUI/src/main/resources/registration.png differ
diff --git a/GUI/src/main/resources/registration28x28.png b/GUI/src/main/resources/registration28x28.png
new file mode 100644
index 0000000000000000000000000000000000000000..4d8ac9b98f06318849ef45a598ad3fcf71f0f01e
Binary files /dev/null and b/GUI/src/main/resources/registration28x28.png differ