diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/CompilerPropertiesAction.java b/java/compiler/impl/src/com/intellij/compiler/impl/CompilerPropertiesAction.java
index 9024c0e6ddc4..5f1bf292cdd1 100644
--- a/java/compiler/impl/src/com/intellij/compiler/impl/CompilerPropertiesAction.java
+++ b/java/compiler/impl/src/com/intellij/compiler/impl/CompilerPropertiesAction.java
@@ -30,7 +30,7 @@ import com.intellij.openapi.project.Project;
 */
 class CompilerPropertiesAction extends AnAction {
   public CompilerPropertiesAction() {
-    super(CompilerBundle.message("action.compiler.properties.text"), null, AllIcons.General.IdeOptions);
+    super(CompilerBundle.message("action.compiler.properties.text"), null, AllIcons.General.Settings);
   }
 
   public void actionPerformed(AnActionEvent e) {
diff --git a/java/java-impl/src/com/intellij/slicer/SlicePanel.java b/java/java-impl/src/com/intellij/slicer/SlicePanel.java
index 29c97144e5cf..64e741d3bfab 100644
--- a/java/java-impl/src/com/intellij/slicer/SlicePanel.java
+++ b/java/java-impl/src/com/intellij/slicer/SlicePanel.java
@@ -379,7 +379,7 @@ public abstract class SlicePanel extends JPanel implements TypeSafeDataProvider,
 
   private final class MyRefreshAction extends RefreshAction {
     private MyRefreshAction(JComponent tree) {
-      super(IdeBundle.message("action.refresh"), IdeBundle.message("action.refresh"), AllIcons.Actions.Sync);
+      super(IdeBundle.message("action.refresh"), IdeBundle.message("action.refresh"), AllIcons.Actions.Refresh);
       registerShortcutOn(tree);
     }
 
diff --git a/platform/core-api/src/com/intellij/util/PlatformIcons.java b/platform/core-api/src/com/intellij/util/PlatformIcons.java
index af73f0a41e2d..e068cf66c207 100644
--- a/platform/core-api/src/com/intellij/util/PlatformIcons.java
+++ b/platform/core-api/src/com/intellij/util/PlatformIcons.java
@@ -82,8 +82,8 @@ public interface PlatformIcons {
   Icon SELECT_ALL_ICON = AllIcons.Actions.Selectall;
   Icon UNSELECT_ALL_ICON = AllIcons.Actions.Unselectall;
   Icon PROPERTIES_ICON = AllIcons.Actions.Properties;
-  Icon SYNCHRONIZE_ICON = AllIcons.Actions.Sync;
-  Icon SHOW_SETTINGS_ICON = AllIcons.Actions.ShowSettings;
+  Icon SYNCHRONIZE_ICON = AllIcons.Actions.Refresh;
+  Icon SHOW_SETTINGS_ICON = AllIcons.General.Settings;
 
   Icon CHECK_ICON = AllIcons.Actions.Checked;
   Icon CHECK_ICON_SELECTED = AllIcons.Actions.Checked_selected;
diff --git a/platform/icons/src/actions/refresh.png b/platform/icons/src/actions/refresh.png
index 66a23da6f741..d842736514bd 100644
Binary files a/platform/icons/src/actions/refresh.png and b/platform/icons/src/actions/refresh.png differ
diff --git a/platform/icons/src/actions/showSettings.png b/platform/icons/src/actions/showSettings.png
deleted file mode 100644
index bef176a3c0c7..000000000000
Binary files a/platform/icons/src/actions/showSettings.png and /dev/null differ
diff --git a/platform/icons/src/actions/sync.png b/platform/icons/src/actions/sync.png
deleted file mode 100644
index d842736514bd..000000000000
Binary files a/platform/icons/src/actions/sync.png and /dev/null differ
diff --git a/platform/icons/src/general/applicationSettings.png b/platform/icons/src/general/applicationSettings.png
deleted file mode 100644
index 6c97f600278c..000000000000
Binary files a/platform/icons/src/general/applicationSettings.png and /dev/null differ
diff --git a/platform/icons/src/general/ideOptions.png b/platform/icons/src/general/settings.png
similarity index 100%
rename from platform/icons/src/general/ideOptions.png
rename to platform/icons/src/general/settings.png
diff --git a/platform/icons/src/vcs/customizeView.png b/platform/icons/src/vcs/customizeView.png
deleted file mode 100644
index 003d6d06b2d9..000000000000
Binary files a/platform/icons/src/vcs/customizeView.png and /dev/null differ
diff --git a/platform/icons/src/vcs/refresh.png b/platform/icons/src/vcs/refresh.png
deleted file mode 100644
index d842736514bd..000000000000
Binary files a/platform/icons/src/vcs/refresh.png and /dev/null differ
diff --git a/platform/lang-impl/src/com/intellij/codeInspection/actions/CodeInspectionAction.java b/platform/lang-impl/src/com/intellij/codeInspection/actions/CodeInspectionAction.java
index cfc1cacc5a15..eedd675832e3 100644
--- a/platform/lang-impl/src/com/intellij/codeInspection/actions/CodeInspectionAction.java
+++ b/platform/lang-impl/src/com/intellij/codeInspection/actions/CodeInspectionAction.java
@@ -97,7 +97,7 @@ public class CodeInspectionAction extends BaseAnalysisAction {
         if (value instanceof Profile) {
           final Profile profile = (Profile)value;
           setText(profile.getName());
-          setIcon(profile.isLocal() ? AllIcons.General.ApplicationSettings : AllIcons.General.ProjectSettings);
+          setIcon(profile.isLocal() ? AllIcons.General.Settings : AllIcons.General.ProjectSettings);
         }
       }
     });
diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ex/EditInspectionToolsSettingsAction.java b/platform/lang-impl/src/com/intellij/codeInspection/ex/EditInspectionToolsSettingsAction.java
index ae61a13a2b17..b3984c20470b 100644
--- a/platform/lang-impl/src/com/intellij/codeInspection/ex/EditInspectionToolsSettingsAction.java
+++ b/platform/lang-impl/src/com/intellij/codeInspection/ex/EditInspectionToolsSettingsAction.java
@@ -113,6 +113,6 @@ public class EditInspectionToolsSettingsAction implements IntentionAction, Icona
   }
 
   public Icon getIcon(int flags) {
-    return AllIcons.General.IdeOptions;
+    return AllIcons.General.Settings;
   }
 }
diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsView.java b/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsView.java
index a1e6fcd113b1..661aa25c4160 100644
--- a/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsView.java
+++ b/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsView.java
@@ -788,7 +788,7 @@ public class InspectionResultsView extends JPanel implements Disposable, Occuren
   private class EditSettingsAction extends AnAction {
     private EditSettingsAction() {
       super(InspectionsBundle.message("inspection.action.edit.settings"), InspectionsBundle.message("inspection.action.edit.settings"),
-            AllIcons.General.IdeOptions);
+            AllIcons.General.Settings);
     }
 
     public void actionPerformed(AnActionEvent e) {
diff --git a/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java b/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java
index 20216091064c..5fea112a390b 100644
--- a/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java
+++ b/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java
@@ -151,7 +151,7 @@ class RunConfigurable extends BaseConfigurable {
           }
           else if (userObject instanceof String) {
             append((String) userObject, SimpleTextAttributes.REGULAR_BOLD_ATTRIBUTES);
-            setIcon(AllIcons.General.IdeOptions);
+            setIcon(AllIcons.General.Settings);
           }
           else if (userObject instanceof ConfigurationFactory) {
             append(((ConfigurationFactory)userObject).getName());
@@ -1265,7 +1265,7 @@ class RunConfigurable extends BaseConfigurable {
   private class MyEditDefaultsAction extends AnAction {
     public MyEditDefaultsAction() {
       super(ExecutionBundle.message("run.configuration.edit.default.configuration.settings.button"),
-            "Edit default settings", AllIcons.General.IdeOptions);
+            "Edit default settings", AllIcons.General.Settings);
     }
 
     public void actionPerformed(final AnActionEvent e) {
diff --git a/platform/lang-impl/src/com/intellij/find/actions/ShowUsagesAction.java b/platform/lang-impl/src/com/intellij/find/actions/ShowUsagesAction.java
index 2daa054cab0d..5b6d54edcbdc 100644
--- a/platform/lang-impl/src/com/intellij/find/actions/ShowUsagesAction.java
+++ b/platform/lang-impl/src/com/intellij/find/actions/ShowUsagesAction.java
@@ -498,7 +498,7 @@ public class ShowUsagesAction extends AnAction implements PopupAction {
     if (shortcut != null) {
       shortcutText = "(" + KeymapUtil.getShortcutText(shortcut) + ")";
     }
-    return new InplaceButton("Options..." + shortcutText, AllIcons.General.IdeOptions, new ActionListener() {
+    return new InplaceButton("Options..." + shortcutText, AllIcons.General.Settings, new ActionListener() {
       @Override
       public void actionPerformed(ActionEvent e) {
         SwingUtilities.invokeLater(new Runnable() {
diff --git a/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserBaseEx.java b/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserBaseEx.java
index baa7ca820ede..aa6d3628191d 100644
--- a/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserBaseEx.java
+++ b/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserBaseEx.java
@@ -610,7 +610,7 @@ public abstract class HierarchyBrowserBaseEx extends HierarchyBrowserBase implem
 
   protected class RefreshAction extends com.intellij.ide.actions.RefreshAction {
     public RefreshAction() {
-      super(IdeBundle.message("action.refresh"), IdeBundle.message("action.refresh"), AllIcons.Actions.Sync);
+      super(IdeBundle.message("action.refresh"), IdeBundle.message("action.refresh"), AllIcons.Actions.Refresh);
     }
 
     public final void actionPerformed(final AnActionEvent e) {
diff --git a/platform/lang-impl/src/com/intellij/ide/todo/SetTodoFilterAction.java b/platform/lang-impl/src/com/intellij/ide/todo/SetTodoFilterAction.java
index b09c1822c162..65475dda744d 100644
--- a/platform/lang-impl/src/com/intellij/ide/todo/SetTodoFilterAction.java
+++ b/platform/lang-impl/src/com/intellij/ide/todo/SetTodoFilterAction.java
@@ -79,7 +79,7 @@ public class SetTodoFilterAction extends AnAction implements CustomComponentActi
     group.addSeparator();
     group.add(
       new AnAction(IdeBundle.message("action.todo.edit.filters"),
-                   IdeBundle.message("action.todo.edit.filters"), AllIcons.General.IdeOptions) {
+                   IdeBundle.message("action.todo.edit.filters"), AllIcons.General.Settings) {
         public void actionPerformed(AnActionEvent e) {
           final ShowSettingsUtil util = ShowSettingsUtil.getInstance();
           util.editConfigurable(project, new TodoConfigurable());
diff --git a/platform/lang-impl/src/com/intellij/packageDependencies/ui/DependenciesPanel.java b/platform/lang-impl/src/com/intellij/packageDependencies/ui/DependenciesPanel.java
index 83b2f04b33c1..b21f6b7523df 100644
--- a/platform/lang-impl/src/com/intellij/packageDependencies/ui/DependenciesPanel.java
+++ b/platform/lang-impl/src/com/intellij/packageDependencies/ui/DependenciesPanel.java
@@ -622,7 +622,7 @@ public class DependenciesPanel extends JPanel implements Disposable, DataProvide
   private final class EditDependencyRulesAction extends AnAction {
     public EditDependencyRulesAction() {
       super(AnalysisScopeBundle.message("action.edit.rules"), AnalysisScopeBundle.message("action.edit.rules.description"),
-            AllIcons.General.IdeOptions);
+            AllIcons.General.Settings);
     }
 
     public void actionPerformed(AnActionEvent e) {
diff --git a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/InspectionToolsConfigurable.java b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/InspectionToolsConfigurable.java
index 60a0a287597a..393e25c81e80 100644
--- a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/InspectionToolsConfigurable.java
+++ b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/InspectionToolsConfigurable.java
@@ -303,7 +303,7 @@ public abstract class InspectionToolsConfigurable extends BaseConfigurable imple
         final String profileName = value.getName();
         setText(profileName);
         final SingleInspectionProfilePanel panel = getProfilePanel(value);
-        setIcon(panel != null && panel.isProfileShared() ? AllIcons.General.ProjectSettings : AllIcons.General.ApplicationSettings);
+        setIcon(panel != null && panel.isProfileShared() ? AllIcons.General.ProjectSettings : AllIcons.General.Settings);
       }
     });
     myProfiles.addActionListener(new ActionListener() {
diff --git a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/ProfilesComboBox.java b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/ProfilesComboBox.java
index da31f799b7cc..81197c11fa45 100644
--- a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/ProfilesComboBox.java
+++ b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/ProfilesComboBox.java
@@ -62,7 +62,7 @@ public class ProfilesComboBox extends JComboBox {
         if (value instanceof Profile) {
           final Profile profile = (Profile)value;
           setText(profile.getName());
-          setIcon(profile.isLocal() ? AllIcons.General.ApplicationSettings : AllIcons.General.ProjectSettings);
+          setIcon(profile.isLocal() ? AllIcons.General.Settings : AllIcons.General.ProjectSettings);
         }
         else if (value instanceof String) {
           setText((String)value);
diff --git a/platform/platform-api/src/com/intellij/ui/SimpleColoredComponent.java b/platform/platform-api/src/com/intellij/ui/SimpleColoredComponent.java
index 856298a4c811..2101f1921f43 100644
--- a/platform/platform-api/src/com/intellij/ui/SimpleColoredComponent.java
+++ b/platform/platform-api/src/com/intellij/ui/SimpleColoredComponent.java
@@ -460,7 +460,7 @@ public class SimpleColoredComponent extends JComponent implements Accessible {
     if (fragment.length() > 0) {
       builder.append("<span");
       formatStyle(builder, attributes);
-      builder.append('>').append(StringUtil.escapeXml(fragment)).append("</span>");
+      builder.append('>').append(convertFragment(fragment)).append("</span>");
     }
   }
 
@@ -468,10 +468,14 @@ public class SimpleColoredComponent extends JComponent implements Accessible {
     if (fragment.length() > 0) {
       builder.append("<a href=\"").append(StringUtil.replace(url, "\"", "%22")).append("\"");
       formatStyle(builder, attributes);
-      builder.append('>').append(StringUtil.escapeXml(fragment)).append("</a>");
+      builder.append('>').append(convertFragment(fragment)).append("</a>");
     }
   }
 
+  private static String convertFragment(String fragment) {
+    return StringUtil.escapeXml(fragment).replaceAll("\\\\n", "<br>");
+  }
+
   private static void formatStyle(final StringBuilder builder, final SimpleTextAttributes attributes) {
     final Color fgColor = attributes.getFgColor();
     final Color bgColor = attributes.getBgColor();
diff --git a/platform/platform-api/src/com/intellij/util/ui/StatusText.java b/platform/platform-api/src/com/intellij/util/ui/StatusText.java
index 7893f72c9c57..8b19e77c198d 100644
--- a/platform/platform-api/src/com/intellij/util/ui/StatusText.java
+++ b/platform/platform-api/src/com/intellij/util/ui/StatusText.java
@@ -124,7 +124,7 @@ public abstract class StatusText {
 
     Dimension size = myComponent.getPreferredSize();
     int x = (ownerRec.width - size.width) / 2;
-    int y = (ownerRec.height - size.height) / 2;
+    int y = (ownerRec.height - size.height) / 3;
     return new Rectangle(x, y, size.width, size.height);
   }
 
diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerMain.java b/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerMain.java
index 92069f917f3c..6fda64964eb3 100644
--- a/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerMain.java
+++ b/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerMain.java
@@ -549,7 +549,7 @@ public abstract class PluginManagerMain implements Disposable {
 
   protected class RefreshAction extends DumbAwareAction {
     public RefreshAction() {
-      super("Reload List of Plugins", "Reload list of plugins", AllIcons.Actions.Sync);
+      super("Reload List of Plugins", "Reload list of plugins", AllIcons.Actions.Refresh);
     }
 
     @Override
diff --git a/platform/platform-impl/src/com/intellij/internal/inspector/UiInspectorAction.java b/platform/platform-impl/src/com/intellij/internal/inspector/UiInspectorAction.java
index 2123be99e46e..3af9d5b30401 100644
--- a/platform/platform-impl/src/com/intellij/internal/inspector/UiInspectorAction.java
+++ b/platform/platform-impl/src/com/intellij/internal/inspector/UiInspectorAction.java
@@ -132,7 +132,7 @@ public class UiInspectorAction extends ToggleAction implements DumbAware {
 
       bar.addSeparator();
 
-      bar.add(new AbstractAction("Refresh", AllIcons.Actions.Sync) {
+      bar.add(new AbstractAction("Refresh", AllIcons.Actions.Refresh) {
         public void actionPerformed(ActionEvent e) {
           getCurrentTable().refresh();
         }
diff --git a/platform/platform-impl/src/com/intellij/notification/EventLogToolWindowFactory.java b/platform/platform-impl/src/com/intellij/notification/EventLogToolWindowFactory.java
index 2bfa794a0c2d..90609d07da5d 100644
--- a/platform/platform-impl/src/com/intellij/notification/EventLogToolWindowFactory.java
+++ b/platform/platform-impl/src/com/intellij/notification/EventLogToolWindowFactory.java
@@ -95,7 +95,7 @@ public class EventLogToolWindowFactory implements ToolWindowFactory, DumbAware {
     private final Project myProject;
 
     public EditNotificationSettings(Project project) {
-      super("Settings", "Edit notification settings", AllIcons.Actions.ShowSettings);
+      super("Settings", "Edit notification settings", AllIcons.General.Settings);
       myProject = project;
     }
 
diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/http/RefreshRemoteFileAction.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/http/RefreshRemoteFileAction.java
index 0354d25b5477..02108dd66999 100644
--- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/http/RefreshRemoteFileAction.java
+++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/http/RefreshRemoteFileAction.java
@@ -28,7 +28,7 @@ public class RefreshRemoteFileAction extends AnAction {
   private final HttpVirtualFile myFile;
 
   public RefreshRemoteFileAction(HttpVirtualFile file) {
-    super("Reload File", "", AllIcons.Actions.Sync);
+    super("Reload File", "", AllIcons.Actions.Refresh);
     myFile = file;
   }
 
diff --git a/platform/platform-resources/src/idea/LangActions.xml b/platform/platform-resources/src/idea/LangActions.xml
index 30442630f978..61afd9523fde 100644
--- a/platform/platform-resources/src/idea/LangActions.xml
+++ b/platform/platform-resources/src/idea/LangActions.xml
@@ -427,7 +427,7 @@
       <reference ref="ProjectViewPopupMenuRunGroup"/>
       <separator/>
       <reference ref="VersionControlsGroup"/>
-      <action id="SynchronizeCurrentFile" class="com.intellij.ide.actions.SynchronizeCurrentFileAction" icon="AllIcons.Actions.Sync"/>
+      <action id="SynchronizeCurrentFile" class="com.intellij.ide.actions.SynchronizeCurrentFileAction" icon="AllIcons.Actions.Refresh"/>
       <separator/>
       <action id="RevealIn" class="com.intellij.ide.actions.RevealFileAction"/>
       <reference ref="ShowFilePath"/>
diff --git a/platform/platform-resources/src/idea/PlatformActions.xml b/platform/platform-resources/src/idea/PlatformActions.xml
index d1cb91fecc37..0194b58651b6 100644
--- a/platform/platform-resources/src/idea/PlatformActions.xml
+++ b/platform/platform-resources/src/idea/PlatformActions.xml
@@ -144,7 +144,7 @@
         </group>
         <separator/>
         <group id="FileMainSettingsGroup">
-          <action id="ShowSettings" class="com.intellij.ide.actions.ShowSettingsAction" icon="AllIcons.General.IdeOptions"/>
+          <action id="ShowSettings" class="com.intellij.ide.actions.ShowSettingsAction" icon="AllIcons.General.Settings"/>
           <group id="FileOtherSettingsGroup" class="com.intellij.ide.actions.SmartPopupActionGroup">
              <action id="TemplateProjectProperties" class="com.intellij.ide.actions.TemplateProjectPropertiesAction"/>
              <group id="FileSettingsGroup"/>
@@ -157,7 +157,7 @@
           <action id="ImportSettings" class="com.intellij.ide.actions.ImportSettingsAction"/>
         </group>
         <separator/>
-        <action id="Synchronize" class="com.intellij.ide.actions.SynchronizeAction" icon="AllIcons.Actions.Sync"/>
+        <action id="Synchronize" class="com.intellij.ide.actions.SynchronizeAction" icon="AllIcons.Actions.Refresh"/>
         <action id="InvalidateCaches" class="com.intellij.ide.actions.InvalidateCachesAction"/>
         
         <group id="ChangeFileEncodingGroup" popup="true" class="com.intellij.openapi.vfs.encoding.ChangeEncodingUpdateGroup">
@@ -488,7 +488,7 @@
         icon="AllIcons.Actions.Delete"/>
       <separator/>
       <action id="FileChooser.Refresh" class="com.intellij.openapi.fileChooser.actions.RefreshFileChooserAction"
-        icon="AllIcons.Actions.Sync"/>
+        icon="AllIcons.Actions.Refresh"/>
       <separator/>
       <action id="FileChooser.ShowHiddens" class="com.intellij.openapi.fileChooser.actions.ShowHiddensAction"
         icon="AllIcons.Actions.ShowHiddens"/>
diff --git a/platform/platform-resources/src/idea/VcsActions.xml b/platform/platform-resources/src/idea/VcsActions.xml
index 187bcb86d9fb..a5e48bf85efb 100644
--- a/platform/platform-resources/src/idea/VcsActions.xml
+++ b/platform/platform-resources/src/idea/VcsActions.xml
@@ -74,7 +74,7 @@
 
     <group id="ChangesViewToolbar">
       <action id="ChangesView.Refresh" class="com.intellij.openapi.vcs.changes.actions.RefreshAction"
-              icon="AllIcons.Actions.Sync"/>
+              icon="AllIcons.Actions.Refresh"/>
       <action id="ChangesView.Commit" class="com.intellij.openapi.vcs.actions.CommonCheckinProjectAction"
               icon="AllIcons.Actions.Commit"/>
       <action id="ChangesView.Rollback" class="com.intellij.openapi.vcs.changes.actions.RollbackAction"
@@ -146,7 +146,7 @@
 
     <group id="CommittedChangesToolbar">
       <action id="CommittedChanges.Refresh" class="com.intellij.openapi.vcs.changes.committed.RefreshCommittedAction"
-              icon="AllIcons.Actions.Sync"/>
+              icon="AllIcons.Actions.Refresh"/>
       <action id="CommittedChanges.Filter" class="com.intellij.openapi.vcs.changes.committed.FilterCommittedAction"
               icon="AllIcons.Ant.Filter"/>
       <action id="CommittedChanges.Details" class="com.intellij.openapi.vcs.changes.committed.ChangeListDetailsAction"
diff --git a/platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java b/platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java
index 432dfc8bb4ad..be01f11697ec 100644
--- a/platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java
+++ b/platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java
@@ -47,7 +47,10 @@ import com.intellij.usageView.UsageViewBundle;
 import com.intellij.usageView.UsageViewManager;
 import com.intellij.usages.*;
 import com.intellij.usages.rules.*;
-import com.intellij.util.*;
+import com.intellij.util.Alarm;
+import com.intellij.util.Consumer;
+import com.intellij.util.EditSourceOnDoubleClickHandler;
+import com.intellij.util.Processor;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.TransferToEDTQueue;
 import com.intellij.util.messages.MessageBusConnection;
@@ -485,7 +488,7 @@ public class UsageViewImpl implements UsageView, UsageModelTracker.UsageModelTra
   }
 
   private AnAction showSettings() {
-    return new AnAction("Options...", "show find usages settings dialog", PlatformIcons.SHOW_SETTINGS_ICON) {
+    return new AnAction("Options...", "show find usages settings dialog", AllIcons.General.ProjectSettings) {
       {
         KeyboardShortcut shortcut = getShowUsagesWithSettingsShortcut();
         if (shortcut != null) {
diff --git a/platform/util/src/com/intellij/icons/AllIcons.java b/platform/util/src/com/intellij/icons/AllIcons.java
index efb32ac30e35..642414b5cbe0 100644
--- a/platform/util/src/com/intellij/icons/AllIcons.java
+++ b/platform/util/src/com/intellij/icons/AllIcons.java
@@ -65,6 +65,7 @@ public class AllIcons {
     public static final Icon FileStatus = IconLoader.getIcon("/actions/fileStatus.png"); // 16x16
     public static final Icon Filter_small = IconLoader.getIcon("/actions/filter_small.png"); // 16x16
     public static final Icon Find = IconLoader.getIcon("/actions/find.png"); // 16x16
+    public static final Icon ForceRefresh = IconLoader.getIcon("/actions/forceRefresh.png"); // 16x16
     public static final Icon Forward = IconLoader.getIcon("/actions/forward.png"); // 16x16
     public static final Icon GC = IconLoader.getIcon("/actions/gc.png"); // 16x16
     public static final Icon Get = IconLoader.getIcon("/actions/get.png"); // 16x16
@@ -122,7 +123,6 @@ public class AllIcons {
     public static final Icon ShowHiddens = IconLoader.getIcon("/actions/showHiddens.png"); // 16x16
     public static final Icon ShowImportStatements = IconLoader.getIcon("/actions/showImportStatements.png"); // 16x16
     public static final Icon ShowReadAccess = IconLoader.getIcon("/actions/showReadAccess.png"); // 16x16
-    public static final Icon ShowSettings = IconLoader.getIcon("/actions/showSettings.png"); // 16x16
     public static final Icon ShowSource = IconLoader.getIcon("/actions/showSource.png"); // 16x16
     public static final Icon ShowViewer = IconLoader.getIcon("/actions/showViewer.png"); // 16x16
     public static final Icon ShowWriteAccess = IconLoader.getIcon("/actions/showWriteAccess.png"); // 16x16
@@ -135,7 +135,6 @@ public class AllIcons {
     public static final Icon Submit1 = IconLoader.getIcon("/actions/submit1.png"); // 11x11
     public static final Icon Suspend = IconLoader.getIcon("/actions/suspend.png"); // 16x16
     public static final Icon SwapPanels = IconLoader.getIcon("/actions/swapPanels.png"); // 16x16
-    public static final Icon Sync = IconLoader.getIcon("/actions/sync.png"); // 16x16
     public static final Icon SyncPanels = IconLoader.getIcon("/actions/syncPanels.png"); // 16x16
     public static final Icon ToggleSoftWrap = IconLoader.getIcon("/actions/toggleSoftWrap.png"); // 16x16
     public static final Icon TraceInto = IconLoader.getIcon("/actions/traceInto.png"); // 16x16
@@ -337,7 +336,6 @@ public class AllIcons {
     public static final Icon Add = IconLoader.getIcon("/general/add.png"); // 16x16
     public static final Icon AddFavoritesList = IconLoader.getIcon("/general/addFavoritesList.png"); // 16x16
     public static final Icon AddJdk = IconLoader.getIcon("/general/addJdk.png"); // 16x16
-    public static final Icon ApplicationSettings = IconLoader.getIcon("/general/applicationSettings.png"); // 16x16
     public static final Icon ArrowDown = IconLoader.getIcon("/general/arrowDown.png"); // 7x6
     public static final Icon AutohideOff = IconLoader.getIcon("/general/autohideOff.png"); // 14x14
     public static final Icon AutohideOffInactive = IconLoader.getIcon("/general/autohideOffInactive.png"); // 14x14
@@ -398,7 +396,6 @@ public class AllIcons {
     public static final Icon HideRightPartHover = IconLoader.getIcon("/general/hideRightPartHover.png"); // 16x16
     public static final Icon HideToolWindow = IconLoader.getIcon("/general/hideToolWindow.png"); // 14x14
     public static final Icon HideToolWindowInactive = IconLoader.getIcon("/general/hideToolWindowInactive.png"); // 14x14
-    public static final Icon IdeOptions = IconLoader.getIcon("/general/ideOptions.png"); // 16x16
     public static final Icon IjLogo = IconLoader.getIcon("/general/ijLogo.png"); // 16x16
     public static final Icon ImplementingMethod = IconLoader.getIcon("/general/implementingMethod.png"); // 10x14
     public static final Icon InformationDialog = IconLoader.getIcon("/general/informationDialog.png"); // 32x32
@@ -440,6 +437,7 @@ public class AllIcons {
     public static final Icon RunWithCoverage = IconLoader.getIcon("/general/runWithCoverage.png"); // 16x16
     public static final Icon SecondaryGroup = IconLoader.getIcon("/general/secondaryGroup.png"); // 16x16
     public static final Icon SeparatorH = IconLoader.getIcon("/general/separatorH.png"); // 17x11
+    public static final Icon Settings = IconLoader.getIcon("/general/settings.png"); // 16x16
     public static final Icon Show_to_implement = IconLoader.getIcon("/general/show_to_implement.png"); // 16x16
     public static final Icon Show_to_override = IconLoader.getIcon("/general/show_to_override.png"); // 16x16
     public static final Icon SmallConfigurableVcs = IconLoader.getIcon("/general/smallConfigurableVcs.png"); // 16x16
@@ -1052,14 +1050,12 @@ public class AllIcons {
     public static final Icon Arrow_left = IconLoader.getIcon("/vcs/arrow_left.png"); // 12x12
     public static final Icon Arrow_right = IconLoader.getIcon("/vcs/arrow_right.png"); // 12x12
     public static final Icon CheckSpelling = IconLoader.getIcon("/vcs/checkSpelling.png"); // 16x16
-    public static final Icon CustomizeView = IconLoader.getIcon("/vcs/customizeView.png"); // 16x16
     public static final Icon Equal = IconLoader.getIcon("/vcs/equal.png"); // 12x12
     public static final Icon MapBase = IconLoader.getIcon("/vcs/mapBase.png"); // 16x16
     public static final Icon Merge = IconLoader.getIcon("/vcs/merge.png"); // 12x12
     public static final Icon MergeSourcesTree = IconLoader.getIcon("/vcs/mergeSourcesTree.png"); // 16x16
     public static final Icon MessageHistory = IconLoader.getIcon("/vcs/messageHistory.png"); // 16x16
     public static final Icon Not_equal = IconLoader.getIcon("/vcs/not_equal.png"); // 12x12
-    public static final Icon Refresh = IconLoader.getIcon("/vcs/refresh.png"); // 16x16
     public static final Icon Remove = IconLoader.getIcon("/vcs/remove.png"); // 16x16
     public static final Icon ResetStrip = IconLoader.getIcon("/vcs/resetStrip.png"); // 16x16
     public static final Icon StripDown = IconLoader.getIcon("/vcs/stripDown.png"); // 16x16
diff --git a/platform/util/src/com/intellij/openapi/util/IconLoader.java b/platform/util/src/com/intellij/openapi/util/IconLoader.java
index c26edf504eb5..4f4f01b1b07a 100644
--- a/platform/util/src/com/intellij/openapi/util/IconLoader.java
+++ b/platform/util/src/com/intellij/openapi/util/IconLoader.java
@@ -55,6 +55,14 @@ public final class IconLoader {
   static {
     ourDeprecatedIconsReplacements.put("/general/toolWindowDebugger.png", "AllIcons.Toolwindows.ToolWindowDebugger");
     ourDeprecatedIconsReplacements.put("/general/toolWindowChanges.png", "AllIcons.Toolwindows.ToolWindowChanges");
+
+    ourDeprecatedIconsReplacements.put("/actions/showSettings.png", "AllIcons.General.ProjectSettings");
+    ourDeprecatedIconsReplacements.put("/general/ideOptions.png", "AllIcons.General.Settings");
+    ourDeprecatedIconsReplacements.put("/general/applicationSettings.png", "AllIcons.General.Settings");
+    ourDeprecatedIconsReplacements.put("/vcs/customizeView.png", "AllIcons.General.Settings");
+
+    ourDeprecatedIconsReplacements.put("/vcs/refresh.png", "AllIcons.Actions.Refresh");
+    ourDeprecatedIconsReplacements.put("/actions/sync.png", "AllIcons.Actions.Refresh");
   }
 
   private static final ImageIcon EMPTY_ICON = new ImageIcon(new BufferedImage(1, 1, BufferedImage.TYPE_3BYTE_BGR)) {
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictNotificationPanel.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictNotificationPanel.java
index ae5654da7e9a..939cd982350a 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictNotificationPanel.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictNotificationPanel.java
@@ -74,7 +74,7 @@ public class ChangelistConflictNotificationPanel extends EditorNotificationPanel
 
 //    setBorder(BorderFactory.createEmptyBorder(0, 4, 0, 0));
 
-    myLinksPanel.add(new InplaceButton("Show options dialog", AllIcons.General.IdeOptions, new ActionListener() {
+    myLinksPanel.add(new InplaceButton("Show options dialog", AllIcons.General.Settings, new ActionListener() {
       public void actionPerformed(ActionEvent e) {
 
         ShowSettingsUtil.getInstance().editConfigurable(myTracker.getProject(),
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchDifferentiatedDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchDifferentiatedDialog.java
index 307640fdd626..5e7246955838 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchDifferentiatedDialog.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchDifferentiatedDialog.java
@@ -420,7 +420,7 @@ public class ApplyPatchDifferentiatedDialog extends DialogWrapper {
       group.add(new ResetStrip());
       group.add(new ZeroStrip());
       if (myCanChangePatchFile) {
-        group.add(new AnAction("Refresh", "Refresh", AllIcons.Actions.Sync) {
+        group.add(new AnAction("Refresh", "Refresh", AllIcons.Actions.Refresh) {
           @Override
           public void actionPerformed(AnActionEvent e) {
             queueRequest();
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/MultipleChangeListBrowser.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/MultipleChangeListBrowser.java
index 223b19fc873d..fedc1ef48a4a 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/MultipleChangeListBrowser.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/MultipleChangeListBrowser.java
@@ -322,7 +322,7 @@ public class MultipleChangeListBrowser extends ChangesBrowser {
     }
 
     public void addToolbarActions(final DialogWrapper dialogWrapper) {
-      final Icon icon = AllIcons.Actions.Sync;
+      final Icon icon = AllIcons.Actions.Refresh;
       if (myBrowser.myChangesToDisplay == null) {
         myBrowser.addToolbarAction(new AnAction("Refresh Changes") {
           @Override
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java
index db1c7fb04a24..b4f3038e1957 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java
@@ -1663,7 +1663,7 @@ public class FileHistoryPanelImpl extends PanelWithActionsAndCloseButton {
 
   private class RefreshFileHistoryAction extends AnAction implements DumbAware {
     public RefreshFileHistoryAction() {
-      super(VcsBundle.message("action.name.refresh"), VcsBundle.message("action.desctiption.refresh"), AllIcons.Actions.Sync);
+      super(VcsBundle.message("action.name.refresh"), VcsBundle.message("action.desctiption.refresh"), AllIcons.Actions.Refresh);
     }
 
     public void actionPerformed(AnActionEvent e) {
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/telemetry/UpdateTelemetryViewAction.java b/plugins/InspectionGadgets/src/com/siyeh/ig/telemetry/UpdateTelemetryViewAction.java
index 6444573caa21..3c5300559258 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/telemetry/UpdateTelemetryViewAction.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/telemetry/UpdateTelemetryViewAction.java
@@ -31,7 +31,7 @@ class UpdateTelemetryViewAction extends AnAction {
     super(CommonBundle.message("action.refresh"),
           InspectionGadgetsBundle.message(
             "action.telemetry.refresh.description"),
-          AllIcons.Actions.Sync);
+          AllIcons.Actions.Refresh);
     this.telemetry = telemetry;
     this.telemetryDisplay = telemetryDisplay;
   }
diff --git a/plugins/android/resources/icons/AndroidIcons.java b/plugins/android/resources/icons/AndroidIcons.java
index c7ee2b651418..d933140d571b 100644
--- a/plugins/android/resources/icons/AndroidIcons.java
+++ b/plugins/android/resources/icons/AndroidIcons.java
@@ -18,8 +18,6 @@ public class AndroidIcons {
   public static final Icon AndroidPreview = load("/icons/androidPreview.png"); // 16x16
   public static final Icon AndroidToolWindow = load("/icons/androidToolWindow.png"); // 13x13
   public static final Icon AttachDebugger = load("/icons/attachDebugger.png"); // 16x16
-  public static final Icon RefreshPreview = load("/icons/refreshPreview.png"); // 16x16
-  public static final Icon RestartLogcat = load("/icons/restartLogcat.png"); // 16x16
   public static final Icon ZoomActual = load("/icons/zoomActual.png"); // 16x16
   public static final Icon ZoomFit = load("/icons/zoomFit.png"); // 16x16
   public static final Icon ZoomIn = load("/icons/zoomIn.png"); // 16x16
diff --git a/plugins/android/resources/icons/refreshPreview.png b/plugins/android/resources/icons/refreshPreview.png
deleted file mode 100644
index 19efff9c1caf..000000000000
Binary files a/plugins/android/resources/icons/refreshPreview.png and /dev/null differ
diff --git a/plugins/android/resources/icons/restartLogcat.png b/plugins/android/resources/icons/restartLogcat.png
deleted file mode 100644
index 19efff9c1caf..000000000000
Binary files a/plugins/android/resources/icons/restartLogcat.png and /dev/null differ
diff --git a/plugins/android/src/org/jetbrains/android/logcat/AndroidLogcatToolWindowView.java b/plugins/android/src/org/jetbrains/android/logcat/AndroidLogcatToolWindowView.java
index e97c7ba128d9..3bb2ec251156 100644
--- a/plugins/android/src/org/jetbrains/android/logcat/AndroidLogcatToolWindowView.java
+++ b/plugins/android/src/org/jetbrains/android/logcat/AndroidLogcatToolWindowView.java
@@ -22,6 +22,7 @@ import com.intellij.CommonBundle;
 import com.intellij.diagnostic.logging.LogConsoleBase;
 import com.intellij.diagnostic.logging.LogConsoleListener;
 import com.intellij.facet.ProjectFacetManager;
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.application.ApplicationManager;
@@ -38,7 +39,6 @@ import com.intellij.ui.CollectionListModel;
 import com.intellij.ui.ListCellRendererWrapper;
 import com.intellij.ui.components.JBList;
 import com.intellij.util.IconUtil;
-import icons.AndroidIcons;
 import org.jetbrains.android.facet.AndroidFacet;
 import org.jetbrains.android.sdk.AndroidPlatform;
 import org.jetbrains.android.util.AndroidBundle;
@@ -457,7 +457,7 @@ public abstract class AndroidLogcatToolWindowView implements Disposable {
   private class MyRestartAction extends AnAction {
     public MyRestartAction() {
       super(AndroidBundle.message("android.restart.logcat.action.text"), AndroidBundle.message("android.restart.logcat.action.description"),
-            AndroidIcons.RestartLogcat);
+            AllIcons.Actions.Restart);
     }
 
     @Override
diff --git a/plugins/android/src/org/jetbrains/android/uipreview/AndroidLayoutPreviewToolWindowForm.java b/plugins/android/src/org/jetbrains/android/uipreview/AndroidLayoutPreviewToolWindowForm.java
index ea2e601d027d..7ad67e30dc47 100644
--- a/plugins/android/src/org/jetbrains/android/uipreview/AndroidLayoutPreviewToolWindowForm.java
+++ b/plugins/android/src/org/jetbrains/android/uipreview/AndroidLayoutPreviewToolWindowForm.java
@@ -27,6 +27,7 @@ import com.android.resources.ScreenSize;
 import com.android.resources.UiMode;
 import com.android.sdklib.IAndroidTarget;
 import com.android.sdklib.SdkConstants;
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.actionSystem.ex.CheckboxAction;
@@ -1320,7 +1321,7 @@ class AndroidLayoutPreviewToolWindowForm implements Disposable {
 
   private class MyRefreshAction extends AnAction {
     MyRefreshAction() {
-      super(AndroidBundle.message("android.layout.preview.refresh.action.text"), null, AndroidIcons.RefreshPreview);
+      super(AndroidBundle.message("android.layout.preview.refresh.action.text"), null, AllIcons.Actions.Refresh);
     }
 
     @Override
diff --git a/plugins/git4idea/src/git4idea/history/wholeTree/GitLogUI.java b/plugins/git4idea/src/git4idea/history/wholeTree/GitLogUI.java
index 0a6bbcd5a685..531e6da70be6 100644
--- a/plugins/git4idea/src/git4idea/history/wholeTree/GitLogUI.java
+++ b/plugins/git4idea/src/git4idea/history/wholeTree/GitLogUI.java
@@ -1512,7 +1512,7 @@ public class GitLogUI implements Disposable {
 
   private class MyRefreshAction extends DumbAwareAction {
     private MyRefreshAction() {
-      super("Refresh", "Refresh", AllIcons.Actions.Sync);
+      super("Refresh", "Refresh", AllIcons.Actions.Refresh);
     }
 
     @Override
diff --git a/plugins/git4idea/src/git4idea/push/GitManualPushToBranch.java b/plugins/git4idea/src/git4idea/push/GitManualPushToBranch.java
index 1f20c1b4d4b1..f21ce637c702 100644
--- a/plugins/git4idea/src/git4idea/push/GitManualPushToBranch.java
+++ b/plugins/git4idea/src/git4idea/push/GitManualPushToBranch.java
@@ -16,10 +16,10 @@
 package git4idea.push;
 
 import com.intellij.icons.AllIcons;
-import com.intellij.ui.ListCellRendererWrapper;
 import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.actionSystem.impl.ActionButton;
 import com.intellij.openapi.project.DumbAwareAction;
+import com.intellij.ui.ListCellRendererWrapper;
 import com.intellij.ui.components.JBLabel;
 import com.intellij.util.ui.GridBag;
 import com.intellij.util.ui.UIUtil;
@@ -238,7 +238,7 @@ class GitManualPushToBranch extends JPanel {
   private abstract static class GitPushLogRefreshAction extends DumbAwareAction {
     
     GitPushLogRefreshAction() {
-      super("Refresh commit list", "Refresh commit list", AllIcons.Actions.Sync);
+      super("Refresh commit list", "Refresh commit list", AllIcons.Actions.Refresh);
     }
   }
   
diff --git a/plugins/gradle/src/META-INF/plugin.xml b/plugins/gradle/src/META-INF/plugin.xml
index 06a7b7e495d0..56ff58292145 100644
--- a/plugins/gradle/src/META-INF/plugin.xml
+++ b/plugins/gradle/src/META-INF/plugin.xml
@@ -111,7 +111,7 @@
     
     <!-- Tool window toolbar actions -->
     <action id="Gradle.LinkToProject" class="org.jetbrains.plugins.gradle.action.GradleLinkToProjectAction"/>
-    <action id="Gradle.RefreshProject" class="org.jetbrains.plugins.gradle.action.GradleRefreshProjectAction" icon="AllIcons.Actions.Sync"/>
+    <action id="Gradle.RefreshProject" class="org.jetbrains.plugins.gradle.action.GradleRefreshProjectAction" icon="AllIcons.Actions.Refresh"/>
     <action id="Gradle.OpenScript" class="org.jetbrains.plugins.gradle.action.GradleOpenScriptAction" icon="GradleIcons.GradleNavigate"/>
     <action id="Gradle.Help.ToolWindow" class="org.jetbrains.plugins.gradle.action.GradleToolWindowHelpAction" icon="AllIcons.Actions.Help"/>
     <group id="Gradle.ChangeActionsToolbar">
diff --git a/plugins/groovy/resources/icons/JetgroovyIcons.java b/plugins/groovy/resources/icons/JetgroovyIcons.java
index 8d3d834ec354..83797926a772 100644
--- a/plugins/groovy/resources/icons/JetgroovyIcons.java
+++ b/plugins/groovy/resources/icons/JetgroovyIcons.java
@@ -52,7 +52,6 @@ public class JetgroovyIcons {
     public static final Icon Domain_class = load("/icons/mvc/domain_class.png"); // 16x16
     public static final Icon Groovy_mvc_plugin = load("/icons/mvc/groovy_mvc_plugin.png"); // 16x16
     public static final Icon ModelsNode = load("/icons/mvc/modelsNode.png"); // 16x16
-    public static final Icon Refresh = load("/icons/mvc/refresh.png"); // 16x16
     public static final Icon Service = load("/icons/mvc/service.png"); // 16x16
 
   }
diff --git a/plugins/groovy/resources/icons/mvc/refresh.png b/plugins/groovy/resources/icons/mvc/refresh.png
deleted file mode 100644
index 94c078976ca6..000000000000
Binary files a/plugins/groovy/resources/icons/mvc/refresh.png and /dev/null differ
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/griffon/UpdateGriffonSettingsAction.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/griffon/UpdateGriffonSettingsAction.java
index 4ec38bfc6437..b8c06364f837 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/griffon/UpdateGriffonSettingsAction.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/griffon/UpdateGriffonSettingsAction.java
@@ -14,9 +14,9 @@
  */
 package org.jetbrains.plugins.groovy.griffon;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.module.Module;
-import icons.JetgroovyIcons;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.plugins.groovy.mvc.MvcActionBase;
 import org.jetbrains.plugins.groovy.mvc.MvcFramework;
@@ -38,7 +38,7 @@ public class UpdateGriffonSettingsAction extends MvcActionBase {
 
   @Override
   protected void updateView(AnActionEvent event, @NotNull MvcFramework framework, @NotNull Module module) {
-    event.getPresentation().setIcon(JetgroovyIcons.Mvc.Refresh);
+    event.getPresentation().setIcon(AllIcons.Actions.Refresh);
   }
 
 }
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenProjectsNavigator.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenProjectsNavigator.java
index a85bf4029cfa..cc2780775463 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenProjectsNavigator.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenProjectsNavigator.java
@@ -61,7 +61,7 @@ public class MavenProjectsNavigator extends MavenSimpleProjectComponent implemen
   public static final String TOOL_WINDOW_ID = "Maven Projects";
 
   private static final URL ADD_ICON_URL = MavenProjectsNavigator.class.getResource("/general/add.png");
-  private static final URL SYNC_ICON_URL = MavenProjectsNavigator.class.getResource("/actions/sync.png");
+  private static final URL SYNC_ICON_URL = MavenProjectsNavigator.class.getResource("/actions/refresh.png");
 
   private MavenProjectsNavigatorState myState = new MavenProjectsNavigatorState();
 
@@ -267,6 +267,7 @@ public class MavenProjectsNavigator extends MavenSimpleProjectComponent implemen
         }
       }
     };
+    myTree.getEmptyText().clear();
 
     myTree.getSelectionModel().setSelectionMode(TreeSelectionModel.DISCONTIGUOUS_TREE_SELECTION);
   }
diff --git a/plugins/maven/src/main/resources/META-INF/plugin.xml b/plugins/maven/src/main/resources/META-INF/plugin.xml
index 24abf8909f56..42a0ba8cca26 100644
--- a/plugins/maven/src/main/resources/META-INF/plugin.xml
+++ b/plugins/maven/src/main/resources/META-INF/plugin.xml
@@ -167,12 +167,12 @@
   <actions>
     <action id="Maven.Reimport" class="org.jetbrains.idea.maven.project.actions.ReimportAction"
             text="Reimport All Maven Projects"
-            icon="AllIcons.Actions.Sync">
+            icon="AllIcons.Actions.Refresh">
     </action>
 
     <action id="Maven.ReimportProject" class="org.jetbrains.idea.maven.project.actions.ReimportProjectAction"
             text="Reimport" description="Reimport selected Maven projects"
-            icon="AllIcons.Actions.Sync">
+            icon="AllIcons.Actions.Refresh">
     </action>
 
     <action id="Maven.UpdateFolders" class="org.jetbrains.idea.maven.project.actions.UpdateFoldersAction"
@@ -270,7 +270,7 @@
     <action id="Maven.ShowSettings"
             class="org.jetbrains.idea.maven.project.actions.EditSettingsAction" text="Maven Settings"
             description="Edit Maven integration settings for the current project"
-            icon="AllIcons.Actions.ShowSettings">
+            icon="AllIcons.General.ProjectSettings">
     </action>
 
     <action id="Maven.ToggleOffline"
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/PropertiesComponent.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/PropertiesComponent.java
index 148845c59565..faf364432219 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/PropertiesComponent.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/PropertiesComponent.java
@@ -241,7 +241,7 @@ public class PropertiesComponent extends JPanel {
     public void update(AnActionEvent e) {
       e.getPresentation().setText("Refresh");
       e.getPresentation().setDescription("Reload properties");
-      e.getPresentation().setIcon(AllIcons.Actions.Sync);
+      e.getPresentation().setIcon(AllIcons.Actions.Refresh);
       e.getPresentation().setEnabled(myFile != null);
     }
 
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/RepositoryBrowserDialog.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/RepositoryBrowserDialog.java
index 02b124f5f520..64d4afd743c3 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/RepositoryBrowserDialog.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/RepositoryBrowserDialog.java
@@ -364,14 +364,14 @@ public class RepositoryBrowserDialog extends DialogWrapper {
     private final RepositoryBrowserComponent myBrowserComponent;
 
     public RefreshAction(final RepositoryBrowserComponent browserComponent) {
-      super(SvnBundle.message("action.name.refresh"), SvnBundle.message("repository.browser.refresh.action"), AllIcons.Actions.Sync);
+      super(SvnBundle.message("action.name.refresh"), SvnBundle.message("repository.browser.refresh.action"), AllIcons.Actions.Refresh);
       myBrowserComponent = browserComponent;
     }
 
     public void update(AnActionEvent e) {
       e.getPresentation().setText(SvnBundle.message("action.name.refresh"));
       e.getPresentation().setDescription(SvnBundle.message("repository.browser.refresh.action"));
-      e.getPresentation().setIcon(AllIcons.Actions.Sync);
+      e.getPresentation().setIcon(AllIcons.Actions.Refresh);
       e.getPresentation().setEnabled(myBrowserComponent.getSelectedNode() != null);
     }
 
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/RootsAndBranches.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/RootsAndBranches.java
index 5aa17e101b8f..b0733e38717e 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/RootsAndBranches.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/RootsAndBranches.java
@@ -441,7 +441,7 @@ public class RootsAndBranches implements CommittedChangeListDecorator {
   private class MyRefresh extends AnAction {
     private MyRefresh() {
       super(SvnBundle.message("committed.changes.action.merge.highlighting.refresh.text"),
-            SvnBundle.message("committed.changes.action.merge.highlighting.refresh.description"), AllIcons.Actions.Sync);
+            SvnBundle.message("committed.changes.action.merge.highlighting.refresh.description"), AllIcons.Actions.Refresh);
     }
 
     @Override
diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/ConfigureServersAction.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/ConfigureServersAction.java
index c5debd3a612d..2b15724fcc6d 100644
--- a/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/ConfigureServersAction.java
+++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/ConfigureServersAction.java
@@ -12,7 +12,7 @@ import com.intellij.tasks.config.TaskRepositoriesConfigurable;
 public class ConfigureServersAction extends BaseTaskAction {
 
   public ConfigureServersAction() {
-    super("Configure Servers...", null, AllIcons.General.IdeOptions);
+    super("Configure Servers...", null, AllIcons.General.Settings);
   }
 
   @Override