diff --git a/UI/data/themes/Dark.qss b/UI/data/themes/Dark.qss
index d1a8ab2ed..6d03b4a51 100644
--- a/UI/data/themes/Dark.qss
+++ b/UI/data/themes/Dark.qss
@@ -232,9 +232,12 @@ QScrollBar::left-arrow:horizontal, QScrollBar::right-arrow:horizontal, QScrollBa
 }
 
 /* Source Context */
+#contextContainer QPushButton {
+    padding: 3px 10px;
+}
+
 #contextContainer QPushButton[themeID2=contextBarButton] {
-    padding: 3px;
-    margin: 0px;
+    padding: 3px 6px;
 }
 
 #contextContainer QPushButton#sourcePropertiesButton {
diff --git a/UI/data/themes/System.qss b/UI/data/themes/System.qss
index ea27013a3..5a9261e20 100644
--- a/UI/data/themes/System.qss
+++ b/UI/data/themes/System.qss
@@ -298,8 +298,12 @@ QSlider::handle:horizontal[themeID="tBarSlider"] {
 }
 
 /* Source Context */
+#contextContainer QPushButton {
+    padding: 3px 10px;
+}
+
 #contextContainer QPushButton[themeID2=contextBarButton] {
-    padding: 0px;
+    padding: 3px 6px;
 }
 
 #contextContainer QPushButton#sourcePropertiesButton {