diff --git a/src/_sass/gtk/apps/_budgie.scss b/src/_sass/gtk/apps/_budgie.scss
index 8b09f54..396d142 100644
--- a/src/_sass/gtk/apps/_budgie.scss
+++ b/src/_sass/gtk/apps/_budgie.scss
@@ -495,7 +495,7 @@
 
   // Tasklist
   #tasklist-button {
-    padding: 0 4px;
+    padding: 0 $space-size;
 
     @extend %underscores;
   }
@@ -536,6 +536,39 @@
   .lock-keys {
     image:disabled { color: on($panel, secondary-disabled); }
   }
+
+  // Add padding for panel indicators icons
+  > box > widget > widget {
+    > image, // normal
+    > stack > image, // Screenshot
+    > box > image { // Places
+      margin-left: $space-size;
+      margin-right: $space-size;
+    }
+
+    > box > image + label { // Reset for mailneg
+      margin-left: -$space-size + 2px;
+    }
+
+    > box { // keyboard Layout
+      > widget > image { margin-left: $space-size; }
+      > stack > widget > label { margin-right: $space-size; }
+    }
+
+    > box > widget > widget > image { // Status
+      margin-left: $space-size / 2;
+      margin-right: $space-size / 2;
+    }
+  }
+
+  // Time label
+  .budgie-clock-applet,
+  .budgie-calendar-applet {
+    > widget > box {
+      padding-left: $space-size / 2;
+      padding-right: $space-size / 2;
+    }
+  }
 }
 
 %underscores {
@@ -826,7 +859,7 @@ image.raven-mpris {
   background-color: $surface;
 
   > box > grid {
-    padding: 24px;
+    padding: $space-size * 4;
   }
 }
 
@@ -860,7 +893,7 @@ image.raven-mpris {
   .failure { color: $destructive; }
 
   > box > grid {
-    padding: 24px 24px 0;
+    padding-bottom: 0;
   }
 }
 
diff --git a/src/gtk/3.0/gtk-Compact.css b/src/gtk/3.0/gtk-Compact.css
index faf1e79..13d720e 100644
--- a/src/gtk/3.0/gtk-Compact.css
+++ b/src/gtk/3.0/gtk-Compact.css
@@ -7613,6 +7613,36 @@ MsdOsdWindow.background.osd .progressbar {
   color: rgba(255, 255, 255, 0.3);
 }
 
+.budgie-panel > box > widget > widget > image,
+.budgie-panel > box > widget > widget > stack > image,
+.budgie-panel > box > widget > widget > box > image {
+  margin-left: 4px;
+  margin-right: 4px;
+}
+
+.budgie-panel > box > widget > widget > box > image + label {
+  margin-left: -2px;
+}
+
+.budgie-panel > box > widget > widget > box > widget > image {
+  margin-left: 4px;
+}
+
+.budgie-panel > box > widget > widget > box > stack > widget > label {
+  margin-right: 4px;
+}
+
+.budgie-panel > box > widget > widget > box > widget > widget > image {
+  margin-left: 2px;
+  margin-right: 2px;
+}
+
+.budgie-panel .budgie-clock-applet > widget > box,
+.budgie-panel .budgie-calendar-applet > widget > box {
+  padding-left: 2px;
+  padding-right: 2px;
+}
+
 .top .budgie-panel #tasklist-button, .budgie-panel .top #tasklist-button {
   border-image: radial-gradient(circle closest-corner at center calc(1px), currentColor 0%, transparent 0%) 0 0 0 0/0 0 0 0;
 }
@@ -7892,7 +7922,7 @@ image.raven-mpris {
 .budgie-session-dialog > box > grid,
 .budgie-polkit-dialog > box > grid,
 .budgie-run-dialog > box > grid {
-  padding: 24px;
+  padding: 16px;
 }
 
 .budgie-session-dialog.background.csd, .budgie-session-dialog decoration,
@@ -7941,7 +7971,7 @@ image.raven-mpris {
 }
 
 .budgie-polkit-dialog > box > grid {
-  padding: 24px 24px 0;
+  padding-bottom: 0;
 }
 
 .budgie-run-dialog entry.search {
diff --git a/src/gtk/3.0/gtk-Dark-Compact.css b/src/gtk/3.0/gtk-Dark-Compact.css
index 2d66396..16fb585 100644
--- a/src/gtk/3.0/gtk-Dark-Compact.css
+++ b/src/gtk/3.0/gtk-Dark-Compact.css
@@ -7609,6 +7609,36 @@ MsdOsdWindow.background.osd .progressbar {
   color: rgba(255, 255, 255, 0.3);
 }
 
+.budgie-panel > box > widget > widget > image,
+.budgie-panel > box > widget > widget > stack > image,
+.budgie-panel > box > widget > widget > box > image {
+  margin-left: 4px;
+  margin-right: 4px;
+}
+
+.budgie-panel > box > widget > widget > box > image + label {
+  margin-left: -2px;
+}
+
+.budgie-panel > box > widget > widget > box > widget > image {
+  margin-left: 4px;
+}
+
+.budgie-panel > box > widget > widget > box > stack > widget > label {
+  margin-right: 4px;
+}
+
+.budgie-panel > box > widget > widget > box > widget > widget > image {
+  margin-left: 2px;
+  margin-right: 2px;
+}
+
+.budgie-panel .budgie-clock-applet > widget > box,
+.budgie-panel .budgie-calendar-applet > widget > box {
+  padding-left: 2px;
+  padding-right: 2px;
+}
+
 .top .budgie-panel #tasklist-button, .budgie-panel .top #tasklist-button {
   border-image: radial-gradient(circle closest-corner at center calc(1px), currentColor 0%, transparent 0%) 0 0 0 0/0 0 0 0;
 }
@@ -7888,7 +7918,7 @@ image.raven-mpris {
 .budgie-session-dialog > box > grid,
 .budgie-polkit-dialog > box > grid,
 .budgie-run-dialog > box > grid {
-  padding: 24px;
+  padding: 16px;
 }
 
 .budgie-session-dialog.background.csd, .budgie-session-dialog decoration,
@@ -7937,7 +7967,7 @@ image.raven-mpris {
 }
 
 .budgie-polkit-dialog > box > grid {
-  padding: 24px 24px 0;
+  padding-bottom: 0;
 }
 
 .budgie-run-dialog entry.search {
diff --git a/src/gtk/3.0/gtk-Dark.css b/src/gtk/3.0/gtk-Dark.css
index b390a43..e8a027f 100644
--- a/src/gtk/3.0/gtk-Dark.css
+++ b/src/gtk/3.0/gtk-Dark.css
@@ -7566,7 +7566,7 @@ MsdOsdWindow.background.osd .progressbar {
 }
 
 .budgie-panel #tasklist-button {
-  padding: 0 4px;
+  padding: 0 6px;
 }
 
 .budgie-panel.vertical #tasklist-button {
@@ -7609,6 +7609,36 @@ MsdOsdWindow.background.osd .progressbar {
   color: rgba(255, 255, 255, 0.3);
 }
 
+.budgie-panel > box > widget > widget > image,
+.budgie-panel > box > widget > widget > stack > image,
+.budgie-panel > box > widget > widget > box > image {
+  margin-left: 6px;
+  margin-right: 6px;
+}
+
+.budgie-panel > box > widget > widget > box > image + label {
+  margin-left: -4px;
+}
+
+.budgie-panel > box > widget > widget > box > widget > image {
+  margin-left: 6px;
+}
+
+.budgie-panel > box > widget > widget > box > stack > widget > label {
+  margin-right: 6px;
+}
+
+.budgie-panel > box > widget > widget > box > widget > widget > image {
+  margin-left: 3px;
+  margin-right: 3px;
+}
+
+.budgie-panel .budgie-clock-applet > widget > box,
+.budgie-panel .budgie-calendar-applet > widget > box {
+  padding-left: 3px;
+  padding-right: 3px;
+}
+
 .top .budgie-panel #tasklist-button, .budgie-panel .top #tasklist-button {
   border-image: radial-gradient(circle closest-corner at center calc(1px), currentColor 0%, transparent 0%) 0 0 0 0/0 0 0 0;
 }
@@ -7937,7 +7967,7 @@ image.raven-mpris {
 }
 
 .budgie-polkit-dialog > box > grid {
-  padding: 24px 24px 0;
+  padding-bottom: 0;
 }
 
 .budgie-run-dialog entry.search {
diff --git a/src/gtk/3.0/gtk-Light-Compact.css b/src/gtk/3.0/gtk-Light-Compact.css
index 666f560..8a46838 100644
--- a/src/gtk/3.0/gtk-Light-Compact.css
+++ b/src/gtk/3.0/gtk-Light-Compact.css
@@ -7612,6 +7612,36 @@ MsdOsdWindow.background.osd .progressbar {
   color: rgba(0, 0, 0, 0.26);
 }
 
+.budgie-panel > box > widget > widget > image,
+.budgie-panel > box > widget > widget > stack > image,
+.budgie-panel > box > widget > widget > box > image {
+  margin-left: 4px;
+  margin-right: 4px;
+}
+
+.budgie-panel > box > widget > widget > box > image + label {
+  margin-left: -2px;
+}
+
+.budgie-panel > box > widget > widget > box > widget > image {
+  margin-left: 4px;
+}
+
+.budgie-panel > box > widget > widget > box > stack > widget > label {
+  margin-right: 4px;
+}
+
+.budgie-panel > box > widget > widget > box > widget > widget > image {
+  margin-left: 2px;
+  margin-right: 2px;
+}
+
+.budgie-panel .budgie-clock-applet > widget > box,
+.budgie-panel .budgie-calendar-applet > widget > box {
+  padding-left: 2px;
+  padding-right: 2px;
+}
+
 .top .budgie-panel #tasklist-button, .budgie-panel .top #tasklist-button {
   border-image: radial-gradient(circle closest-corner at center calc(1px), currentColor 0%, transparent 0%) 0 0 0 0/0 0 0 0;
 }
@@ -7891,7 +7921,7 @@ image.raven-mpris {
 .budgie-session-dialog > box > grid,
 .budgie-polkit-dialog > box > grid,
 .budgie-run-dialog > box > grid {
-  padding: 24px;
+  padding: 16px;
 }
 
 .budgie-session-dialog.background.csd, .budgie-session-dialog decoration,
@@ -7940,7 +7970,7 @@ image.raven-mpris {
 }
 
 .budgie-polkit-dialog > box > grid {
-  padding: 24px 24px 0;
+  padding-bottom: 0;
 }
 
 .budgie-run-dialog entry.search {
diff --git a/src/gtk/3.0/gtk-Light.css b/src/gtk/3.0/gtk-Light.css
index 3e21793..996c0d5 100644
--- a/src/gtk/3.0/gtk-Light.css
+++ b/src/gtk/3.0/gtk-Light.css
@@ -7569,7 +7569,7 @@ MsdOsdWindow.background.osd .progressbar {
 }
 
 .budgie-panel #tasklist-button {
-  padding: 0 4px;
+  padding: 0 6px;
 }
 
 .budgie-panel.vertical #tasklist-button {
@@ -7612,6 +7612,36 @@ MsdOsdWindow.background.osd .progressbar {
   color: rgba(0, 0, 0, 0.26);
 }
 
+.budgie-panel > box > widget > widget > image,
+.budgie-panel > box > widget > widget > stack > image,
+.budgie-panel > box > widget > widget > box > image {
+  margin-left: 6px;
+  margin-right: 6px;
+}
+
+.budgie-panel > box > widget > widget > box > image + label {
+  margin-left: -4px;
+}
+
+.budgie-panel > box > widget > widget > box > widget > image {
+  margin-left: 6px;
+}
+
+.budgie-panel > box > widget > widget > box > stack > widget > label {
+  margin-right: 6px;
+}
+
+.budgie-panel > box > widget > widget > box > widget > widget > image {
+  margin-left: 3px;
+  margin-right: 3px;
+}
+
+.budgie-panel .budgie-clock-applet > widget > box,
+.budgie-panel .budgie-calendar-applet > widget > box {
+  padding-left: 3px;
+  padding-right: 3px;
+}
+
 .top .budgie-panel #tasklist-button, .budgie-panel .top #tasklist-button {
   border-image: radial-gradient(circle closest-corner at center calc(1px), currentColor 0%, transparent 0%) 0 0 0 0/0 0 0 0;
 }
@@ -7940,7 +7970,7 @@ image.raven-mpris {
 }
 
 .budgie-polkit-dialog > box > grid {
-  padding: 24px 24px 0;
+  padding-bottom: 0;
 }
 
 .budgie-run-dialog entry.search {
diff --git a/src/gtk/3.0/gtk.css b/src/gtk/3.0/gtk.css
index ded38e1..9b781d9 100644
--- a/src/gtk/3.0/gtk.css
+++ b/src/gtk/3.0/gtk.css
@@ -7570,7 +7570,7 @@ MsdOsdWindow.background.osd .progressbar {
 }
 
 .budgie-panel #tasklist-button {
-  padding: 0 4px;
+  padding: 0 6px;
 }
 
 .budgie-panel.vertical #tasklist-button {
@@ -7613,6 +7613,36 @@ MsdOsdWindow.background.osd .progressbar {
   color: rgba(255, 255, 255, 0.3);
 }
 
+.budgie-panel > box > widget > widget > image,
+.budgie-panel > box > widget > widget > stack > image,
+.budgie-panel > box > widget > widget > box > image {
+  margin-left: 6px;
+  margin-right: 6px;
+}
+
+.budgie-panel > box > widget > widget > box > image + label {
+  margin-left: -4px;
+}
+
+.budgie-panel > box > widget > widget > box > widget > image {
+  margin-left: 6px;
+}
+
+.budgie-panel > box > widget > widget > box > stack > widget > label {
+  margin-right: 6px;
+}
+
+.budgie-panel > box > widget > widget > box > widget > widget > image {
+  margin-left: 3px;
+  margin-right: 3px;
+}
+
+.budgie-panel .budgie-clock-applet > widget > box,
+.budgie-panel .budgie-calendar-applet > widget > box {
+  padding-left: 3px;
+  padding-right: 3px;
+}
+
 .top .budgie-panel #tasklist-button, .budgie-panel .top #tasklist-button {
   border-image: radial-gradient(circle closest-corner at center calc(1px), currentColor 0%, transparent 0%) 0 0 0 0/0 0 0 0;
 }
@@ -7941,7 +7971,7 @@ image.raven-mpris {
 }
 
 .budgie-polkit-dialog > box > grid {
-  padding: 24px 24px 0;
+  padding-bottom: 0;
 }
 
 .budgie-run-dialog entry.search {