diff --git a/packages/grafana-ui/src/components/Alert/Alert.tsx b/packages/grafana-ui/src/components/Alert/Alert.tsx
index 110f2ccbf8e..2a0a8473028 100644
--- a/packages/grafana-ui/src/components/Alert/Alert.tsx
+++ b/packages/grafana-ui/src/components/Alert/Alert.tsx
@@ -171,10 +171,12 @@ const getStyles = (
       overflow-y: auto;
     `,
     buttonWrapper: css`
-      padding: ${theme.spacing(1)};
+      margin-left: ${theme.spacing(1)};
       background: none;
       display: flex;
       align-items: center;
+      align-self: center;
+      background: ${theme.colors.background.primary};
     `,
     close: css`
       position: relative;
diff --git a/packages/grafana-ui/src/components/Alert/InlineBanner.story.tsx b/packages/grafana-ui/src/components/Alert/InlineBanner.story.tsx
index 5da630ce66b..4faeeacbd3c 100644
--- a/packages/grafana-ui/src/components/Alert/InlineBanner.story.tsx
+++ b/packages/grafana-ui/src/components/Alert/InlineBanner.story.tsx
@@ -80,12 +80,7 @@ export const Examples: ComponentStory<typeof Alert> = () => {
       <StoryExample name="Severities">
         <VerticalGroup>
           {severities.map((severity) => (
-            <Alert
-              title={`Severity: ${severity}`}
-              severity={severity}
-              key={severity}
-              onRemove={action('Remove button clicked')}
-            >
+            <Alert title={`Severity: ${severity}`} severity={severity} key={severity}>
               Child content
             </Alert>
           ))}
diff --git a/public/sass/_variables.dark.generated.scss b/public/sass/_variables.dark.generated.scss
index e1197d4f35e..6683210d06e 100644
--- a/public/sass/_variables.dark.generated.scss
+++ b/public/sass/_variables.dark.generated.scss
@@ -80,7 +80,7 @@ $variable: #6E9FFF;
 
 $brand-primary: #eb7b18;
 $brand-success: #1A7F4B;
-$brand-warning: #F5B73D;
+$brand-warning: #FF9900;
 $brand-danger: #D10E5C;
 
 $query-red: #FF5286;
@@ -91,7 +91,7 @@ $query-orange: #eb7b18;
 // Status colors
 // -------------------------¨
 $online: #6CCF8E;
-$warn: #F8D06B;
+$warn: #fbad37;
 $critical: #FF5286;
 
 // Scaffolding
@@ -275,14 +275,14 @@ $tab-border-color: $dark-9;
 
 // Form states and alerts
 // -------------------------
-$warning-text-color: #F8D06B;
+$warning-text-color: #fbad37;
 $error-text-color: #FF5286;
 $success-text-color: #6CCF8E;
 
 $alert-error-bg: #D10E5C;
 $alert-success-bg: #1A7F4B;
-$alert-warning-bg: #F5B73D;
-$alert-info-bg: #F5B73D;
+$alert-warning-bg: #FF9900;
+$alert-info-bg: #FF9900;
 
 // Tooltips and popovers
 // -------------------------
diff --git a/public/sass/_variables.light.generated.scss b/public/sass/_variables.light.generated.scss
index 84147e39fc4..724d00fd233 100644
--- a/public/sass/_variables.light.generated.scss
+++ b/public/sass/_variables.light.generated.scss
@@ -75,7 +75,7 @@ $variable: #1F62E0;
 
 $brand-primary: #eb7b18;
 $brand-success: #1B855E;
-$brand-warning: #FAD34A;
+$brand-warning: #FF9900;
 $brand-danger: #E0226E;
 
 $query-red: #CF0E5B;
@@ -86,7 +86,7 @@ $query-orange: #eb7b18;
 // Status colors
 // -------------------------
 $online: #0A764E;
-$warn: #8A6C00;
+$warn: #B5510D;
 $critical: #CF0E5B;
 
 
@@ -272,14 +272,14 @@ $tab-border-color: $gray-5;
 
 // Form states and alerts
 // -------------------------
-$warning-text-color: #8A6C00;
+$warning-text-color: #B5510D;
 $error-text-color: #CF0E5B;
 $success-text-color: #0A764E;
 
 $alert-error-bg: #E0226E;
 $alert-success-bg: #1B855E;
-$alert-warning-bg: #FAD34A;
-$alert-info-bg: #FAD34A;
+$alert-warning-bg: #FF9900;
+$alert-info-bg: #FF9900;
 
 // Tooltips and popovers
 $tooltipBackground: #F4F5F5;