diff --git a/public/app/core/components/Branding/Branding.tsx b/public/app/core/components/Branding/Branding.tsx
index b892ac3319f..73cd15e3a36 100644
--- a/public/app/core/components/Branding/Branding.tsx
+++ b/public/app/core/components/Branding/Branding.tsx
@@ -7,9 +7,13 @@ export interface BrandComponentProps {
 }
 
 export const LoginLogo: FC<BrandComponentProps> = ({ className }) => {
+  const maxSize = css`
+    max-width: 150px;
+  `;
+
   return (
     <>
-      <img className={className} src="public/img/grafana_icon.svg" alt="Grafana" />
+      <img className={cx(className, maxSize)} src="public/img/grafana_icon.svg" alt="Grafana" />
       <div className="logo-wordmark" />
     </>
   );
diff --git a/public/app/core/components/Login/LoginPage.tsx b/public/app/core/components/Login/LoginPage.tsx
index c565e0de1d7..d5faea93799 100644
--- a/public/app/core/components/Login/LoginPage.tsx
+++ b/public/app/core/components/Login/LoginPage.tsx
@@ -15,7 +15,7 @@ export const LoginPage: FC = () => {
     <Branding.LoginBackground className="login container">
       <div className="login-content">
         <div className="login-branding">
-          <Branding.LoginLogo className="logo-icon" />
+          <Branding.LoginLogo className="login-logo" />
         </div>
         <LoginCtrl>
           {({
diff --git a/public/app/features/admin/LicenseChrome.tsx b/public/app/features/admin/LicenseChrome.tsx
index 3b0c87f8ec7..60f36cbb261 100644
--- a/public/app/features/admin/LicenseChrome.tsx
+++ b/public/app/features/admin/LicenseChrome.tsx
@@ -57,7 +57,6 @@ export const LicenseChrome: React.FC<Props> = ({ header, editionNotice, subheade
           }}
         >
           <img
-            className="logo-icon"
             src="/public/img/grafana_icon.svg"
             alt="Grafana"
             width="80px"
diff --git a/public/sass/pages/_login.scss b/public/sass/pages/_login.scss
index 4eb32c4b83b..bc0f338bcbb 100644
--- a/public/sass/pages/_login.scss
+++ b/public/sass/pages/_login.scss
@@ -115,12 +115,13 @@ select:-webkit-autofill:focus {
   align-items: center;
   justify-content: center;
   flex-grow: 0;
-  padding-top: $space-xl;
+  padding: $space-xl;
+}
 
-  .logo-icon {
-    width: 70px;
-    margin-bottom: 15px;
-  }
+.login-logo {
+  width: 100%;
+  max-width: 250px;
+  margin-bottom: 15px;
 }
 
 .app-grafana {
@@ -285,10 +286,6 @@ select:-webkit-autofill:focus {
 @include media-breakpoint-up(sm) {
   .login-branding {
     padding: $space-md;
-
-    .logo-icon {
-      width: 80px;
-    }
   }
 }
 
@@ -309,10 +306,6 @@ select:-webkit-autofill:focus {
     padding: $space-xl;
     flex-grow: 1;
     border-right: 1px solid $login-border;
-
-    .logo-icon {
-      width: 130px;
-    }
   }
 
   .login-button-group {