Bring back icon for configure item (in tool menu).

resources/images/images.properties

@@ -15,6 +15,7 @@ service.gui.DEFAULT_USER_PHOTO=resources/images/impl/gui/common/personPhoto.png
 # service gui icons
 service.gui.icons.ADD_ICON=resources/images/impl/gui/buttons/add.png
 service.gui.icons.ACCOUNT_ICON=resources/images/impl/gui/buttons/addAccount.png
+service.gui.icons.CONFIGURE_ICON=resources/images/impl/gui/common/configureIcon.png
 service.gui.icons.SHOW_HIDE_OFFLINE_ICON=resources/images/impl/gui/common/showHideOffline.png
 service.gui.icons.SOUND_MENU_ICON=resources/images/impl/gui/common/soundMenu.png
 service.gui.icons.QUICK_MENU_ADD_ICON=resources/images/impl/gui/buttons/addContactIcon.png
@@ -452,4 +453,4 @@ plugin.otr.FINISHED_ICON_16x16=resources/images/plugin/otr/finished16x16.png
 plugin.otr.FINISHED_ICON_22x22=resources/images/plugin/otr/finished22x22.png
 plugin.otr.HELP_ICON_15x15=resources/images/plugin/otr/help15x15.png
 plugin.otr.MENU_ITEM_ICON_16x16=resources/images/plugin/otr/otr_menu_icon.png
-plugin.otr.configform.ICON=resources/images/plugin/otr/otr_config_icon.png
+plugin.otr.configform.ICON=resources/images/plugin/otr/otr_config_icon.png

src/net/java/sip/communicator/impl/gui/main/menus/ToolsMenu.java

@@ -260,12 +260,14 @@ private boolean registerConfigMenuItemMacOSX()
     }
 
     /**
-     * Registers the settings item in the MacOS X menu.
+     * Registers the settings item for non-MacOS X OS.
      */
     private void registerConfigMenuItemNonMacOSX()
     {
         JMenuItem configMenuItem = new JMenuItem(
-            GuiActivator.getResources().getI18NString("service.gui.SETTINGS"));
+            GuiActivator.getResources().getI18NString("service.gui.SETTINGS"),
+            GuiActivator.getResources().getImage(
+                                "service.gui.icons.CONFIGURE_ICON"));
 
         this.add(configMenuItem);
         configMenuItem.setMnemonic(GuiActivator.getResources()