diff --git a/ShareX.HelpersLib/Colors/ColorPickerForm.cs b/ShareX.HelpersLib/Colors/ColorPickerForm.cs
index 687b2e28a..c70b0a2fc 100644
--- a/ShareX.HelpersLib/Colors/ColorPickerForm.cs
+++ b/ShareX.HelpersLib/Colors/ColorPickerForm.cs
@@ -88,8 +88,9 @@ private void PrepareRecentColors()
                 {
                     Color = new HSB(i / 32d, 1d, 1d),
                     Size = new Size(16, 16),
-                    Offset = 2,
-                    Margin = new Padding(0),
+                    Offset = 0,
+                    BorderColor = Color.FromArgb(100, 100, 100),
+                    Margin = new Padding(1),
                     ManualButtonClick = true
                 };
 
diff --git a/ShareX.HelpersLib/Controls/ColorButton.cs b/ShareX.HelpersLib/Controls/ColorButton.cs
index 3492e03b2..6479a477d 100644
--- a/ShareX.HelpersLib/Controls/ColorButton.cs
+++ b/ShareX.HelpersLib/Controls/ColorButton.cs
@@ -51,6 +51,9 @@ public Color Color
             }
         }
 
+        [DefaultValue(typeof(Color), "DarkGray")]
+        public Color BorderColor { get; set; } = Color.DarkGray;
+
         [DefaultValue(3)]
         public int Offset { get; set; } = 3;
 
@@ -85,7 +88,10 @@ public void ShowColorDialog()
 
         protected override void OnPaint(PaintEventArgs pevent)
         {
-            base.OnPaint(pevent);
+            if (Offset > 0)
+            {
+                base.OnPaint(pevent);
+            }
 
             int boxSize = ClientRectangle.Height - Offset * 2;
             Rectangle boxRectangle = new Rectangle(ClientRectangle.Width - Offset - boxSize, Offset, boxSize, boxSize);
@@ -108,7 +114,10 @@ protected override void OnPaint(PaintEventArgs pevent)
                 }
             }
 
-            g.DrawRectangleProper(Pens.DarkGray, boxRectangle);
+            using (Pen borderPen = new Pen(BorderColor))
+            {
+                g.DrawRectangleProper(borderPen, boxRectangle);
+            }
         }
     }
 }
\ No newline at end of file