diff --git a/panel/src/scss/components/_buttons.scss b/panel/src/scss/components/_buttons.scss
index a84da3dd..8f7ab602 100644
--- a/panel/src/scss/components/_buttons.scss
+++ b/panel/src/scss/components/_buttons.scss
@@ -40,6 +40,7 @@
     & .icon {
         display: inline-block;
         margin-right: 0.25rem;
+        vertical-align: text-top;
     }
 }
 
@@ -132,6 +133,7 @@
 .button-link {
     & .icon {
         margin-right: 0;
+        vertical-align: -0.125rem;
     }
 }
 
diff --git a/panel/src/scss/components/_icon.scss b/panel/src/scss/components/_icon.scss
index 3614f023..2a70cd0a 100644
--- a/panel/src/scss/components/_icon.scss
+++ b/panel/src/scss/components/_icon.scss
@@ -4,5 +4,5 @@
     min-width: 16px;
     height: 1em;
     min-height: 16px;
-    vertical-align: -0.125rem;
+    vertical-align: -0.125em;
 }
diff --git a/panel/src/scss/components/_tooltip.scss b/panel/src/scss/components/_tooltip.scss
index c6f6c490..e012b174 100644
--- a/panel/src/scss/components/_tooltip.scss
+++ b/panel/src/scss/components/_tooltip.scss
@@ -13,6 +13,6 @@
 }
 
 .tooltip .icon {
-    transform: scale(0.75);
-    vertical-align: -0.25rem;
+    min-width: auto;
+    min-height: auto;
 }