diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 429bd371f0..bddf62f632 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -3604,10 +3604,14 @@ tooltip {
     color: white;
   }
 
-  padding: 4px;
+  padding: 10px;
   border-radius: 5px;
   box-shadow: none; // otherwise it gets inherited by windowframe.csd
   text-shadow: 0 1px black;
+
+  > box {
+    border-spacing: 6px;
+  }
 }
 
 
diff --git a/gtk/ui/gtktooltipwindow.ui b/gtk/ui/gtktooltipwindow.ui
index fd2e7b7fd3..127fa045e4 100644
--- a/gtk/ui/gtktooltipwindow.ui
+++ b/gtk/ui/gtktooltipwindow.ui
@@ -6,11 +6,6 @@
     </style>
     <child>
       <object class="GtkBox" id="box">
-        <property name="spacing">6</property>
-        <property name="margin-top">6</property>
-        <property name="margin-bottom">6</property>
-        <property name="margin-start">6</property>
-        <property name="margin-end">6</property>
         <child>
           <object class="GtkImage" id="image">
             <property name="icon-name">image-missing</property>