diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/ContextMenuImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/ContextMenuImpl.java
index 6830e9470974..efa39784de67 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/ContextMenuImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/ContextMenuImpl.java
@@ -18,9 +18,7 @@ package com.intellij.openapi.editor.impl;
 import com.intellij.ide.DataManager;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.actionSystem.*;
-import com.intellij.openapi.actionSystem.ex.ActionButtonLook;
 import com.intellij.openapi.actionSystem.ex.ActionManagerEx;
-import com.intellij.openapi.actionSystem.impl.ActionButton;
 import com.intellij.openapi.actionSystem.impl.ActionToolbarImpl;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.editor.event.EditorMouseAdapter;
@@ -235,38 +233,11 @@ public class ContextMenuImpl extends JPanel implements Disposable {
     myTimer.start();
   }
 
-  private ActionToolbar createToolbar(final ActionGroup group) {
-    final ActionToolbarImpl actionToolbar =
-      new ActionToolbarImpl(ActionPlaces.CONTEXT_TOOLBAR, group, true, DataManager.getInstance(), ActionManagerEx.getInstanceEx(),
-                            KeymapManagerEx.getInstanceEx()) {
-
-        @Override
-        public ActionButton createToolbarButton(final AnAction action,
-                                                final ActionButtonLook look,
-                                                final String place,
-                                                final Presentation presentation,
-                                                final Dimension minimumSize) {
-          final ActionButton result = new ActionButton(action, presentation, place, minimumSize) {
-            @Override
-            public void paintComponent(final Graphics g) {
-              final ActionButtonLook look = getButtonLook();
-              look.paintBackground(g, this);
-              look.paintIcon(g, this, getIcon());
-            }
-          };
-
-          result.setLook(look);
-          return result;
-        }
-      };
-
-    actionToolbar.setTargetComponent(myEditor.getContentComponent());
-    return actionToolbar;
-  }
-
   private JComponent createComponent() {
-    myActionToolbar = createToolbar(myActionGroup);
-    myActionToolbar.setMinimumButtonSize(new Dimension(20, 20));
+    myActionToolbar = new ActionToolbarImpl(ActionPlaces.CONTEXT_TOOLBAR, myActionGroup, true,
+                                            DataManager.getInstance(), ActionManagerEx.getInstanceEx(), KeymapManagerEx.getInstanceEx());
+    myActionToolbar.setTargetComponent(myEditor.getContentComponent());
+    myActionToolbar.setMinimumButtonSize(new Dimension(22, 22));
     myActionToolbar.setReservePlaceAutoPopupIcon(false);
 
     ContextMenuPanel contextMenuPanel = new ContextMenuPanel(this);
@@ -283,7 +254,7 @@ public class ContextMenuImpl extends JPanel implements Disposable {
 
     private ContextMenuPanel(final ContextMenuImpl contextMenu) {
       myContextMenu = contextMenu;
-      setBorder(BorderFactory.createEmptyBorder(2, 2, 2, 2));
+      setBorder(BorderFactory.createEmptyBorder(1, 2, 1, 2));
       setOpaque(false);
     }
 
@@ -310,7 +281,7 @@ public class ContextMenuImpl extends JPanel implements Disposable {
       Rectangle r = getBounds();
       Graphics2D graphics = (Graphics2D)g.create();
       try {
-        graphics.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, myContextMenu.myCurrentOpacity / 500.0f));
+        graphics.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, myContextMenu.myCurrentOpacity / 600.0f));
         graphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
         graphics.setColor(Color.GRAY);
         graphics.fillRoundRect(0, 0, r.width - 1, r.height - 1, 6, 6);
diff --git a/platform/platform-resources/src/idea/PlatformActions.xml b/platform/platform-resources/src/idea/PlatformActions.xml
index 134583df1858..4a1aecd970fa 100644
--- a/platform/platform-resources/src/idea/PlatformActions.xml
+++ b/platform/platform-resources/src/idea/PlatformActions.xml
@@ -754,6 +754,7 @@
     <group id="EditorContextBarMenu">
       <action id="EditorToggleUseSoftWrapsInPreview" class="com.intellij.openapi.editor.actions.ToggleUseSoftWrapsInPreviewAction"
               icon="AllIcons.Actions.ToggleSoftWrap"/>
+      <separator/>
     </group>
 
     <group id="DirDiffMenu">