diff --git a/Paper/gtk-3.0/widgets/header-bar.css b/Paper/gtk-3.0/widgets/header-bar.css
index 3647306..a67d6e4 100644
--- a/Paper/gtk-3.0/widgets/header-bar.css
+++ b/Paper/gtk-3.0/widgets/header-bar.css
@@ -88,11 +88,6 @@
 /**********************
  * Header bar buttons *
  **********************/
-.header-bar .button {
-    border: none;
-    padding: 12px 15px;
-}
-
 .header-bar .flat,
 .header-bar .button,
 .header-bar .title,
@@ -103,6 +98,8 @@
     background-color: transparent;
     background-image: none;
     box-shadow: none;
+    border: none;
+    padding: 12px 15px;
 }
 
 /* Normal Button */
@@ -131,7 +128,7 @@
 .header-bar .suggested-action .button:active,
 .header-bar .image-button:active {
     border-radius: 0px;
-    background-color: alpha(#000, 0.1);
+    /*background-color: alpha(#000, 0.1);*/
     background-image: none;
     border: none;
     outline: none;
@@ -153,6 +150,7 @@
 .header-bar .image-button:checked {
     border-radius: 0px;
     background-image: none;
+    /*background-color: alpha(#000, 0.1);*/
     border: none;
     outline: none;
     color: @header_text;
@@ -193,7 +191,7 @@
     background-image: none;
     border: none;
     outline: none;
-    box-shadow: inset 0 -2px 0 0 @header_text;
+    /*box-shadow: inset 0 -2px 0 0 @header_text;*/
     color: @header_text;
 }
 
diff --git a/Paper/gtk-3.0/widgets/titlebar.css b/Paper/gtk-3.0/widgets/titlebar.css
index 88adfb4..75b164f 100644
--- a/Paper/gtk-3.0/widgets/titlebar.css
+++ b/Paper/gtk-3.0/widgets/titlebar.css
@@ -85,11 +85,6 @@
  * Header bar buttons *
  **********************/
 
-.titlebar .button {
-    border: none;
-    padding: 12px 15px;
-}
-
 .titlebar .flat,
 .titlebar .button,
 .titlebar .title,
@@ -99,6 +94,8 @@
 .titlebar .image-button {
     background-color: transparent;
     background-image: none;
+    border: none;
+    padding: 12px 15px;
 }
 
 /* Normal Button */
@@ -127,7 +124,7 @@
 .titlebar .suggested-action .button:active,
 .titlebar .image-button:active {
     border-radius: 0px;
-    background-color: alpha(#000, 0.2);
+    /*background-color: alpha(#000, 0.1);*/
     background-image: none;
     border: none;
     outline: none;
@@ -148,6 +145,7 @@
 .titlebar .suggested-action .button:checked,
 .titlebar .image-button:checked {
     border-radius: 0px;
+    /*background-color: alpha(#000, 0.1);*/
     background-image: none;
     border: none;
     outline: none;
@@ -188,7 +186,7 @@
     background-image: none;
     border: none;
     outline: none;
-    box-shadow: inset 0 -2px 0 0 @header_text;
+    /*box-shadow: inset 0 -2px 0 0 @header_text;*/
     color: @header_text;
 }