diff --git a/EvoPop-Azure/gtk-3.0/gtk-dark.css b/EvoPop-Azure/gtk-3.0/gtk-dark.css
index 471d326..3e5ec37 100755
--- a/EvoPop-Azure/gtk-3.0/gtk-dark.css
+++ b/EvoPop-Azure/gtk-3.0/gtk-dark.css
@@ -4769,7 +4769,8 @@ entry selection, row:selected, treeview.view:selected:focus, treeview.view:selec
   padding: 5px 2px;
   border-bottom: 1px solid @borders;
   border-radius: 0;
-  font-size: 120%; }
+  font-size: 120%;
+  box-shadow: none; }
   .budgie-menu entry.search image:dir(ltr) {
     padding-left: 8px;
     padding-right: 12px; }
@@ -4804,7 +4805,9 @@ entry selection, row:selected, treeview.view:selected:focus, treeview.view:selec
   border-color: transparent; }
 .budgie-menu button:not(.category-button) {
   padding-top: 5px;
-  padding-bottom: 5px; }
+  padding-bottom: 5px;
+  border-radius: 0;
+  box-shadow: none; }
 .budgie-menu undershoot, .budgie-menu overshoot {
   background: none; }
 
@@ -5232,8 +5235,8 @@ button.raven-trigger {
     margin-bottom: 3px;
     background: rgba(123, 123, 189, 0.7);
     color: #fefefe;
+    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.06), 0 1px 2px rgba(0, 0, 0, 0.2), inset 0px 1px 0px 0px rgba(255, 255, 255, 0.1);
     border: none;
-    box-shadow: none;
     font-size: 100%; }
     .raven .powerstrip button.image-button:hover {
       transition: 170ms ease all;
@@ -5293,7 +5296,21 @@ calendar.raven-calendar {
   border-width: 1px 0;
   border-bottom-color: rgba(0, 0, 0, 0.1); }
   .raven-mpris button.image-button {
-    padding: 8px; }
+    padding: 10px;
+    background-color: #39465c;
+    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.06), 0 1px 2px rgba(0, 0, 0, 0.2), inset 0px 1px 0px 0px rgba(255, 255, 255, 0.1); }
+    .raven-mpris button.image-button:hover {
+      background-color: #37b9a5; }
+    .raven-mpris button.image-button:active {
+      background-color: #31a593; }
+    .raven-mpris button.image-button:first-child {
+      margin-right: 4px; }
+    .raven-mpris button.image-button:last-child {
+      margin-left: 4px; }
+    .raven-mpris button.image-button:last-child, .raven-mpris button.image-button:first-child {
+      padding: 4px;
+      margin-top: 6px;
+      margin-bottom: 6px; }
 
 .budgie-notification-window, .budgie-osd-window, .budgie-switcher-window {
   background: none;
diff --git a/EvoPop-Azure/gtk-3.0/gtk.css b/EvoPop-Azure/gtk-3.0/gtk.css
index 5379633..257cc56 100755
--- a/EvoPop-Azure/gtk-3.0/gtk.css
+++ b/EvoPop-Azure/gtk-3.0/gtk.css
@@ -4790,7 +4790,8 @@ entry selection, row:selected, treeview.view:selected:focus, treeview.view:selec
   padding: 5px 2px;
   border-bottom: 1px solid @borders;
   border-radius: 0;
-  font-size: 120%; }
+  font-size: 120%;
+  box-shadow: none; }
   .budgie-menu entry.search image:dir(ltr) {
     padding-left: 8px;
     padding-right: 12px; }
@@ -4825,7 +4826,9 @@ entry selection, row:selected, treeview.view:selected:focus, treeview.view:selec
   border-color: transparent; }
 .budgie-menu button:not(.category-button) {
   padding-top: 5px;
-  padding-bottom: 5px; }
+  padding-bottom: 5px;
+  border-radius: 0;
+  box-shadow: none; }
 .budgie-menu undershoot, .budgie-menu overshoot {
   background: none; }
 
@@ -5253,8 +5256,8 @@ button.raven-trigger {
     margin-bottom: 3px;
     background: rgba(123, 123, 189, 0.7);
     color: #fefefe;
+    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.06), 0 1px 2px rgba(0, 0, 0, 0.2), inset 0px 1px 0px 0px rgba(255, 255, 255, 0.1);
     border: none;
-    box-shadow: none;
     font-size: 100%; }
     .raven .powerstrip button.image-button:hover {
       transition: 170ms ease all;
@@ -5314,7 +5317,21 @@ calendar.raven-calendar {
   border-width: 1px 0;
   border-bottom-color: rgba(0, 0, 0, 0.1); }
   .raven-mpris button.image-button {
-    padding: 8px; }
+    padding: 10px;
+    background-color: #fefefe;
+    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.06), 0 1px 2px rgba(0, 0, 0, 0.2), inset 0px 1px 0px 0px rgba(255, 255, 255, 0.1); }
+    .raven-mpris button.image-button:hover {
+      background-color: #37b9a5; }
+    .raven-mpris button.image-button:active {
+      background-color: #31a593; }
+    .raven-mpris button.image-button:first-child {
+      margin-right: 4px; }
+    .raven-mpris button.image-button:last-child {
+      margin-left: 4px; }
+    .raven-mpris button.image-button:last-child, .raven-mpris button.image-button:first-child {
+      padding: 4px;
+      margin-top: 6px;
+      margin-bottom: 6px; }
 
 .budgie-notification-window, .budgie-osd-window, .budgie-switcher-window {
   background: none;
diff --git a/EvoPop/gtk-3.0/gtk-dark.css b/EvoPop/gtk-3.0/gtk-dark.css
index d4ce871..bc56465 100755
--- a/EvoPop/gtk-3.0/gtk-dark.css
+++ b/EvoPop/gtk-3.0/gtk-dark.css
@@ -4769,7 +4769,8 @@ entry selection, row:selected, treeview.view:selected:focus, treeview.view:selec
   padding: 5px 2px;
   border-bottom: 1px solid @borders;
   border-radius: 0;
-  font-size: 120%; }
+  font-size: 120%;
+  box-shadow: none; }
   .budgie-menu entry.search image:dir(ltr) {
     padding-left: 8px;
     padding-right: 12px; }
@@ -4804,7 +4805,9 @@ entry selection, row:selected, treeview.view:selected:focus, treeview.view:selec
   border-color: transparent; }
 .budgie-menu button:not(.category-button) {
   padding-top: 5px;
-  padding-bottom: 5px; }
+  padding-bottom: 5px;
+  border-radius: 0;
+  box-shadow: none; }
 .budgie-menu undershoot, .budgie-menu overshoot {
   background: none; }
 
@@ -5232,8 +5235,8 @@ button.raven-trigger {
     margin-bottom: 3px;
     background: rgba(123, 123, 189, 0.7);
     color: #fefefe;
+    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.06), 0 1px 2px rgba(0, 0, 0, 0.2), inset 0px 1px 0px 0px rgba(255, 255, 255, 0.1);
     border: none;
-    box-shadow: none;
     font-size: 100%; }
     .raven .powerstrip button.image-button:hover {
       transition: 170ms ease all;
@@ -5293,7 +5296,21 @@ calendar.raven-calendar {
   border-width: 1px 0;
   border-bottom-color: rgba(0, 0, 0, 0.1); }
   .raven-mpris button.image-button {
-    padding: 8px; }
+    padding: 10px;
+    background-color: #505359;
+    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.06), 0 1px 2px rgba(0, 0, 0, 0.2), inset 0px 1px 0px 0px rgba(255, 255, 255, 0.1); }
+    .raven-mpris button.image-button:hover {
+      background-color: #13b1d5; }
+    .raven-mpris button.image-button:active {
+      background-color: #119ebe; }
+    .raven-mpris button.image-button:first-child {
+      margin-right: 4px; }
+    .raven-mpris button.image-button:last-child {
+      margin-left: 4px; }
+    .raven-mpris button.image-button:last-child, .raven-mpris button.image-button:first-child {
+      padding: 4px;
+      margin-top: 6px;
+      margin-bottom: 6px; }
 
 .budgie-notification-window, .budgie-osd-window, .budgie-switcher-window {
   background: none;
diff --git a/EvoPop/gtk-3.0/gtk.css b/EvoPop/gtk-3.0/gtk.css
index aa9ce49..facf8ff 100755
--- a/EvoPop/gtk-3.0/gtk.css
+++ b/EvoPop/gtk-3.0/gtk.css
@@ -4790,7 +4790,8 @@ entry selection, row:selected, treeview.view:selected:focus, treeview.view:selec
   padding: 5px 2px;
   border-bottom: 1px solid @borders;
   border-radius: 0;
-  font-size: 120%; }
+  font-size: 120%;
+  box-shadow: none; }
   .budgie-menu entry.search image:dir(ltr) {
     padding-left: 8px;
     padding-right: 12px; }
@@ -4825,7 +4826,9 @@ entry selection, row:selected, treeview.view:selected:focus, treeview.view:selec
   border-color: transparent; }
 .budgie-menu button:not(.category-button) {
   padding-top: 5px;
-  padding-bottom: 5px; }
+  padding-bottom: 5px;
+  border-radius: 0;
+  box-shadow: none; }
 .budgie-menu undershoot, .budgie-menu overshoot {
   background: none; }
 
@@ -5253,8 +5256,8 @@ button.raven-trigger {
     margin-bottom: 3px;
     background: rgba(123, 123, 189, 0.7);
     color: #fefefe;
+    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.06), 0 1px 2px rgba(0, 0, 0, 0.2), inset 0px 1px 0px 0px rgba(255, 255, 255, 0.1);
     border: none;
-    box-shadow: none;
     font-size: 100%; }
     .raven .powerstrip button.image-button:hover {
       transition: 170ms ease all;
@@ -5314,7 +5317,21 @@ calendar.raven-calendar {
   border-width: 1px 0;
   border-bottom-color: rgba(0, 0, 0, 0.1); }
   .raven-mpris button.image-button {
-    padding: 8px; }
+    padding: 10px;
+    background-color: #fefefe;
+    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.06), 0 1px 2px rgba(0, 0, 0, 0.2), inset 0px 1px 0px 0px rgba(255, 255, 255, 0.1); }
+    .raven-mpris button.image-button:hover {
+      background-color: #13b1d5; }
+    .raven-mpris button.image-button:active {
+      background-color: #119ebe; }
+    .raven-mpris button.image-button:first-child {
+      margin-right: 4px; }
+    .raven-mpris button.image-button:last-child {
+      margin-left: 4px; }
+    .raven-mpris button.image-button:last-child, .raven-mpris button.image-button:first-child {
+      padding: 4px;
+      margin-top: 6px;
+      margin-bottom: 6px; }
 
 .budgie-notification-window, .budgie-osd-window, .budgie-switcher-window {
   background: none;
diff --git a/sass/apps/_budgie.scss b/sass/apps/_budgie.scss
index 9cb1138..35276ff 100755
--- a/sass/apps/_budgie.scss
+++ b/sass/apps/_budgie.scss
@@ -87,6 +87,7 @@ $pos_list: ((top, bottom),(bottom,top),(left,right),(right,left));
         border-bottom: 1px solid #{"@borders"};
         border-radius: 0;
         font-size: 120%;
+        box-shadow: none;
 
         image {
             &:dir(ltr) { padding-left: 8px; padding-right: 12px; }
@@ -128,7 +129,12 @@ $pos_list: ((top, bottom),(bottom,top),(left,right),(right,left));
       border-color: transparent;
     }
 
-    button:not(.category-button) { padding-top: 5px; padding-bottom: 5px; }
+    button:not(.category-button) {
+      padding-top: 5px;
+      padding-bottom: 5px;
+      border-radius: 0;
+      box-shadow: none;
+    }
 
     undershoot, overshoot { background: none; }
 }
@@ -578,8 +584,8 @@ button.raven-trigger {
       margin-bottom: 3px;
       background: transparentize($darkpurple,0.3);
       color: $selected_fg_color;
+      box-shadow: $depth;
       border: none;
-      box-shadow: none;
       font-size: 100%;
 
       &:hover {
@@ -665,7 +671,26 @@ calendar.raven-calendar {
     border-width: 1px 0;
     border-bottom-color: $bottom_highlight;
 
-    button.image-button { padding: 8px; }
+    button.image-button {
+      padding: 10px;
+      background-color: $base_color;
+      box-shadow: $depth;
+
+      &:hover { background-color: $selected_bg_color; }
+
+      &:active { background-color: darken($selected_bg_color,5%); }
+
+      &:first-child { margin-right: 4px; }
+
+      &:last-child { margin-left: 4px; }
+
+      &:last-child,
+      &:first-child {
+        padding: 4px;
+        margin-top: 6px;
+        margin-bottom: 6px;
+      }
+    }
 }
 
 // Notifications