diff --git a/components/button/theme.css b/components/button/theme.css
index 61757074..1f31d5ab 100644
--- a/components/button/theme.css
+++ b/components/button/theme.css
@@ -47,7 +47,7 @@
   & > span:not([data-react-toolbox='tooltip']) {
     display: inline-block;
     line-height: var(--button-height);
-    vertical-align: top;
+    vertical-align: middle;
   }
 
   & > svg {
@@ -131,7 +131,7 @@
   height: var(--button-floating-height);
   width: var(--button-floating-height);
 
-  & .icon {
+  & .icon:not([data-react-toolbox='tooltip']) {
     line-height: var(--button-floating-height);
   }
 
diff --git a/spec/components/button.js b/spec/components/button.js
index 03ed7d2b..2f199e5a 100644
--- a/spec/components/button.js
+++ b/spec/components/button.js
@@ -15,6 +15,7 @@ const ButtonTest = () => (
     <Button icon='inbox' label='Inbox' flat />
     <Button icon='add' floating />
     <Button icon='add' floating primary />
+    <Button href='http://github.com/javivelasco' target='_blank' icon='link' floating accent />
     <Button icon='add' floating primary disabled />
     <Button icon='add' floating accent mini />
     <IconButton icon='favorite' accent />