1 files changed, 17 insertions, 0 deletions
diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaButtonUI.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaButtonUI.java
index 8deb957d21f1..a10ff34c425c 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaButtonUI.java
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaButtonUI.java
@@ -98,6 +98,23 @@ public class DarculaButtonUI extends BasicButtonUI {
   }
 
   @Override
+  protected void paintIcon(Graphics g, JComponent c, Rectangle iconRect) {
+    Border border = c.getBorder();
+    if (border != null && isSquare(c)) {
+      int xOff = 1;
+      Insets ins = border.getBorderInsets(c);
+      int yOff = (ins.top + ins.bottom) / 4;
+      Rectangle iconRect2 = new Rectangle(iconRect);
+      iconRect2.x += xOff;
+      iconRect2.y += yOff;
+      super.paintIcon(g, c, iconRect2);
+    }
+    else {
+      super.paintIcon(g, c, iconRect);
+    }
+  }
+
+  @Override
   public void update(Graphics g, JComponent c) {
     super.update(g, c);
     if (c instanceof JButton && ((JButton)c).isDefaultButton() && !SystemInfo.isMac) {