diff --git a/packages/grafana-ui/src/themes/_variables.dark.scss.tmpl.ts b/packages/grafana-ui/src/themes/_variables.dark.scss.tmpl.ts
index fc0f677c660..03f27053bf9 100644
--- a/packages/grafana-ui/src/themes/_variables.dark.scss.tmpl.ts
+++ b/packages/grafana-ui/src/themes/_variables.dark.scss.tmpl.ts
@@ -84,9 +84,9 @@ $query-orange: ${theme.v1.palette.orange};
 
 // Status colors
 // -------------------------¨
-$online: ${theme.v1.palette.online};
-$warn: ${theme.v1.palette.warn};
-$critical: ${theme.v1.palette.critical};
+$online: ${theme.colors.success.text};
+$warn: ${theme.colors.warning.text};
+$critical: ${theme.colors.error.text};
 
 // Scaffolding
 // -------------------------
diff --git a/packages/grafana-ui/src/themes/_variables.light.scss.tmpl.ts b/packages/grafana-ui/src/themes/_variables.light.scss.tmpl.ts
index 55edebb7a51..459798d4427 100644
--- a/packages/grafana-ui/src/themes/_variables.light.scss.tmpl.ts
+++ b/packages/grafana-ui/src/themes/_variables.light.scss.tmpl.ts
@@ -80,9 +80,10 @@ $query-orange: ${theme.v1.palette.orange};
 
 // Status colors
 // -------------------------
-$online: ${theme.v1.palette.online};
-$warn: ${theme.v1.palette.warn};
-$critical: ${theme.v1.palette.critical};
+$online: ${theme.colors.success.text};
+$warn: ${theme.colors.warning.text};
+$critical: ${theme.colors.error.text};
+
 
 // Scaffolding
 // -------------------------
diff --git a/public/sass/_variables.dark.generated.scss b/public/sass/_variables.dark.generated.scss
index 6f3a6025e38..905f6a67796 100644
--- a/public/sass/_variables.dark.generated.scss
+++ b/public/sass/_variables.dark.generated.scss
@@ -87,9 +87,9 @@ $query-orange: #eb7b18;
 
 // Status colors
 // -------------------------¨
-$online: #1A7F4B;
-$warn: #1A7F4B;
-$critical: #1A7F4B;
+$online: #6CCF8E;
+$warn: #F8D06B;
+$critical: #FF5286;
 
 // Scaffolding
 // -------------------------
diff --git a/public/sass/_variables.light.generated.scss b/public/sass/_variables.light.generated.scss
index 12752f3c3fa..66f568c4b91 100644
--- a/public/sass/_variables.light.generated.scss
+++ b/public/sass/_variables.light.generated.scss
@@ -83,8 +83,9 @@ $query-orange: #eb7b18;
 // Status colors
 // -------------------------
 $online: #1A7F4B;
-$warn: #1A7F4B;
-$critical: #1A7F4B;
+$warn: #BD4B00;
+$critical: #CF0E5B;
+
 
 // Scaffolding
 // -------------------------
diff --git a/public/sass/pages/_alerting.scss b/public/sass/pages/_alerting.scss
index 51e4eab174c..d32cbae251e 100644
--- a/public/sass/pages/_alerting.scss
+++ b/public/sass/pages/_alerting.scss
@@ -1,18 +1,22 @@
 .alert-state-paused,
 .alert-state-pending {
   color: $text-muted;
+  font-weight: $font-weight-semi-bold;
 }
 
 .alert-state-ok {
   color: $online;
+  font-weight: $font-weight-semi-bold;
 }
 
 .alert-state-warning {
   color: $warn;
+  font-weight: $font-weight-semi-bold;
 }
 
 .alert-state-critical {
   color: $critical;
+  font-weight: $font-weight-semi-bold;
 }
 
 .alert-notify-emails {