diff --git a/packages/grafana-ui/src/components/Select/_Select.scss b/packages/grafana-ui/src/components/Select/_Select.scss
index 5814b2aaa6f..fae8fc46254 100644
--- a/packages/grafana-ui/src/components/Select/_Select.scss
+++ b/packages/grafana-ui/src/components/Select/_Select.scss
@@ -180,7 +180,7 @@ $select-input-bg-disabled: $input-bg-disabled;
   flex-direction: column;
   flex-grow: 1;
   padding-right: 10px;
-  font-weight: 500;
+  font-weight: $font-weight-semi-bold;
 }
 
 .gf-form-select-box__desc-option__desc {
diff --git a/packages/grafana-ui/src/components/TimePicker/_TimePicker.scss b/packages/grafana-ui/src/components/TimePicker/_TimePicker.scss
index a8c121631eb..f32fc920550 100644
--- a/packages/grafana-ui/src/components/TimePicker/_TimePicker.scss
+++ b/packages/grafana-ui/src/components/TimePicker/_TimePicker.scss
@@ -11,7 +11,7 @@
   color: $orange;
   font-size: 75%;
   padding: 3px;
-  font-weight: 500;
+  font-weight: $font-weight-semi-bold;
   margin-left: 4px;
   position: relative;
 }
diff --git a/packages/grafana-ui/src/components/Tooltip/_Tooltip.scss b/packages/grafana-ui/src/components/Tooltip/_Tooltip.scss
index a346e8d5f35..7af558624a9 100644
--- a/packages/grafana-ui/src/components/Tooltip/_Tooltip.scss
+++ b/packages/grafana-ui/src/components/Tooltip/_Tooltip.scss
@@ -28,7 +28,7 @@ $popper-margin-from-ref: 5px;
   box-shadow: 0 0 2px rgba(0, 0, 0, 0.5);
   padding: 6px 10px;
   color: $tooltipColor;
-  font-weight: 500;
+  font-weight: $font-weight-semi-bold;
 
   .popper__arrow {
     border-color: $tooltipBackground;
diff --git a/public/sass/components/_modals.scss b/public/sass/components/_modals.scss
index 1f145c8441c..be9fbcd38c0 100644
--- a/public/sass/components/_modals.scss
+++ b/public/sass/components/_modals.scss
@@ -157,7 +157,7 @@
     margin-top: 5px;
     strong {
       color: $text-color-emphasis;
-      font-weight: 500;
+      font-weight: $font-weight-semi-bold;
     }
   }
 
diff --git a/public/sass/components/_panel_editor.scss b/public/sass/components/_panel_editor.scss
index c1202356805..be0c1c300c2 100644
--- a/public/sass/components/_panel_editor.scss
+++ b/public/sass/components/_panel_editor.scss
@@ -168,7 +168,7 @@
   flex-direction: column;
   align-self: center;
   height: 23px;
-  font-weight: 500;
+  font-weight: $font-weight-semi-bold;
 }
 
 .viz-picker__item-img {
diff --git a/public/sass/components/_panel_pluginlist.scss b/public/sass/components/_panel_pluginlist.scss
index a51748a984d..f2d4de11c1a 100644
--- a/public/sass/components/_panel_pluginlist.scss
+++ b/public/sass/components/_panel_pluginlist.scss
@@ -53,7 +53,7 @@
 }
 
 .pluginlist-emphasis {
-  font-weight: 600;
+  font-weight: $font-weight-semi-bold;
 }
 
 .pluginlist-none-installed {
diff --git a/public/sass/components/_tooltip.scss b/public/sass/components/_tooltip.scss
index 6801f196d59..f0b3e11b461 100644
--- a/public/sass/components/_tooltip.scss
+++ b/public/sass/components/_tooltip.scss
@@ -9,7 +9,7 @@
   display: block;
   visibility: visible;
   line-height: 1.4;
-  font-weight: 500;
+  font-weight: $font-weight-semi-bold;
   @include opacity(0);
 
   &.in {
diff --git a/public/sass/pages/_explore.scss b/public/sass/pages/_explore.scss
index 5eb3f7c89f8..5e70019e0fc 100644
--- a/public/sass/pages/_explore.scss
+++ b/public/sass/pages/_explore.scss
@@ -179,7 +179,7 @@
 }
 
 .explore-panel__header-label {
-  font-weight: 500;
+  font-weight: $font-weight-semi-bold;
   margin-right: $space-sm;
   font-size: $font-size-h6;
   box-shadow: $text-shadow-faint;
@@ -364,7 +364,7 @@
 .ReactTable .rt-thead.-header .rt-th {
   text-align: left;
   color: $blue;
-  font-weight: 500;
+  font-weight: $font-weight-semi-bold;
 }
 .ReactTable .rt-thead .rt-td,
 .ReactTable .rt-thead .rt-th {
diff --git a/public/sass/utils/_utils.scss b/public/sass/utils/_utils.scss
index abe252b9b7a..8a38841c047 100644
--- a/public/sass/utils/_utils.scss
+++ b/public/sass/utils/_utils.scss
@@ -7,7 +7,7 @@
 }
 
 .emphasis-word {
-  font-weight: 500;
+  font-weight: $font-weight-semi-bold;
   color: $text-color-emphasis;
 }