diff --git a/packages/grafana-ui/src/components/Button/Button.tsx b/packages/grafana-ui/src/components/Button/Button.tsx
index a9c6ada9f3c..8c975817288 100644
--- a/packages/grafana-ui/src/components/Button/Button.tsx
+++ b/packages/grafana-ui/src/components/Button/Button.tsx
@@ -94,6 +94,7 @@ export const getButtonStyles = stylesFactory(({ theme, size, variant }: StylePro
         font-size: ${fontSize};
         padding: ${padding};
         height: ${height};
+        line-height: ${height};
         vertical-align: middle;
         cursor: pointer;
         border: 1px solid ${borderColor};
diff --git a/packages/grafana-ui/src/components/Select/_Select.scss b/packages/grafana-ui/src/components/Select/_Select.scss
index d110e45565d..671d80841a8 100644
--- a/packages/grafana-ui/src/components/Select/_Select.scss
+++ b/packages/grafana-ui/src/components/Select/_Select.scss
@@ -219,4 +219,5 @@ $select-input-bg-disabled: $input-bg-disabled;
 
 .select-button {
   display: flex;
+  align-items: center;
 }