diff -r e816be79dee1 core.windows/src/org/netbeans/core/windows/view/ui/toolbars/Bundle.properties
--- a/core.windows/src/org/netbeans/core/windows/view/ui/toolbars/Bundle.properties	Tue Nov 22 13:17:20 2011 +0100
+++ b/core.windows/src/org/netbeans/core/windows/view/ui/toolbars/Bundle.properties	Wed Nov 23 11:44:50 2011 +0100
@@ -41,7 +41,8 @@
 # made subject to such option by the copyright holder.
 
 
-PROP_smallToolbarIcons=&Small Toolbar Icons
+#Small Icons Checkbox
+CTL_SmallIcons=&Small Toolbar Icons
 
 # ToolbarLayout
 EXC_wrongConstraints=cannot add to layout: does not use ToolbarConstraints
@@ -51,8 +52,6 @@
 #New Toolbar Button label
 CTL_NewToolbar=&New Toolbar...
 
-#Small Icons Checkbox
-CTL_SmallIcons=&Small Toolbar Icons
 
 #Drag and Drop hint
 CTL_TreeLabel=Drag items to or from the toolbars to add or remove them...
diff -r e816be79dee1 core.windows/src/org/netbeans/core/windows/view/ui/toolbars/ConfigureToolbarPanel.java
--- a/core.windows/src/org/netbeans/core/windows/view/ui/toolbars/ConfigureToolbarPanel.java	Tue Nov 22 13:17:20 2011 +0100
+++ b/core.windows/src/org/netbeans/core/windows/view/ui/toolbars/ConfigureToolbarPanel.java	Wed Nov 23 11:44:50 2011 +0100
@@ -99,6 +99,10 @@
     private ConfigureToolbarPanel() {
         initComponents();
         
+        if (checkSmallIcons.getText().isEmpty()) {
+            checkSmallIcons.setVisible(false);
+        }
+        
         setCursor( Cursor.getPredefinedCursor( Cursor.WAIT_CURSOR ) );
         
         FileObject paletteFolder = FileUtil.getConfigFile( "Actions" ); // NOI18N
diff -r e816be79dee1 core.windows/src/org/netbeans/core/windows/view/ui/toolbars/ToolbarConfiguration.java
--- a/core.windows/src/org/netbeans/core/windows/view/ui/toolbars/ToolbarConfiguration.java	Tue Nov 22 13:17:20 2011 +0100
+++ b/core.windows/src/org/netbeans/core/windows/view/ui/toolbars/ToolbarConfiguration.java	Wed Nov 23 11:44:50 2011 +0100
@@ -46,7 +46,6 @@
 
 import java.awt.Color;
 import java.awt.Component;
-import java.awt.Frame;
 import java.awt.GridLayout;
 import java.awt.Point;
 import java.awt.Rectangle;
@@ -76,7 +75,6 @@
 import org.netbeans.spi.settings.Saver;
 import org.openide.awt.Actions;
 import org.openide.awt.Mnemonics;
-import org.openide.windows.WindowManager;
 
 /** 
  * Toolbar configuration, it contains toolbar panel with a list of toolbar rows.
@@ -202,34 +200,37 @@
 
         //Bigger toolbar icons
         boolean smallToolbarIcons = (getToolbarPool().getPreferredIconSize() == 16);
+        final String stiName = NbBundle.getMessage(ToolbarConfiguration.class, "CTL_SmallIcons");
 
-        JCheckBoxMenuItem cbmi = new JCheckBoxMenuItem( NbBundle.getMessage(ToolbarConfiguration.class, "PROP_smallToolbarIcons"), smallToolbarIcons );
+        if (!stiName.isEmpty()) {
+            JCheckBoxMenuItem cbmi = new JCheckBoxMenuItem( stiName, smallToolbarIcons );
+            cbmi.addActionListener (new ActionListener () {
+                @Override
+                public void actionPerformed (ActionEvent ev) {
+                    if (ev.getSource() instanceof JCheckBoxMenuItem) {
+                        JCheckBoxMenuItem cb = (JCheckBoxMenuItem) ev.getSource();
+                        // toggle big/small icons
+                        boolean state = cb.getState();
+                        if (state) {
+                            ToolbarPool.getDefault().setPreferredIconSize(16);
+                        } else {
+                            ToolbarPool.getDefault().setPreferredIconSize(24);
+                        }
+                        //Rebuild toolbar panel
+                        //#43652: Find current toolbar configuration
+                        String name = ToolbarPool.getDefault().getConfiguration();
+                        ToolbarConfiguration tbConf = findConfiguration(name);
+                        if (tbConf != null) {
+                            tbConf.refresh();
+                        }
+                    }
+                }
+            });
+            cbmi.setEnabled( !fullScreen );
+            menu.add (cbmi);
+            menu.add( new JPopupMenu.Separator() );
+        }
 
-        cbmi.addActionListener (new ActionListener () {
-              public void actionPerformed (ActionEvent ev) {
-                  if (ev.getSource() instanceof JCheckBoxMenuItem) {
-                      JCheckBoxMenuItem cb = (JCheckBoxMenuItem) ev.getSource();
-                      // toggle big/small icons
-                      boolean state = cb.getState();
-                      if (state) {
-                          ToolbarPool.getDefault().setPreferredIconSize(16);
-                      } else {
-                          ToolbarPool.getDefault().setPreferredIconSize(24);
-                      }
-                      //Rebuild toolbar panel
-                      //#43652: Find current toolbar configuration
-                      String name = ToolbarPool.getDefault().getConfiguration();
-                      ToolbarConfiguration tbConf = findConfiguration(name);
-                      if (tbConf != null) {
-                          tbConf.refresh();
-                      }
-                  }
-              }
-        });
-        cbmi.setEnabled( !fullScreen );
-        menu.add (cbmi);
-
-        menu.add( new JPopupMenu.Separator() );
 
         JMenuItem menuItem = new JMenuItem( new ResetToolbarsAction() );
         menuItem.setEnabled( !fullScreen );