diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleMainPanel.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleMainPanel.java
index 2f41514fc7f9..8f715fd04cc5 100644
--- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleMainPanel.java
+++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleMainPanel.java
@@ -122,13 +122,20 @@ public class CodeStyleMainPanel extends JPanel implements TabbedLanguageCodeStyl
     JLabel link = new SwingActionLink(mySetFromAction);
     link.setVerticalAlignment(SwingConstants.BOTTOM);
 
-    JPanel top = new JPanel(new BorderLayout());
+    JPanel top = new JPanel();
+    top.setLayout(new BoxLayout(top, BoxLayout.X_AXIS));
+
     if (mySchemesPanelEnabled) {
-      top.add(BorderLayout.WEST, mySchemesPanel);
-      top.add(BorderLayout.EAST, link);
+      JPanel linkPanel = new JPanel();
+      linkPanel.setLayout(new BoxLayout(linkPanel, BoxLayout.Y_AXIS));
+      linkPanel.add(Box.createVerticalGlue());
+      linkPanel.add(link);
+      top.add(mySchemesPanel);
+      top.add(Box.createRigidArea(new Dimension(10,0)));
+      top.add(linkPanel);
     }
 
-    top.setBorder(JBUI.Borders.empty(10));
+    top.setBorder(JBUI.Borders.empty(10, 10, 0, 10));
     add(top, BorderLayout.NORTH);
     add(mySettingsPanel, BorderLayout.CENTER);
 
diff --git a/platform/lang-impl/src/com/intellij/application/options/schemes/AbstractSchemeActions.java b/platform/lang-impl/src/com/intellij/application/options/schemes/AbstractSchemeActions.java
index e3fde58fe04c..3b9b2cd74296 100644
--- a/platform/lang-impl/src/com/intellij/application/options/schemes/AbstractSchemeActions.java
+++ b/platform/lang-impl/src/com/intellij/application/options/schemes/AbstractSchemeActions.java
@@ -255,7 +255,7 @@ public abstract class AbstractSchemeActions<T extends Scheme> {
                                                    @NotNull Collection<String> actionNames,
                                                    @NotNull BiFunction<String, String, AnAction> createActionByName) {
     if (actionNames.size() == 1) {
-      return createActionByName.apply(ContainerUtil.getFirstItem(actionNames), groupName);
+      return createActionByName.apply(ContainerUtil.getFirstItem(actionNames), groupName + "...");
     } else {
       return new ImportExportActionGroup(groupName, actionNames) {
         @NotNull
diff --git a/platform/lang-impl/src/com/intellij/application/options/schemes/AbstractSchemesPanel.java b/platform/lang-impl/src/com/intellij/application/options/schemes/AbstractSchemesPanel.java
index 8f13caa5e24c..9d635fa56499 100644
--- a/platform/lang-impl/src/com/intellij/application/options/schemes/AbstractSchemesPanel.java
+++ b/platform/lang-impl/src/com/intellij/application/options/schemes/AbstractSchemesPanel.java
@@ -72,8 +72,9 @@ public abstract class AbstractSchemesPanel<T extends Scheme, InfoComponent exten
     mySchemesCombo = new EditableSchemesCombo<>(this);
     controlsPanel.add(mySchemesCombo.getComponent());
     myToolbar = createToolbar();
+    controlsPanel.add(Box.createRigidArea(new Dimension(6, 0)));
     controlsPanel.add(myToolbar);
-    controlsPanel.add(Box.createRigidArea(new Dimension(15, 0)));
+    controlsPanel.add(Box.createRigidArea(new Dimension(9, 0)));
     myInfoComponent = createInfoComponent();
     controlsPanel.add(myInfoComponent);
     controlsPanel.add(Box.createHorizontalGlue());
@@ -87,7 +88,7 @@ public abstract class AbstractSchemesPanel<T extends Scheme, InfoComponent exten
   
   private JComponent createToolbar() {
     DefaultActionGroup toolbarActionGroup = new DefaultActionGroup();
-    ActionToolbar toolbar = ActionManager.getInstance().createActionToolbar(ActionPlaces.TOOLBAR, toolbarActionGroup, true);
+    ActionToolbar toolbar = ActionManager.getInstance().createActionToolbar(ActionPlaces.NAVIGATION_BAR_TOOLBAR, toolbarActionGroup, true);
     JComponent toolbarComponent = toolbar.getComponent();
     toolbarActionGroup.add(new ShowSchemesActionsListAction(myActions.getActions(), toolbarComponent));
     toolbarComponent.setMaximumSize(new Dimension(toolbarComponent.getPreferredSize().width, Short.MAX_VALUE));
diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/FlatWelcomeFrame.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/FlatWelcomeFrame.java
index 3f3d3b47121e..c61f99c9dd26 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/FlatWelcomeFrame.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/FlatWelcomeFrame.java
@@ -872,7 +872,7 @@ public class FlatWelcomeFrame extends JFrame implements IdeFrame, Disposable, Ac
     actionsListPanel.add(pane, BorderLayout.CENTER);
 
     int width = (int)Math.min(Math.round(list.getPreferredSize().getWidth()), 200);
-    pane.setPreferredSize(JBUI.size(width, -1));
+    pane.setPreferredSize(JBUI.size(width + 14, -1));
 
     boolean singleProjectGenerator = list.getModel().getSize() == 1;
 
diff --git a/platform/platform-resources-en/src/messages/ApplicationBundle.properties b/platform/platform-resources-en/src/messages/ApplicationBundle.properties
index 0e385cfc5a53..405818f76add 100644
--- a/platform/platform-resources-en/src/messages/ApplicationBundle.properties
+++ b/platform/platform-resources-en/src/messages/ApplicationBundle.properties
@@ -766,16 +766,16 @@ label.rainbow.inheritance.tooltip=<html>''{0}->Semantic highlighting'' from<br>'
 
 color.scheme.reset=Reset
 color.scheme.reset.message=Reset the scheme to its default values?\nNote: all the changes you have made to the scheme will be lost.
-color.scheme.reset.title=Scheme Reset
+color.scheme.reset.title=Restore Defaults
 
 settings.code.style.reset.to.defaults.message=Change all code style settings to their default values?\nNote: all the changes you have made to the scheme will be lost.
-settings.code.style.reset.to.defaults.title=Scheme Reset
+settings.code.style.reset.to.defaults.title=Restore Defaults
 editor.settings.keep.trailing.spaces.on.caret.line=Always keep trailing spaces on caret line
 settings.editor.scheme.copy=Duplicate...
 settings.editor.scheme.delete=Delete...
-settings.editor.scheme.import=Import {0}...
-settings.editor.scheme.export=Export...
-settings.editor.scheme.reset=Reset...
+settings.editor.scheme.import=Import {0}
+settings.editor.scheme.export=Export
+settings.editor.scheme.reset=Restore Defaults...
 settings.editor.scheme.copy.to.project=Copy to Project...
 settings.editor.scheme.copy.to.ide=Copy to IDE...
 settings.editor.scheme.copy.to.ide.title=Copy Project Scheme to IDE
diff --git a/platform/vcs-log/impl/src/META-INF/vcs-log.xml b/platform/vcs-log/impl/src/META-INF/vcs-log.xml
index 276105ea63d5..e2cacfee9913 100644
--- a/platform/vcs-log/impl/src/META-INF/vcs-log.xml
+++ b/platform/vcs-log/impl/src/META-INF/vcs-log.xml
@@ -83,6 +83,7 @@
             use-shortcut-of="Diff.ShowDiff" text="Show Diff" description="Show diff with previous version"
             icon="AllIcons.Actions.Diff"/>
     <action class="com.intellij.vcs.log.ui.actions.history.ShowDiffWithLocalFromHistoryAction" id="Vcs.Log.ShowDiffWithLocal"
+            use-shortcut-of="Vcs.ShowDiffWithLocal"
             text="Show Diff with Local" description="Compare selected revision with the local version of the file"
             icon="AllIcons.Actions.DiffWithCurrent"/>
     <action class="com.intellij.vcs.log.ui.actions.history.CreatePatchFromHistoryAction" id="Vcs.Log.CreatePatchFromHistory"