diff --git a/sources/colorbutton.cpp b/sources/colorbutton.cpp
index 666b4c6bd..8ceacc272 100644
--- a/sources/colorbutton.cpp
+++ b/sources/colorbutton.cpp
@@ -73,6 +73,11 @@ void ColorButton::clicked(bool checked)
 */
 void ColorButton::paintEvent(QPaintEvent *e) {
 	QPushButton::paintEvent(e);
+
+	// Padding for the color indicator
+	const int padding_x = 5;
+	const int padding_y = 5;
+
 	QPainter painter(this);
 
 	// Get dimensions of the button paint surface
@@ -80,6 +85,6 @@ void ColorButton::paintEvent(QPaintEvent *e) {
 	auto r_height = painter.device()->height();
 
 	// Paint a rectangle with a margin of 5
-	auto color_indicator = QRect(5, 5, r_width - 10, r_height - 10);
+	auto color_indicator = QRect(padding_x, padding_y, r_width - padding_x * 2, r_height - padding_y * 2);
 	painter.fillRect(color_indicator, m_color);
 }
diff --git a/sources/colorcomboboxdelegate.cpp b/sources/colorcomboboxdelegate.cpp
index a81783168..45ad81257 100644
--- a/sources/colorcomboboxdelegate.cpp
+++ b/sources/colorcomboboxdelegate.cpp
@@ -32,6 +32,10 @@
  */
 void ColorComboBoxDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
 {
+	// Padding for the color indicator
+	const int padding_x = 5;
+	const int padding_y = 2;
+
 	painter->save();
 
 	if (index.row() > 0)
@@ -47,7 +51,7 @@ void ColorComboBoxDelegate::paint(QPainter *painter, const QStyleOptionViewItem
 
 		// Draw color indicator rectangle
 		auto color = qvariant_cast<QColor>(index.data());
-		rect.adjust(5, 2, -5, -2);
+		rect.adjust(padding_x, padding_y, -padding_x, -padding_y);
 		painter->fillRect(rect, color);
 	} else {
 		// Draw a normal drop down item for custom color