diff --git a/plugins/ui-designer-core/src/com/intellij/designer/AbstractToolWindowManager.java b/plugins/ui-designer-core/src/com/intellij/designer/AbstractToolWindowManager.java
index 02a4aaef0c66..32fa57b199c1 100644
--- a/plugins/ui-designer-core/src/com/intellij/designer/AbstractToolWindowManager.java
+++ b/plugins/ui-designer-core/src/com/intellij/designer/AbstractToolWindowManager.java
@@ -177,10 +177,6 @@ public abstract class AbstractToolWindowManager implements ProjectComponent {
   protected abstract void updateToolWindow(@Nullable DesignerEditorPanel designer);
 
   protected final void initGearActions() {
-    if (!ApplicationManager.getApplication().isInternal()) {
-      return; // XXX: delete after test
-    }
-
     DefaultActionGroup group = new DefaultActionGroup();
     group.add(new ToggleAction("In Editor Mode", "Pin/unpin tool window to Designer Editor", null) {
       @Override
@@ -279,7 +275,7 @@ public abstract class AbstractToolWindowManager implements ProjectComponent {
   }
 
   public final boolean isEditorMode() {
-    return myPropertiesComponent.getBoolean(EDITOR_MODE + getComponentName(), false); // XXX: sets true after test
+    return myPropertiesComponent.getBoolean(EDITOR_MODE + getComponentName(), true);
   }
 
   public final void setEditorMode(boolean value) {
diff --git a/plugins/ui-designer-core/src/com/intellij/designer/LightToolWindow.java b/plugins/ui-designer-core/src/com/intellij/designer/LightToolWindow.java
index 9b6269d372e0..4419ced8bb9a 100644
--- a/plugins/ui-designer-core/src/com/intellij/designer/LightToolWindow.java
+++ b/plugins/ui-designer-core/src/com/intellij/designer/LightToolWindow.java
@@ -111,7 +111,7 @@ public class LightToolWindow extends JPanel {
     header.add(titleLabel, BorderLayout.CENTER);
 
     JPanel actionPanel = new JPanel(new FlowLayout(FlowLayout.CENTER, 5, 0));
-    actionPanel.setBorder(IdeBorderFactory.createEmptyBorder(2, 0, 2, 0));
+    actionPanel.setBorder(IdeBorderFactory.createEmptyBorder(3, 0, 2, 0));
     actionPanel.setOpaque(false);
     header.add(actionPanel, BorderLayout.EAST);
 
@@ -327,11 +327,11 @@ public class LightToolWindow extends JPanel {
       presentation.setText(UIBundle.message("tool.window.hide.action.name"));
       if (myStyle == SideBorder.LEFT) {
         presentation.setIcon(AllIcons.General.HideLeftPart);
-        presentation.setHoveredIcon(AllIcons.General.HideLeftHover);
+        presentation.setHoveredIcon(AllIcons.General.HideLeftPartHover);
       }
       else {
         presentation.setIcon(AllIcons.General.HideRightPart);
-        presentation.setHoveredIcon(AllIcons.General.HideRightHover);
+        presentation.setHoveredIcon(AllIcons.General.HideRightPartHover);
       }
     }
 
@@ -484,8 +484,7 @@ public class LightToolWindow extends JPanel {
       return new Dimension(size.width, TabsUtil.getTabsHeight());
     }
 
-    @Override
-    protected void paintComponent(Graphics g) {
+    protected void _paintComponent(Graphics g) { // XXX: visual artifacts on linux
       Rectangle r = getBounds();
 
       Image image;