diff --git a/src/_sass/gnome-shell/widgets/_panel.scss b/src/_sass/gnome-shell/widgets/_panel.scss
index 81771ce..387baf5 100644
--- a/src/_sass/gnome-shell/widgets/_panel.scss
+++ b/src/_sass/gnome-shell/widgets/_panel.scss
@@ -61,10 +61,11 @@ $panel_button_hpadding: ($panel_height - 16px) / 2;
     &.clock-display {
       -natural-hpadding: 0 !important;
       -minimum-hpadding: 0 !important;
+      padding: 0 !important;
+      spacing: 0 !important;
 
       .clock {
         border-radius: if($corner_style == 'circular', $circular-radius, $material-radius + $space-size / 2);
-        margin: 0 $space-size * 2 !important;
       }
     }
 
diff --git a/src/gnome-shell/shell-40-0/gnome-shell-Compact.css b/src/gnome-shell/shell-40-0/gnome-shell-Compact.css
index 8841ae8..f142ce2 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell-Compact.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell-Compact.css
@@ -1948,11 +1948,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #panel .panel-button.clock-display {
   -natural-hpadding: 0 !important;
   -minimum-hpadding: 0 !important;
+  padding: 0 !important;
+  spacing: 0 !important;
 }
 
 #panel .panel-button.clock-display .clock {
   border-radius: 9999px;
-  margin: 0 8px !important;
 }
 
 #panel .panel-button:hover {
diff --git a/src/gnome-shell/shell-40-0/gnome-shell-Dark-Compact.css b/src/gnome-shell/shell-40-0/gnome-shell-Dark-Compact.css
index 584e54d..45610a6 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell-Dark-Compact.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell-Dark-Compact.css
@@ -1948,11 +1948,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #panel .panel-button.clock-display {
   -natural-hpadding: 0 !important;
   -minimum-hpadding: 0 !important;
+  padding: 0 !important;
+  spacing: 0 !important;
 }
 
 #panel .panel-button.clock-display .clock {
   border-radius: 9999px;
-  margin: 0 8px !important;
 }
 
 #panel .panel-button:hover {
diff --git a/src/gnome-shell/shell-40-0/gnome-shell-Dark.css b/src/gnome-shell/shell-40-0/gnome-shell-Dark.css
index b019c11..9986289 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell-Dark.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell-Dark.css
@@ -1948,11 +1948,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #panel .panel-button.clock-display {
   -natural-hpadding: 0 !important;
   -minimum-hpadding: 0 !important;
+  padding: 0 !important;
+  spacing: 0 !important;
 }
 
 #panel .panel-button.clock-display .clock {
   border-radius: 9999px;
-  margin: 0 12px !important;
 }
 
 #panel .panel-button:hover {
diff --git a/src/gnome-shell/shell-40-0/gnome-shell.css b/src/gnome-shell/shell-40-0/gnome-shell.css
index 3a61a94..8509efc 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell.css
@@ -1948,11 +1948,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #panel .panel-button.clock-display {
   -natural-hpadding: 0 !important;
   -minimum-hpadding: 0 !important;
+  padding: 0 !important;
+  spacing: 0 !important;
 }
 
 #panel .panel-button.clock-display .clock {
   border-radius: 9999px;
-  margin: 0 12px !important;
 }
 
 #panel .panel-button:hover {
diff --git a/src/gnome-shell/shell-42-0/gnome-shell-Compact.css b/src/gnome-shell/shell-42-0/gnome-shell-Compact.css
index 4f5b93d..4c24e0e 100644
--- a/src/gnome-shell/shell-42-0/gnome-shell-Compact.css
+++ b/src/gnome-shell/shell-42-0/gnome-shell-Compact.css
@@ -2312,11 +2312,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #panel .panel-button.clock-display {
   -natural-hpadding: 0 !important;
   -minimum-hpadding: 0 !important;
+  padding: 0 !important;
+  spacing: 0 !important;
 }
 
 #panel .panel-button.clock-display .clock {
   border-radius: 9999px;
-  margin: 0 8px !important;
 }
 
 #panel .panel-button:hover {
diff --git a/src/gnome-shell/shell-42-0/gnome-shell-Dark-Compact.css b/src/gnome-shell/shell-42-0/gnome-shell-Dark-Compact.css
index f9e9e62..7647e39 100644
--- a/src/gnome-shell/shell-42-0/gnome-shell-Dark-Compact.css
+++ b/src/gnome-shell/shell-42-0/gnome-shell-Dark-Compact.css
@@ -2316,11 +2316,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #panel .panel-button.clock-display {
   -natural-hpadding: 0 !important;
   -minimum-hpadding: 0 !important;
+  padding: 0 !important;
+  spacing: 0 !important;
 }
 
 #panel .panel-button.clock-display .clock {
   border-radius: 9999px;
-  margin: 0 8px !important;
 }
 
 #panel .panel-button:hover {
diff --git a/src/gnome-shell/shell-42-0/gnome-shell-Dark.css b/src/gnome-shell/shell-42-0/gnome-shell-Dark.css
index 2480ff6..faadd01 100644
--- a/src/gnome-shell/shell-42-0/gnome-shell-Dark.css
+++ b/src/gnome-shell/shell-42-0/gnome-shell-Dark.css
@@ -2316,11 +2316,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #panel .panel-button.clock-display {
   -natural-hpadding: 0 !important;
   -minimum-hpadding: 0 !important;
+  padding: 0 !important;
+  spacing: 0 !important;
 }
 
 #panel .panel-button.clock-display .clock {
   border-radius: 9999px;
-  margin: 0 12px !important;
 }
 
 #panel .panel-button:hover {
diff --git a/src/gnome-shell/shell-42-0/gnome-shell.css b/src/gnome-shell/shell-42-0/gnome-shell.css
index 0e32cb8..cef217b 100644
--- a/src/gnome-shell/shell-42-0/gnome-shell.css
+++ b/src/gnome-shell/shell-42-0/gnome-shell.css
@@ -2312,11 +2312,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #panel .panel-button.clock-display {
   -natural-hpadding: 0 !important;
   -minimum-hpadding: 0 !important;
+  padding: 0 !important;
+  spacing: 0 !important;
 }
 
 #panel .panel-button.clock-display .clock {
   border-radius: 9999px;
-  margin: 0 12px !important;
 }
 
 #panel .panel-button:hover {