diff --git a/designer_base/src/com/fr/design/style/color/CustomChooserPanel.java b/designer_base/src/com/fr/design/style/color/CustomChooserPanel.java
index 93302b1994..21f23b783c 100644
--- a/designer_base/src/com/fr/design/style/color/CustomChooserPanel.java
+++ b/designer_base/src/com/fr/design/style/color/CustomChooserPanel.java
@@ -713,7 +713,6 @@ class CustomChooserPanel extends AbstractColorChooserPanel implements ColorSelec
         JPanel buttonPane = new JPanel(new BorderLayout());
         buttonPane.add(pickColorButton, BorderLayout.WEST);
         rightPane.add(buttonPane, BorderLayout.SOUTH);
-//        rightPane.add(pickColorButton, BorderLayout.SOUTH);
         container.add(rightPane);
 
         return container;
diff --git a/designer_base/src/com/fr/design/style/color/PickColorButtonFactory.java b/designer_base/src/com/fr/design/style/color/PickColorButtonFactory.java
index 32188ff4e8..0eb28af751 100644
--- a/designer_base/src/com/fr/design/style/color/PickColorButtonFactory.java
+++ b/designer_base/src/com/fr/design/style/color/PickColorButtonFactory.java
@@ -2,7 +2,6 @@ package com.fr.design.style.color;
 
 import com.fr.base.BaseUtils;
 import com.fr.design.gui.ibutton.UIButton;
-
 import java.awt.*;
 import java.awt.event.*;
 
@@ -24,6 +23,7 @@ public class PickColorButtonFactory {
         } else {
             pickColorButton.setIcon(BaseUtils.readIcon("/com/fr/design/images/gui/colorPicker/colorPicker18.png"));
             pickColorButton.setPreferredSize(new Dimension(18, 18));
+            pickColorButton.setBorderPainted(false);
         }
         pickColorButton.setCursor(new Cursor(Cursor.HAND_CURSOR));