diff --git a/common/gtk-3.0/3.14/gtk-contained-dark.css b/common/gtk-3.0/3.14/gtk-contained-dark.css
index a75d2af..a3ce82e 100644
--- a/common/gtk-3.0/3.14/gtk-contained-dark.css
+++ b/common/gtk-3.0/3.14/gtk-contained-dark.css
@@ -1191,25 +1191,19 @@ GtkComboBox {
 /************
  * Pathbars *
  ************/
-.path-bar .button:first-child {
-  padding-left: 8px; }
-
-.path-bar .button:last-child {
-  padding-right: 8px; }
-
-.path-bar .button:only-child {
-  padding-left: 12px;
-  padding-right: 12px; }
-
-.path-bar .button GtkLabel:last-child {
-  padding-left: 2px; }
-
-.path-bar .button GtkLabel:first-child {
-  padding-right: 2px; }
-
-.path-bar .button GtkLabel:only-child {
-  padding-right: 0;
-  padding-left: 0; }
+.path-bar .button {
+  padding-left: 6px;
+  padding-right: 6px; }
+  .path-bar .button:only-child {
+    padding-left: 10px;
+    padding-right: 10px; }
+  .path-bar .button GtkLabel:last-child {
+    padding-left: 2px; }
+  .path-bar .button GtkLabel:first-child {
+    padding-right: 2px; }
+  .path-bar .button GtkLabel:only-child, .path-bar .button GtkLabel {
+    padding-right: 4px;
+    padding-left: 4px; }
 
 /**************
  * Tree Views *
diff --git a/common/gtk-3.0/3.14/gtk-contained-darker.css b/common/gtk-3.0/3.14/gtk-contained-darker.css
index 8a59577..1bc6e28 100644
--- a/common/gtk-3.0/3.14/gtk-contained-darker.css
+++ b/common/gtk-3.0/3.14/gtk-contained-darker.css
@@ -1192,25 +1192,19 @@ GtkComboBox {
 /************
  * Pathbars *
  ************/
-.path-bar .button:first-child {
-  padding-left: 8px; }
-
-.path-bar .button:last-child {
-  padding-right: 8px; }
-
-.path-bar .button:only-child {
-  padding-left: 12px;
-  padding-right: 12px; }
-
-.path-bar .button GtkLabel:last-child {
-  padding-left: 2px; }
-
-.path-bar .button GtkLabel:first-child {
-  padding-right: 2px; }
-
-.path-bar .button GtkLabel:only-child {
-  padding-right: 0;
-  padding-left: 0; }
+.path-bar .button {
+  padding-left: 6px;
+  padding-right: 6px; }
+  .path-bar .button:only-child {
+    padding-left: 10px;
+    padding-right: 10px; }
+  .path-bar .button GtkLabel:last-child {
+    padding-left: 2px; }
+  .path-bar .button GtkLabel:first-child {
+    padding-right: 2px; }
+  .path-bar .button GtkLabel:only-child, .path-bar .button GtkLabel {
+    padding-right: 4px;
+    padding-left: 4px; }
 
 /**************
  * Tree Views *
diff --git a/common/gtk-3.0/3.14/gtk-contained-solid-dark.css b/common/gtk-3.0/3.14/gtk-contained-solid-dark.css
index faacd77..82d6036 100644
--- a/common/gtk-3.0/3.14/gtk-contained-solid-dark.css
+++ b/common/gtk-3.0/3.14/gtk-contained-solid-dark.css
@@ -1191,25 +1191,19 @@ GtkComboBox {
 /************
  * Pathbars *
  ************/
-.path-bar .button:first-child {
-  padding-left: 8px; }
-
-.path-bar .button:last-child {
-  padding-right: 8px; }
-
-.path-bar .button:only-child {
-  padding-left: 12px;
-  padding-right: 12px; }
-
-.path-bar .button GtkLabel:last-child {
-  padding-left: 2px; }
-
-.path-bar .button GtkLabel:first-child {
-  padding-right: 2px; }
-
-.path-bar .button GtkLabel:only-child {
-  padding-right: 0;
-  padding-left: 0; }
+.path-bar .button {
+  padding-left: 6px;
+  padding-right: 6px; }
+  .path-bar .button:only-child {
+    padding-left: 10px;
+    padding-right: 10px; }
+  .path-bar .button GtkLabel:last-child {
+    padding-left: 2px; }
+  .path-bar .button GtkLabel:first-child {
+    padding-right: 2px; }
+  .path-bar .button GtkLabel:only-child, .path-bar .button GtkLabel {
+    padding-right: 4px;
+    padding-left: 4px; }
 
 /**************
  * Tree Views *
diff --git a/common/gtk-3.0/3.14/gtk-contained-solid-darker.css b/common/gtk-3.0/3.14/gtk-contained-solid-darker.css
index a97ce32..d0c761c 100644
--- a/common/gtk-3.0/3.14/gtk-contained-solid-darker.css
+++ b/common/gtk-3.0/3.14/gtk-contained-solid-darker.css
@@ -1192,25 +1192,19 @@ GtkComboBox {
 /************
  * Pathbars *
  ************/
-.path-bar .button:first-child {
-  padding-left: 8px; }
-
-.path-bar .button:last-child {
-  padding-right: 8px; }
-
-.path-bar .button:only-child {
-  padding-left: 12px;
-  padding-right: 12px; }
-
-.path-bar .button GtkLabel:last-child {
-  padding-left: 2px; }
-
-.path-bar .button GtkLabel:first-child {
-  padding-right: 2px; }
-
-.path-bar .button GtkLabel:only-child {
-  padding-right: 0;
-  padding-left: 0; }
+.path-bar .button {
+  padding-left: 6px;
+  padding-right: 6px; }
+  .path-bar .button:only-child {
+    padding-left: 10px;
+    padding-right: 10px; }
+  .path-bar .button GtkLabel:last-child {
+    padding-left: 2px; }
+  .path-bar .button GtkLabel:first-child {
+    padding-right: 2px; }
+  .path-bar .button GtkLabel:only-child, .path-bar .button GtkLabel {
+    padding-right: 4px;
+    padding-left: 4px; }
 
 /**************
  * Tree Views *
diff --git a/common/gtk-3.0/3.14/gtk-contained-solid.css b/common/gtk-3.0/3.14/gtk-contained-solid.css
index fcdf640..0aeb677 100644
--- a/common/gtk-3.0/3.14/gtk-contained-solid.css
+++ b/common/gtk-3.0/3.14/gtk-contained-solid.css
@@ -1191,25 +1191,19 @@ GtkComboBox {
 /************
  * Pathbars *
  ************/
-.path-bar .button:first-child {
-  padding-left: 8px; }
-
-.path-bar .button:last-child {
-  padding-right: 8px; }
-
-.path-bar .button:only-child {
-  padding-left: 12px;
-  padding-right: 12px; }
-
-.path-bar .button GtkLabel:last-child {
-  padding-left: 2px; }
-
-.path-bar .button GtkLabel:first-child {
-  padding-right: 2px; }
-
-.path-bar .button GtkLabel:only-child {
-  padding-right: 0;
-  padding-left: 0; }
+.path-bar .button {
+  padding-left: 6px;
+  padding-right: 6px; }
+  .path-bar .button:only-child {
+    padding-left: 10px;
+    padding-right: 10px; }
+  .path-bar .button GtkLabel:last-child {
+    padding-left: 2px; }
+  .path-bar .button GtkLabel:first-child {
+    padding-right: 2px; }
+  .path-bar .button GtkLabel:only-child, .path-bar .button GtkLabel {
+    padding-right: 4px;
+    padding-left: 4px; }
 
 /**************
  * Tree Views *
diff --git a/common/gtk-3.0/3.14/gtk-contained.css b/common/gtk-3.0/3.14/gtk-contained.css
index ea30eb8..ecf8f6a 100644
--- a/common/gtk-3.0/3.14/gtk-contained.css
+++ b/common/gtk-3.0/3.14/gtk-contained.css
@@ -1191,25 +1191,19 @@ GtkComboBox {
 /************
  * Pathbars *
  ************/
-.path-bar .button:first-child {
-  padding-left: 8px; }
-
-.path-bar .button:last-child {
-  padding-right: 8px; }
-
-.path-bar .button:only-child {
-  padding-left: 12px;
-  padding-right: 12px; }
-
-.path-bar .button GtkLabel:last-child {
-  padding-left: 2px; }
-
-.path-bar .button GtkLabel:first-child {
-  padding-right: 2px; }
-
-.path-bar .button GtkLabel:only-child {
-  padding-right: 0;
-  padding-left: 0; }
+.path-bar .button {
+  padding-left: 6px;
+  padding-right: 6px; }
+  .path-bar .button:only-child {
+    padding-left: 10px;
+    padding-right: 10px; }
+  .path-bar .button GtkLabel:last-child {
+    padding-left: 2px; }
+  .path-bar .button GtkLabel:first-child {
+    padding-right: 2px; }
+  .path-bar .button GtkLabel:only-child, .path-bar .button GtkLabel {
+    padding-right: 4px;
+    padding-left: 4px; }
 
 /**************
  * Tree Views *
diff --git a/common/gtk-3.0/3.14/sass/_common.scss b/common/gtk-3.0/3.14/sass/_common.scss
index 90351b7..e66377b 100644
--- a/common/gtk-3.0/3.14/sass/_common.scss
+++ b/common/gtk-3.0/3.14/sass/_common.scss
@@ -1315,21 +1315,19 @@ GtkComboBox {
 /************
  * Pathbars *
  ************/
-
 .path-bar .button {
-  //padding: 5px 6px 6px;
-  &:first-child { padding-left: 8px; }
-  &:last-child { padding-right: 8px; }
+  padding-left: 6px;
+  padding-right: 6px;
+
   &:only-child {
-    padding-left: 12px;
-    padding-right: 12px;
+    padding-left: 10px;
+    padding-right: 10px;
   }
 
   // the following is for spacing the icon and the label inside the home button
   GtkLabel:last-child { padding-left: 2px; }
   GtkLabel:first-child { padding-right: 2px; }
-  GtkLabel:only-child { padding-right: 0; padding-left: 0; }
-  //GtkImage { padding-top: 1px; }
+  GtkLabel:only-child, GtkLabel { padding-right: 4px; padding-left: 4px; }
 }
 
 /**************
diff --git a/common/gtk-3.0/3.16/gtk-contained-dark.css b/common/gtk-3.0/3.16/gtk-contained-dark.css
index 24477f4..ddab85d 100644
--- a/common/gtk-3.0/3.16/gtk-contained-dark.css
+++ b/common/gtk-3.0/3.16/gtk-contained-dark.css
@@ -1198,25 +1198,19 @@ GtkComboBox {
 /************
  * Pathbars *
  ************/
-.path-bar .button:first-child {
-  padding-left: 8px; }
-
-.path-bar .button:last-child {
-  padding-right: 8px; }
-
-.path-bar .button:only-child {
-  padding-left: 12px;
-  padding-right: 12px; }
-
-.path-bar .button GtkLabel:last-child {
-  padding-left: 2px; }
-
-.path-bar .button GtkLabel:first-child {
-  padding-right: 2px; }
-
-.path-bar .button GtkLabel:only-child {
-  padding-right: 0;
-  padding-left: 0; }
+.path-bar .button {
+  padding-left: 6px;
+  padding-right: 6px; }
+  .path-bar .button:only-child {
+    padding-left: 10px;
+    padding-right: 10px; }
+  .path-bar .button GtkLabel:last-child {
+    padding-left: 2px; }
+  .path-bar .button GtkLabel:first-child {
+    padding-right: 2px; }
+  .path-bar .button GtkLabel:only-child, .path-bar .button GtkLabel {
+    padding-right: 4px;
+    padding-left: 4px; }
 
 /**************
  * Tree Views *
diff --git a/common/gtk-3.0/3.16/gtk-contained-darker.css b/common/gtk-3.0/3.16/gtk-contained-darker.css
index 9d09368..9a3844a 100644
--- a/common/gtk-3.0/3.16/gtk-contained-darker.css
+++ b/common/gtk-3.0/3.16/gtk-contained-darker.css
@@ -1199,25 +1199,19 @@ GtkComboBox {
 /************
  * Pathbars *
  ************/
-.path-bar .button:first-child {
-  padding-left: 8px; }
-
-.path-bar .button:last-child {
-  padding-right: 8px; }
-
-.path-bar .button:only-child {
-  padding-left: 12px;
-  padding-right: 12px; }
-
-.path-bar .button GtkLabel:last-child {
-  padding-left: 2px; }
-
-.path-bar .button GtkLabel:first-child {
-  padding-right: 2px; }
-
-.path-bar .button GtkLabel:only-child {
-  padding-right: 0;
-  padding-left: 0; }
+.path-bar .button {
+  padding-left: 6px;
+  padding-right: 6px; }
+  .path-bar .button:only-child {
+    padding-left: 10px;
+    padding-right: 10px; }
+  .path-bar .button GtkLabel:last-child {
+    padding-left: 2px; }
+  .path-bar .button GtkLabel:first-child {
+    padding-right: 2px; }
+  .path-bar .button GtkLabel:only-child, .path-bar .button GtkLabel {
+    padding-right: 4px;
+    padding-left: 4px; }
 
 /**************
  * Tree Views *
diff --git a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css
index a875fa2..f955486 100644
--- a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css
+++ b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css
@@ -1198,25 +1198,19 @@ GtkComboBox {
 /************
  * Pathbars *
  ************/
-.path-bar .button:first-child {
-  padding-left: 8px; }
-
-.path-bar .button:last-child {
-  padding-right: 8px; }
-
-.path-bar .button:only-child {
-  padding-left: 12px;
-  padding-right: 12px; }
-
-.path-bar .button GtkLabel:last-child {
-  padding-left: 2px; }
-
-.path-bar .button GtkLabel:first-child {
-  padding-right: 2px; }
-
-.path-bar .button GtkLabel:only-child {
-  padding-right: 0;
-  padding-left: 0; }
+.path-bar .button {
+  padding-left: 6px;
+  padding-right: 6px; }
+  .path-bar .button:only-child {
+    padding-left: 10px;
+    padding-right: 10px; }
+  .path-bar .button GtkLabel:last-child {
+    padding-left: 2px; }
+  .path-bar .button GtkLabel:first-child {
+    padding-right: 2px; }
+  .path-bar .button GtkLabel:only-child, .path-bar .button GtkLabel {
+    padding-right: 4px;
+    padding-left: 4px; }
 
 /**************
  * Tree Views *
diff --git a/common/gtk-3.0/3.16/gtk-contained-solid-darker.css b/common/gtk-3.0/3.16/gtk-contained-solid-darker.css
index ce56d41..2bbac47 100644
--- a/common/gtk-3.0/3.16/gtk-contained-solid-darker.css
+++ b/common/gtk-3.0/3.16/gtk-contained-solid-darker.css
@@ -1199,25 +1199,19 @@ GtkComboBox {
 /************
  * Pathbars *
  ************/
-.path-bar .button:first-child {
-  padding-left: 8px; }
-
-.path-bar .button:last-child {
-  padding-right: 8px; }
-
-.path-bar .button:only-child {
-  padding-left: 12px;
-  padding-right: 12px; }
-
-.path-bar .button GtkLabel:last-child {
-  padding-left: 2px; }
-
-.path-bar .button GtkLabel:first-child {
-  padding-right: 2px; }
-
-.path-bar .button GtkLabel:only-child {
-  padding-right: 0;
-  padding-left: 0; }
+.path-bar .button {
+  padding-left: 6px;
+  padding-right: 6px; }
+  .path-bar .button:only-child {
+    padding-left: 10px;
+    padding-right: 10px; }
+  .path-bar .button GtkLabel:last-child {
+    padding-left: 2px; }
+  .path-bar .button GtkLabel:first-child {
+    padding-right: 2px; }
+  .path-bar .button GtkLabel:only-child, .path-bar .button GtkLabel {
+    padding-right: 4px;
+    padding-left: 4px; }
 
 /**************
  * Tree Views *
diff --git a/common/gtk-3.0/3.16/gtk-contained-solid.css b/common/gtk-3.0/3.16/gtk-contained-solid.css
index f78fa60..c701dbe 100644
--- a/common/gtk-3.0/3.16/gtk-contained-solid.css
+++ b/common/gtk-3.0/3.16/gtk-contained-solid.css
@@ -1198,25 +1198,19 @@ GtkComboBox {
 /************
  * Pathbars *
  ************/
-.path-bar .button:first-child {
-  padding-left: 8px; }
-
-.path-bar .button:last-child {
-  padding-right: 8px; }
-
-.path-bar .button:only-child {
-  padding-left: 12px;
-  padding-right: 12px; }
-
-.path-bar .button GtkLabel:last-child {
-  padding-left: 2px; }
-
-.path-bar .button GtkLabel:first-child {
-  padding-right: 2px; }
-
-.path-bar .button GtkLabel:only-child {
-  padding-right: 0;
-  padding-left: 0; }
+.path-bar .button {
+  padding-left: 6px;
+  padding-right: 6px; }
+  .path-bar .button:only-child {
+    padding-left: 10px;
+    padding-right: 10px; }
+  .path-bar .button GtkLabel:last-child {
+    padding-left: 2px; }
+  .path-bar .button GtkLabel:first-child {
+    padding-right: 2px; }
+  .path-bar .button GtkLabel:only-child, .path-bar .button GtkLabel {
+    padding-right: 4px;
+    padding-left: 4px; }
 
 /**************
  * Tree Views *
diff --git a/common/gtk-3.0/3.16/gtk-contained.css b/common/gtk-3.0/3.16/gtk-contained.css
index a5021a3..574f933 100644
--- a/common/gtk-3.0/3.16/gtk-contained.css
+++ b/common/gtk-3.0/3.16/gtk-contained.css
@@ -1198,25 +1198,19 @@ GtkComboBox {
 /************
  * Pathbars *
  ************/
-.path-bar .button:first-child {
-  padding-left: 8px; }
-
-.path-bar .button:last-child {
-  padding-right: 8px; }
-
-.path-bar .button:only-child {
-  padding-left: 12px;
-  padding-right: 12px; }
-
-.path-bar .button GtkLabel:last-child {
-  padding-left: 2px; }
-
-.path-bar .button GtkLabel:first-child {
-  padding-right: 2px; }
-
-.path-bar .button GtkLabel:only-child {
-  padding-right: 0;
-  padding-left: 0; }
+.path-bar .button {
+  padding-left: 6px;
+  padding-right: 6px; }
+  .path-bar .button:only-child {
+    padding-left: 10px;
+    padding-right: 10px; }
+  .path-bar .button GtkLabel:last-child {
+    padding-left: 2px; }
+  .path-bar .button GtkLabel:first-child {
+    padding-right: 2px; }
+  .path-bar .button GtkLabel:only-child, .path-bar .button GtkLabel {
+    padding-right: 4px;
+    padding-left: 4px; }
 
 /**************
  * Tree Views *
diff --git a/common/gtk-3.0/3.16/sass/_common.scss b/common/gtk-3.0/3.16/sass/_common.scss
index e252884..dd08597 100644
--- a/common/gtk-3.0/3.16/sass/_common.scss
+++ b/common/gtk-3.0/3.16/sass/_common.scss
@@ -1324,21 +1324,19 @@ GtkComboBox {
 /************
  * Pathbars *
  ************/
-
 .path-bar .button {
-  //padding: 5px 6px 6px;
-  &:first-child { padding-left: 8px; }
-  &:last-child { padding-right: 8px; }
+  padding-left: 6px;
+  padding-right: 6px;
+
   &:only-child {
-    padding-left: 12px;
-    padding-right: 12px;
+    padding-left: 10px;
+    padding-right: 10px;
   }
 
   // the following is for spacing the icon and the label inside the home button
   GtkLabel:last-child { padding-left: 2px; }
   GtkLabel:first-child { padding-right: 2px; }
-  GtkLabel:only-child { padding-right: 0; padding-left: 0; }
-  //GtkImage { padding-top: 1px; }
+  GtkLabel:only-child, GtkLabel { padding-right: 4px; padding-left: 4px; }
 }
 
 /**************