7 files changed, 91 insertions, 61 deletions
diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css
index bbc4fee..5a4345f 100644
--- a/common/gtk-3.0/3.20/gtk-dark.css
+++ b/common/gtk-3.0/3.20/gtk-dark.css
@@ -1274,20 +1274,24 @@ headerbar entry, headerbar button, headerbar separator, headerbar .sidebar separ
   .primary-toolbar scale trough:disabled, headerbar scale trough:disabled {
     background-image: linear-gradient(to bottom, rgba(21, 23, 28, 0.27)); }
 
-.path-bar button:only-child {
-  padding-left: 10px;
+.path-bar button.text-button, .path-bar button.image-button, .path-bar button {
+  padding-left: 6px;
+  padding-right: 6px; }
+
+.path-bar button.text-button.image-button label {
+  padding-left: 0;
+  padding-right: 0; }
+
+.path-bar button.text-button.image-button label:last-child, .path-bar button label:last-child {
   padding-right: 10px; }
 
-.path-bar button label:last-child {
-  padding-left: 4px; }
+.path-bar button.text-button.image-button label:first-child, .path-bar button label:first-child {
+  padding-left: 10px; }
 
-.path-bar button label:first-child {
+.path-bar button image {
+  padding-left: 4px;
   padding-right: 4px; }
 
-.path-bar button label:only-child, .path-bar button label {
-  padding-right: 0;
-  padding-left: 0; }
-
 treeview.view {
   -GtkTreeView-grid-line-width: 1;
   -GtkTreeView-grid-line-pattern: '';
diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css
index 230f506..fd8bfff 100644
--- a/common/gtk-3.0/3.20/gtk-darker.css
+++ b/common/gtk-3.0/3.20/gtk-darker.css
@@ -1273,20 +1273,24 @@ headerbar entry, headerbar button, headerbar separator, headerbar .sidebar separ
   .primary-toolbar scale trough:disabled, headerbar scale trough:disabled {
     background-image: linear-gradient(to bottom, rgba(21, 23, 28, 0.27)); }
 
-.path-bar button:only-child {
-  padding-left: 10px;
+.path-bar button.text-button, .path-bar button.image-button, .path-bar button {
+  padding-left: 6px;
+  padding-right: 6px; }
+
+.path-bar button.text-button.image-button label {
+  padding-left: 0;
+  padding-right: 0; }
+
+.path-bar button.text-button.image-button label:last-child, .path-bar button label:last-child {
   padding-right: 10px; }
 
-.path-bar button label:last-child {
-  padding-left: 4px; }
+.path-bar button.text-button.image-button label:first-child, .path-bar button label:first-child {
+  padding-left: 10px; }
 
-.path-bar button label:first-child {
+.path-bar button image {
+  padding-left: 4px;
   padding-right: 4px; }
 
-.path-bar button label:only-child, .path-bar button label {
-  padding-right: 0;
-  padding-left: 0; }
-
 treeview.view {
   -GtkTreeView-grid-line-width: 1;
   -GtkTreeView-grid-line-pattern: '';
diff --git a/common/gtk-3.0/3.20/gtk-solid-dark.css b/common/gtk-3.0/3.20/gtk-solid-dark.css
index 11d3756..2ee3949 100644
--- a/common/gtk-3.0/3.20/gtk-solid-dark.css
+++ b/common/gtk-3.0/3.20/gtk-solid-dark.css
@@ -1274,20 +1274,24 @@ headerbar entry, headerbar button, headerbar separator, headerbar .sidebar separ
   .primary-toolbar scale trough:disabled, headerbar scale trough:disabled {
     background-image: linear-gradient(to bottom, rgba(21, 23, 28, 0.3)); }
 
-.path-bar button:only-child {
-  padding-left: 10px;
+.path-bar button.text-button, .path-bar button.image-button, .path-bar button {
+  padding-left: 6px;
+  padding-right: 6px; }
+
+.path-bar button.text-button.image-button label {
+  padding-left: 0;
+  padding-right: 0; }
+
+.path-bar button.text-button.image-button label:last-child, .path-bar button label:last-child {
   padding-right: 10px; }
 
-.path-bar button label:last-child {
-  padding-left: 4px; }
+.path-bar button.text-button.image-button label:first-child, .path-bar button label:first-child {
+  padding-left: 10px; }
 
-.path-bar button label:first-child {
+.path-bar button image {
+  padding-left: 4px;
   padding-right: 4px; }
 
-.path-bar button label:only-child, .path-bar button label {
-  padding-right: 0;
-  padding-left: 0; }
-
 treeview.view {
   -GtkTreeView-grid-line-width: 1;
   -GtkTreeView-grid-line-pattern: '';
diff --git a/common/gtk-3.0/3.20/gtk-solid-darker.css b/common/gtk-3.0/3.20/gtk-solid-darker.css
index cf53a35..310f2d4 100644
--- a/common/gtk-3.0/3.20/gtk-solid-darker.css
+++ b/common/gtk-3.0/3.20/gtk-solid-darker.css
@@ -1273,20 +1273,24 @@ headerbar entry, headerbar button, headerbar separator, headerbar .sidebar separ
   .primary-toolbar scale trough:disabled, headerbar scale trough:disabled {
     background-image: linear-gradient(to bottom, rgba(21, 23, 28, 0.3)); }
 
-.path-bar button:only-child {
-  padding-left: 10px;
+.path-bar button.text-button, .path-bar button.image-button, .path-bar button {
+  padding-left: 6px;
+  padding-right: 6px; }
+
+.path-bar button.text-button.image-button label {
+  padding-left: 0;
+  padding-right: 0; }
+
+.path-bar button.text-button.image-button label:last-child, .path-bar button label:last-child {
   padding-right: 10px; }
 
-.path-bar button label:last-child {
-  padding-left: 4px; }
+.path-bar button.text-button.image-button label:first-child, .path-bar button label:first-child {
+  padding-left: 10px; }
 
-.path-bar button label:first-child {
+.path-bar button image {
+  padding-left: 4px;
   padding-right: 4px; }
 
-.path-bar button label:only-child, .path-bar button label {
-  padding-right: 0;
-  padding-left: 0; }
-
 treeview.view {
   -GtkTreeView-grid-line-width: 1;
   -GtkTreeView-grid-line-pattern: '';
diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css
index e717f54..6a5ad0d 100644
--- a/common/gtk-3.0/3.20/gtk-solid.css
+++ b/common/gtk-3.0/3.20/gtk-solid.css
@@ -1277,20 +1277,24 @@ headerbar entry, headerbar button, headerbar separator, headerbar .sidebar separ
   .primary-toolbar scale trough:disabled, headerbar scale trough:disabled {
     background-image: linear-gradient(to bottom, rgba(82, 93, 118, 0.1)); }
 
-.path-bar button:only-child {
-  padding-left: 10px;
+.path-bar button.text-button, .path-bar button.image-button, .path-bar button {
+  padding-left: 6px;
+  padding-right: 6px; }
+
+.path-bar button.text-button.image-button label {
+  padding-left: 0;
+  padding-right: 0; }
+
+.path-bar button.text-button.image-button label:last-child, .path-bar button label:last-child {
   padding-right: 10px; }
 
-.path-bar button label:last-child {
-  padding-left: 4px; }
+.path-bar button.text-button.image-button label:first-child, .path-bar button label:first-child {
+  padding-left: 10px; }
 
-.path-bar button label:first-child {
+.path-bar button image {
+  padding-left: 4px;
   padding-right: 4px; }
 
-.path-bar button label:only-child, .path-bar button label {
-  padding-right: 0;
-  padding-left: 0; }
-
 treeview.view {
   -GtkTreeView-grid-line-width: 1;
   -GtkTreeView-grid-line-pattern: '';
diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css
index 4aacb66..9b6cb2e 100644
--- a/common/gtk-3.0/3.20/gtk.css
+++ b/common/gtk-3.0/3.20/gtk.css
@@ -1277,20 +1277,24 @@ headerbar entry, headerbar button, headerbar separator, headerbar .sidebar separ
   .primary-toolbar scale trough:disabled, headerbar scale trough:disabled {
     background-image: linear-gradient(to bottom, rgba(82, 93, 118, 0.1)); }
 
-.path-bar button:only-child {
-  padding-left: 10px;
+.path-bar button.text-button, .path-bar button.image-button, .path-bar button {
+  padding-left: 6px;
+  padding-right: 6px; }
+
+.path-bar button.text-button.image-button label {
+  padding-left: 0;
+  padding-right: 0; }
+
+.path-bar button.text-button.image-button label:last-child, .path-bar button label:last-child {
   padding-right: 10px; }
 
-.path-bar button label:last-child {
-  padding-left: 4px; }
+.path-bar button.text-button.image-button label:first-child, .path-bar button label:first-child {
+  padding-left: 10px; }
 
-.path-bar button label:first-child {
+.path-bar button image {
+  padding-left: 4px;
   padding-right: 4px; }
 
-.path-bar button label:only-child, .path-bar button label {
-  padding-right: 0;
-  padding-left: 0; }
-
 treeview.view {
   -GtkTreeView-grid-line-width: 1;
   -GtkTreeView-grid-line-pattern: '';
diff --git a/common/gtk-3.0/3.20/sass/_common.scss b/common/gtk-3.0/3.20/sass/_common.scss
index 987f6ea..c4170db 100644
--- a/common/gtk-3.0/3.20/sass/_common.scss
+++ b/common/gtk-3.0/3.20/sass/_common.scss
@@ -1302,16 +1302,22 @@ headerbar {
 // Pathbars
 //
 .path-bar button {
+  &.text-button, &.image-button, & {
+    padding-left: 6px;
+    padding-right: 6px;
+  }
 
-  &:only-child {
-    padding-left: 10px;
-    padding-right: 10px;
+  &.text-button.image-button label { padding-left: 0; padding-right: 0; }
+
+  &.text-button.image-button, & {
+    label:last-child { padding-right: 10px; }
+    label:first-child { padding-left: 10px; }
   }
 
-  // the following is for spacing the icon and the label inside the home button
-  label:last-child { padding-left: 4px; }
-  label:first-child { padding-right: 4px; }
-  label:only-child, label { padding-right: 0; padding-left: 0; }
+  image {
+    padding-left: 4px;
+    padding-right: 4px;
+  }
 }
 
 //