diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css
index 971a1c3..3fadb61 100644
--- a/common/gtk-3.0/3.20/gtk-dark.css
+++ b/common/gtk-3.0/3.20/gtk-dark.css
@@ -2512,10 +2512,11 @@ tooltip {
   tooltip.background {
     background-color: rgba(53, 57, 69, 0.95);
     background-clip: padding-box; }
+    tooltip.background label {
+      padding: 4px; }
   tooltip decoration {
     background-color: transparent; }
   tooltip * {
-    padding: 4px;
     background-color: transparent;
     color: #BAC3CF; }
 
diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css
index 46b1a4b..ae5b4dc 100644
--- a/common/gtk-3.0/3.20/gtk-darker.css
+++ b/common/gtk-3.0/3.20/gtk-darker.css
@@ -2511,10 +2511,11 @@ tooltip {
   tooltip.background {
     background-color: rgba(53, 57, 69, 0.95);
     background-clip: padding-box; }
+    tooltip.background label {
+      padding: 4px; }
   tooltip decoration {
     background-color: transparent; }
   tooltip * {
-    padding: 4px;
     background-color: transparent;
     color: #BAC3CF; }
 
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 028bf7a..f7bc549 100644
--- a/common/gtk-3.0/3.20/gtk-solid-dark.css
+++ b/common/gtk-3.0/3.20/gtk-solid-dark.css
@@ -2512,10 +2512,11 @@ tooltip {
   tooltip.background {
     background-color: #353945;
     background-clip: padding-box; }
+    tooltip.background label {
+      padding: 4px; }
   tooltip decoration {
     background-color: transparent; }
   tooltip * {
-    padding: 4px;
     background-color: transparent;
     color: #BAC3CF; }
 
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 99ac180..d3ccd8f 100644
--- a/common/gtk-3.0/3.20/gtk-solid-darker.css
+++ b/common/gtk-3.0/3.20/gtk-solid-darker.css
@@ -2511,10 +2511,11 @@ tooltip {
   tooltip.background {
     background-color: #353945;
     background-clip: padding-box; }
+    tooltip.background label {
+      padding: 4px; }
   tooltip decoration {
     background-color: transparent; }
   tooltip * {
-    padding: 4px;
     background-color: transparent;
     color: #BAC3CF; }
 
diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css
index 7f67563..49e06ff 100644
--- a/common/gtk-3.0/3.20/gtk-solid.css
+++ b/common/gtk-3.0/3.20/gtk-solid.css
@@ -2515,10 +2515,11 @@ tooltip {
   tooltip.background {
     background-color: #353945;
     background-clip: padding-box; }
+    tooltip.background label {
+      padding: 4px; }
   tooltip decoration {
     background-color: transparent; }
   tooltip * {
-    padding: 4px;
     background-color: transparent;
     color: #BAC3CF; }
 
diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css
index 00bbb30..37b7bd1 100644
--- a/common/gtk-3.0/3.20/gtk.css
+++ b/common/gtk-3.0/3.20/gtk.css
@@ -2515,10 +2515,11 @@ tooltip {
   tooltip.background {
     background-color: rgba(53, 57, 69, 0.95);
     background-clip: padding-box; }
+    tooltip.background label {
+      padding: 4px; }
   tooltip decoration {
     background-color: transparent; }
   tooltip * {
-    padding: 4px;
     background-color: transparent;
     color: #BAC3CF; }
 
diff --git a/common/gtk-3.0/3.20/sass/_common.scss b/common/gtk-3.0/3.20/sass/_common.scss
index 6438c03..9026edd 100644
--- a/common/gtk-3.0/3.20/sass/_common.scss
+++ b/common/gtk-3.0/3.20/sass/_common.scss
@@ -2700,6 +2700,8 @@ tooltip {
     // see https://bugzilla.gnome.org/show_bug.cgi?id=736155 for details.
     background-color: $osd_bg_color;
     background-clip: padding-box;
+
+    label { padding: 4px; }
   }
 
   border-radius: 2px;
@@ -2708,7 +2710,6 @@ tooltip {
   decoration { background-color: transparent; }
 
   * { //Yeah this is ugly
-    padding: 4px;
     background-color: transparent;
     color: $osd_fg_color; // just to be sure
   }