diff --git a/toolkit/themes/linux/global/tooltip.css b/toolkit/themes/linux/global/tooltip.css
index 496d8ebfbaa5..26bec1d7b47d 100644
--- a/toolkit/themes/linux/global/tooltip.css
+++ b/toolkit/themes/linux/global/tooltip.css
@@ -13,7 +13,11 @@ tooltip {
   appearance: auto;
   -moz-default-appearance: tooltip;
   max-width: 40em;
+
+  padding: 6px 10px; /* Matches Adwaita. */
+
   color: InfoText;
+  background-color: InfoBackground;
   font: message-box;
 }
 
diff --git a/toolkit/themes/osx/global/tooltip.css b/toolkit/themes/osx/global/tooltip.css
index 04392367f562..382ee0eed15f 100644
--- a/toolkit/themes/osx/global/tooltip.css
+++ b/toolkit/themes/osx/global/tooltip.css
@@ -16,6 +16,7 @@ tooltip {
   padding: 2px 3px;
   max-width: 40em;
   color: InfoText;
+  background-color: InfoBackground;
   font: message-box;
   cursor: default;
 }
diff --git a/widget/gtk/nsNativeThemeGTK.cpp b/widget/gtk/nsNativeThemeGTK.cpp
index ab5b8afbfa1c..9bd4aad25040 100644
--- a/widget/gtk/nsNativeThemeGTK.cpp
+++ b/widget/gtk/nsNativeThemeGTK.cpp
@@ -1377,6 +1377,7 @@ bool nsNativeThemeGTK::GetWidgetPadding(nsDeviceContext* aContext,
   switch (aAppearance) {
     case StyleAppearance::ButtonFocus:
     case StyleAppearance::Toolbarbutton:
+    case StyleAppearance::Tooltip:
     case StyleAppearance::MozWindowButtonBox:
     case StyleAppearance::MozWindowButtonClose:
     case StyleAppearance::MozWindowButtonMinimize: