diff --git a/Dockerfile b/Dockerfile
index 3d7508beae9fc..ecdc34c92df1c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -71,17 +71,6 @@ ENV BUILD_BRANCH=${BUILD_BRANCH}
 
 RUN make build-go GO_BUILD_TAGS=${GO_BUILD_TAGS} WIRE_TAGS=${WIRE_TAGS}
 
-FROM ${BASE_IMAGE} as tgz-builder
-
-WORKDIR /tmp/grafana
-
-ARG GRAFANA_TGZ="grafana-latest.linux-x64-musl.tar.gz"
-
-COPY ${GRAFANA_TGZ} /tmp/grafana.tar.gz
-
-# add -v to make tar print every file it extracts
-RUN tar x -z -f /tmp/grafana.tar.gz --strip-components=1
-
 # helpers for COPY --from
 FROM ${GO_SRC} as go-src
 FROM ${JS_SRC} as js-src
diff --git a/cloudian_build.sh b/cloudian_build.sh
new file mode 100755
index 0000000000000..f66be4362052c
--- /dev/null
+++ b/cloudian_build.sh
@@ -0,0 +1,42 @@
+#!/bin/sh -e
+
+# Log in to quay.io
+if [ -z $QUAY_IO_CREDENTIALS ]; then
+  echo Must set QUAY_IO_CREDENTIALS before running this script
+  exit 1
+fi
+USERNAME=$(echo $QUAY_IO_CREDENTIALS | cut -d: -f1)
+PASSWORD=$(echo $QUAY_IO_CREDENTIALS | cut -d: -f2)
+if echo "$QUAY_IO_CREDENTIALS" | grep -vq ":"; then
+  echo QUAY_IO_CREDENTIALS must be in the format username:password
+  exit 1
+fi
+echo $PASSWORD | docker login quay.io -u $USERNAME --password-stdin
+
+cd $(dirname $0)
+
+# Determine TAG for this build
+REPO=quay.io/cloudian/grafana
+TAG=$(git describe)
+
+# Strip off Git commit for release build
+if [ "$1" = "release" ]; then
+  TAG=$(echo $TAG | cut -d- -f1-2)
+fi
+
+# Call standard build script.  Use --fast so it builds only for x64
+packaging/docker/build.sh --fast $TAG $REPO
+
+# Don't include leading 'v' from the repository tag
+if echo "$TAG" | grep -q "^v"; then
+	TAG=$(echo "$TAG" | cut -b2-)
+fi
+
+# Send to quay.io
+docker push $REPO:$TAG
+
+# If we're doing a release build, update the latest tag
+if [ "$1" = "release" ]; then
+  docker tag $REPO:$TAG $REPO:latest
+  docker push $REPO:latest
+fi
diff --git a/conf/defaults.ini b/conf/defaults.ini
index 92d7e878b9f58..2a1c376d105cf 100644
--- a/conf/defaults.ini
+++ b/conf/defaults.ini
@@ -1063,7 +1063,7 @@ enabled = true
 #################################### Alerting ############################
 [alerting]
 # Enable the legacy alerting sub-system and interface. If Unified Alerting is already enabled and you try to go back to legacy alerting, all data that is part of Unified Alerting will be deleted. When this configuration section and flag are not defined, the state is defined at runtime. See the documentation for more details.
-enabled =
+enabled = true
 
 # Makes it possible to turn off alert execution but alerting UI is visible
 execute_alerts = true
diff --git a/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/activate-license-on-ecs/index.md b/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/activate-license-on-ecs/index.md
index 2904522b1fa5b..d3d24f315da0a 100644
--- a/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/activate-license-on-ecs/index.md
+++ b/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/activate-license-on-ecs/index.md
@@ -108,6 +108,6 @@ In this task you configure Grafana Enterprise to validate the license with AWS i
 ### Task 4: Start or restart Grafana
 
 1. To restart Grafana and activate your license, update the service running Grafana to use the latest revision of the task definition that you created.
-1. After you update the service, navigate to your Grafana instance, sign in with Grafana Admin credentials, and navigate to **Administration > Stats and license** to validate that your license is active.
+1. After you update the service, navigate to your Grafana instance, sign in with Admin credentials, and navigate to **Administration > Stats and license** to validate that your license is active.
 
 For more information about validating that your license is active, refer to [Grafana Enterprise license restrictions]({{< relref "../../#grafana-enterprise-license-restrictions" >}}).
diff --git a/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/activate-license-on-eks/index.md b/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/activate-license-on-eks/index.md
index d4743b6abeb02..da8e3b390431f 100644
--- a/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/activate-license-on-eks/index.md
+++ b/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/activate-license-on-eks/index.md
@@ -119,7 +119,7 @@ To restart Grafana on a Kubernetes cluster,
 
 1. Run the command `kubectl rollout restart deployment my-release`.
 
-1. After you update the service, navigate to your Grafana instance, sign in with Grafana Admin credentials, and navigate to **Administration > Stats and license** to validate that your license is active.
+1. After you update the service, navigate to your Grafana instance, sign in with Admin credentials, and navigate to **Administration > Stats and license** to validate that your license is active.
 
 For more information about restarting Grafana, refer to [Restart Grafana]({{< relref "../../../../setup-grafana/start-restart-grafana/" >}}).
 
diff --git a/docs/sources/administration/user-management/user-preferences/index.md b/docs/sources/administration/user-management/user-preferences/index.md
index 8e07224b9e712..37376d6f1a28c 100644
--- a/docs/sources/administration/user-management/user-preferences/index.md
+++ b/docs/sources/administration/user-management/user-preferences/index.md
@@ -18,9 +18,9 @@ Grafana allows you to manage certain aspects of your user account, including you
 
 You can also view important information about your account, such as the organizations and roles to which you are assigned and the Grafana sessions associated with your account.
 
-## Change your Grafana password
+## Change your password
 
-You can change your Grafana password at any time.
+You can change your password at any time.
 
 > **Note**: If your Grafana instance uses an <!--[external authentication provider]({{< relref "../../../setup-grafana/configure-security/configure-authentication/" >}})--> external authentication provider, then you might not be able to change your password in Grafana. Contact your Grafana administrator for more information.
 
diff --git a/docs/sources/dashboards/create-reports/index.md b/docs/sources/dashboards/create-reports/index.md
index 73c555c63ecc4..128a3d6d59ce2 100644
--- a/docs/sources/dashboards/create-reports/index.md
+++ b/docs/sources/dashboards/create-reports/index.md
@@ -200,7 +200,7 @@ You can generate and save PDF files of any dashboard.
 1. On the PDF tab, select a layout option for the exported dashboard: **Portrait** or **Landscape**.
 1. Click **Save as PDF** to render the dashboard as a PDF file.
 
-   Grafana opens the PDF file in a new window or browser tab.
+   It opens the PDF file in a new window or browser tab.
 
 ## Send a report via the API
 
@@ -249,11 +249,11 @@ You can customize the branding options.
 
 Report branding:
 
-- **Company logo:** Company logo displayed in the report PDF. It can be configured by specifying a URL, or by uploading a file. Defaults to the Grafana logo.
+- **Company logo:** Company logo displayed in the report PDF. It can be configured by specifying a URL, or by uploading a file. Defaults to the Cloudian logo.
 
 Email branding:
 
-- **Company logo:** Company logo displayed in the report email. It can be configured by specifying a URL, or by uploading a file. Defaults to the Grafana logo.
+- **Company logo:** Company logo displayed in the report email. It can be configured by specifying a URL, or by uploading a file. Defaults to the Cloudian logo.
 - **Email footer:** Toggle to enable the report email footer. Select **Sent by** or **None**.
 - **Footer link text:** Text of the link in the report email footer. Defaults to `Grafana`.
 - **Footer link URL:** Link of the report email footer.
diff --git a/docs/sources/dashboards/share-dashboards-panels/index.md b/docs/sources/dashboards/share-dashboards-panels/index.md
index 3c677ad6226e7..18339181f57fd 100644
--- a/docs/sources/dashboards/share-dashboards-panels/index.md
+++ b/docs/sources/dashboards/share-dashboards-panels/index.md
@@ -99,7 +99,7 @@ You can generate and save PDF files of any dashboard.
 1. On the PDF tab, select a layout option for the exported dashboard: **Portrait** or **Landscape**.
 1. Click **Save as PDF** to render the dashboard as a PDF file.
 
-   Grafana opens the PDF file in a new window or browser tab.
+   It opens the PDF file in a new window or browser tab.
 
 ## Share a panel
 
diff --git a/docs/sources/old-alerting/view-alerts.md b/docs/sources/old-alerting/view-alerts.md
index 2ec85c7bdee99..766ccc034f027 100644
--- a/docs/sources/old-alerting/view-alerts.md
+++ b/docs/sources/old-alerting/view-alerts.md
@@ -24,4 +24,4 @@ You can do several things while viewing alerts.
 - **Filter alerts by name -** Type an alert name in the **Search alerts** field.
 - **Filter alerts by state -** In **States**, select which alert states you want to see. All others will be hidden.
 - **Pause or resume an alert -** Click the **Pause** or **Play** icon next to the alert to pause or resume evaluation. See [Pause an alert rule]({{< relref "pause-an-alert-rule/" >}}) for more information.
-- **Access alert rule settings -** Click the alert name or the **Edit alert rule** (gear) icon. Grafana opens the Alert tab of the panel where the alert rule is defined. This is helpful when an alert is firing but you don't know which panel it is defined in.
+- **Access alert rule settings -** Click the alert name or the **Edit alert rule** (gear) icon. It opens the Alert tab of the panel where the alert rule is defined. This is helpful when an alert is firing but you don't know which panel it is defined in.
diff --git a/docs/sources/troubleshooting/send-panel-to-grafana-support/index.md b/docs/sources/troubleshooting/send-panel-to-grafana-support/index.md
index 5d1da95711438..6c5029c8c5634 100644
--- a/docs/sources/troubleshooting/send-panel-to-grafana-support/index.md
+++ b/docs/sources/troubleshooting/send-panel-to-grafana-support/index.md
@@ -10,7 +10,7 @@ menutitle: Send panel to support
 weight: 100
 ---
 
-# Send a panel to Grafana Labs support
+# Send a panel to Labs support
 
 When you encounter problems with any of your visualizations, you can send the panel JSON model to Grafana Labs Technical Support and request help with troubleshooting your issue.
 
@@ -22,7 +22,7 @@ The panel that you send includes all query response data and all visualizations
 
 1. Click the menu and select **More > Get help**.
 
-   Grafana opens a standalone support dashboard that contains the data you are sending to Grafana Labs Technical Support.
+   It opens a standalone support dashboard that contains the data you are sending to Grafana Labs Technical Support.
 
    If you enable iframes, the support dashboard includes the visualization that looks similar to the following image.
 
diff --git a/docs/sources/tutorials/build-a-streaming-data-source-plugin/index.md b/docs/sources/tutorials/build-a-streaming-data-source-plugin/index.md
index 7260287ca257c..a310c0a0c63bb 100644
--- a/docs/sources/tutorials/build-a-streaming-data-source-plugin/index.md
+++ b/docs/sources/tutorials/build-a-streaming-data-source-plugin/index.md
@@ -138,7 +138,7 @@ return &backend.SubscribeStreamResponse{
 }, nil
 ```
 
-As soon as the first subscriber joins a channel Grafana opens a unidirectional stream to consume streaming frames from a plugin. To handle this and to push data towards clients we implement a `RunStream` method which provides a way to push JSON data into a channel. So we can push data frame like this (error handling skipped):
+As soon as the first subscriber joins a channel it opens a unidirectional stream to consume streaming frames from a plugin. To handle this and to push data towards clients we implement a `RunStream` method which provides a way to push JSON data into a channel. So we can push data frame like this (error handling skipped):
 
 ```go
 // Send frame to stream including both frame schema and data frame parts.
@@ -147,7 +147,7 @@ _ = sender.SendFrame(frame, data.IncludeAll)
 
 Open example datasource query editor and make sure `With Streaming` toggle is on. After doing this you should see data displayed and then periodically updated by streaming frames coming periodically from `RunStream` method.
 
-The important thing to note is that Grafana opens a unidirectional stream only once per channel upon the first subscriber joined. Every other subscription request will be still authorized by `SubscribeStream` method but the new `RunStream` won't be issued. I.e. you can have many active subscribers but only one running stream. At this moment this guarantee works for a single Grafana instance, we are planning to support this for highly-available Grafana setup (many Grafana instances behind load-balancer) in future releases.
+The important thing to note is that it opens a unidirectional stream only once per channel upon the first subscriber joined. Every other subscription request will be still authorized by `SubscribeStream` method but the new `RunStream` won't be issued. I.e. you can have many active subscribers but only one running stream. At this moment this guarantee works for a single Grafana instance, we are planning to support this for highly-available Grafana setup (many Grafana instances behind load-balancer) in future releases.
 
 The stream will be automatically closed as soon as all subscriber users left.
 
diff --git a/emails/templates/reset_password.mjml b/emails/templates/reset_password.mjml
index c3e8713a865b6..df2374f475de2 100644
--- a/emails/templates/reset_password.mjml
+++ b/emails/templates/reset_password.mjml
@@ -2,7 +2,7 @@
   <mj-head>
     <!-- ⬇ Don't forget to specifify an email subject below! ⬇ -->
     <mj-title>
-      {{ Subject .Subject .TemplateData "Reset your Grafana password - {{.Name}}" }}
+      {{ Subject .Subject .TemplateData "Reset your HyperIQ password - {{.Name}}" }}
     </mj-title>
     <mj-include path="./partials/layout/head.mjml" />
   </mj-head>
diff --git a/emails/templates/reset_password.txt b/emails/templates/reset_password.txt
index a33edbb029569..9cf76acf88703 100644
--- a/emails/templates/reset_password.txt
+++ b/emails/templates/reset_password.txt
@@ -1,4 +1,4 @@
-[[HiddenSubject .Subject "Reset your Grafana password - [[.Name]]"]]
+[[HiddenSubject .Subject "Reset your HyperIQ password - [[.Name]]"]]
 
 Hi [[.Name]],
 
diff --git a/packages/grafana-data/src/themes/createColors.ts b/packages/grafana-data/src/themes/createColors.ts
index c645630f1d3a9..dd12c27b7faee 100644
--- a/packages/grafana-data/src/themes/createColors.ts
+++ b/packages/grafana-data/src/themes/createColors.ts
@@ -150,8 +150,8 @@ class DarkColors implements ThemeColorsBase<Partial<ThemeRichColor>> {
   };
 
   gradients = {
-    brandHorizontal: 'linear-gradient(270deg, #F55F3E 0%, #FF8833 100%)',
-    brandVertical: 'linear-gradient(0.01deg, #F55F3E 0.01%, #FF8833 99.99%)',
+    brandHorizontal: 'linear-gradient(270deg, #c1d500 0%, #ffffff 100%)',
+    brandVertical: 'linear-gradient(0.01deg, #c1d500 0.01%, #ffffff 99.99%)',
   };
 
   contrastThreshold = 3;
diff --git a/packages/grafana-data/src/themes/createV1Theme.ts b/packages/grafana-data/src/themes/createV1Theme.ts
index a4754db37e61d..bea786bc12a4e 100644
--- a/packages/grafana-data/src/themes/createV1Theme.ts
+++ b/packages/grafana-data/src/themes/createV1Theme.ts
@@ -125,6 +125,7 @@ export function createV1Theme(theme: Omit<GrafanaTheme2, 'v1'>): GrafanaTheme {
     gray7: '#fbfbfb', // not used in dark theme
     redBase: '#e02f44',
     redShade: '#c4162a',
+    green: '#b7eb19',
     greenBase: '#299c46',
     greenShade: '#23843b',
     red: '#d44a3a',
diff --git a/packages/grafana-data/src/types/theme.ts b/packages/grafana-data/src/types/theme.ts
index aa55040c7b47f..992f22337b31f 100644
--- a/packages/grafana-data/src/types/theme.ts
+++ b/packages/grafana-data/src/types/theme.ts
@@ -164,6 +164,7 @@ export interface GrafanaTheme extends GrafanaThemeCommons {
     // Accent colors
     redBase: string;
     redShade: string;
+    green: string;
     greenBase: string;
     greenShade: string;
     red: string;
diff --git a/packages/grafana-ui/.storybook/main.ts b/packages/grafana-ui/.storybook/main.ts
index e737d0126c503..62fdb3ec7df0a 100644
--- a/packages/grafana-ui/.storybook/main.ts
+++ b/packages/grafana-ui/.storybook/main.ts
@@ -85,7 +85,7 @@ const mainConfig: StorybookConfig = {
     { from: '../../../public/fonts', to: '/public/fonts' },
     { from: '../../../public/img/grafana_text_logo-dark.svg', to: '/public/img/grafana_text_logo-dark.svg' },
     { from: '../../../public/img/grafana_text_logo-light.svg', to: '/public/img/grafana_text_logo-light.svg' },
-    { from: '../../../public/img/fav32.png', to: '/public/img/fav32.png' },
+    { from: '../../../public/img/cloudian_logo_alt.png', to: '/public/img/cloudian_logo_alt.png' },
     { from: '../../../public/lib', to: '/public/lib' },
     ...iconPaths,
   ],
diff --git a/packages/grafana-ui/.storybook/manager-head.html b/packages/grafana-ui/.storybook/manager-head.html
index 9a88e66375f3f..3f1d357953a42 100644
--- a/packages/grafana-ui/.storybook/manager-head.html
+++ b/packages/grafana-ui/.storybook/manager-head.html
@@ -1,4 +1,4 @@
-<link rel="icon" href="public/img/fav32.png" />
+<link rel="icon" href="public/img/cloudian_logo_alt.png" />
 <!--Rudderstack-->
 <script type="text/javascript">
 !function(){var e=window.rudderanalytics=window.rudderanalytics||[];e.methods=["load","page","track","identify","alias","group","ready","reset","getAnonymousId","setAnonymousId"],e.factory=function(t){return function(){var r=Array.prototype.slice.call(arguments);return r.unshift(t),e.push(r),e}};for(var t=0;t<e.methods.length;t++){var r=e.methods[t];e[r]=e.factory(r)}e.loadJS=function(e,t){var r=document.createElement("script");r.type="text/javascript",r.async=!0,r.src="https://rsdk.grafana.com";var a=document.getElementsByTagName("script")[0];a.parentNode.insertBefore(r,a)},e.loadJS(),
diff --git a/packages/grafana-ui/src/components/Tabs/VerticalTab.tsx b/packages/grafana-ui/src/components/Tabs/VerticalTab.tsx
index 77eb3469c5d95..c1ea19112d215 100644
--- a/packages/grafana-ui/src/components/Tabs/VerticalTab.tsx
+++ b/packages/grafana-ui/src/components/Tabs/VerticalTab.tsx
@@ -77,7 +77,7 @@ const getTabStyles = (theme: GrafanaTheme2) => {
         bottom: 2px;
         top: 2px;
         border-radius: ${theme.shape.radius.default};
-        background-image: linear-gradient(0deg, #f05a28 30%, #fbca0a 99%);
+        background-image: linear-gradient(0deg, #c1d500 30%, #9a989b 60%, #ffffff 99%);
       }
     `,
     suffix: css`
diff --git a/packages/grafana-ui/src/components/ToolbarButton/ToolbarButton.story.tsx b/packages/grafana-ui/src/components/ToolbarButton/ToolbarButton.story.tsx
index d4e212149d85d..a88704be97af7 100644
--- a/packages/grafana-ui/src/components/ToolbarButton/ToolbarButton.story.tsx
+++ b/packages/grafana-ui/src/components/ToolbarButton/ToolbarButton.story.tsx
@@ -101,7 +101,7 @@ export const Examples: ComponentStory<typeof ToolbarButton> = (args) => {
         <ToolbarButtonRow>
           <ToolbarButton>Just text</ToolbarButton>
           <ToolbarButton icon="sync" tooltip="Sync" />
-          <ToolbarButton imgSrc="./grafana_icon.svg">With imgSrc</ToolbarButton>
+          <ToolbarButton imgSrc="./cloudian_logo.png">With imgSrc</ToolbarButton>
           <ToolbarButton icon="cloud" isOpen={true}>
             isOpen
           </ToolbarButton>
diff --git a/packages/grafana-ui/src/components/ToolbarButton/ToolbarButtonRow.story.tsx b/packages/grafana-ui/src/components/ToolbarButton/ToolbarButtonRow.story.tsx
index d91524457a2f5..e5cbf8bdbbfc0 100644
--- a/packages/grafana-ui/src/components/ToolbarButton/ToolbarButtonRow.story.tsx
+++ b/packages/grafana-ui/src/components/ToolbarButton/ToolbarButtonRow.story.tsx
@@ -28,10 +28,10 @@ export const Basic: ComponentStory<typeof ToolbarButtonRow> = (args) => {
       <ToolbarButtonRow {...args}>
         <ToolbarButton>Just text</ToolbarButton>
         <ToolbarButton icon="sync" tooltip="Sync" />
-        <ToolbarButton imgSrc="./grafana_icon.svg">With imgSrc</ToolbarButton>
+        <ToolbarButton imgSrc="./cloudian_logo.png">With imgSrc</ToolbarButton>
         <ToolbarButton>Just text</ToolbarButton>
         <ToolbarButton icon="sync" tooltip="Sync" />
-        <ToolbarButton imgSrc="./grafana_icon.svg">With imgSrc</ToolbarButton>
+        <ToolbarButton imgSrc="./cloudian_logo.png">With imgSrc</ToolbarButton>
       </ToolbarButtonRow>
     </DashboardStoryCanvas>
   );
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 56122ca09a2c2..c012abb2891d7 100644
--- a/packages/grafana-ui/src/themes/_variables.dark.scss.tmpl.ts
+++ b/packages/grafana-ui/src/themes/_variables.dark.scss.tmpl.ts
@@ -74,6 +74,7 @@ $red: $red-base;
 $yellow: ${theme.v1.palette.yellow};
 $orange: ${theme.v1.palette.orange};
 $purple: ${theme.v1.palette.purple};
+$green: ${theme.v1.palette.green};
 $variable: ${theme.colors.primary.text};
 
 $brand-primary: ${theme.v1.palette.orange};
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 f1b1b1baa4d24..f37a3c1556cf5 100644
--- a/packages/grafana-ui/src/themes/_variables.light.scss.tmpl.ts
+++ b/packages/grafana-ui/src/themes/_variables.light.scss.tmpl.ts
@@ -71,6 +71,7 @@ $red: $red-base;
 $yellow: ${theme.v1.palette.yellow};
 $orange: ${theme.v1.palette.orange};
 $purple: ${theme.v1.palette.purple};
+$green: ${theme.v1.palette.green};
 $variable: ${theme.colors.primary.text};
 
 $brand-primary: ${theme.v1.palette.orange};
diff --git a/packaging/docker/build.sh b/packaging/docker/build.sh
index 29d78a11c8289..15dd12148806f 100755
--- a/packaging/docker/build.sh
+++ b/packaging/docker/build.sh
@@ -72,12 +72,10 @@ docker_build () {
   docker build \
     --build-arg BASE_IMAGE=${base_image} \
     --build-arg GRAFANA_TGZ=${grafana_tgz} \
-    --build-arg GO_SRC=tgz-builder \
-    --build-arg JS_SRC=tgz-builder \
-    --build-arg RUN_SH=./run.sh \
+    --build-arg RUN_SH=./packaging/docker/run.sh \
     --tag "${tag}" \
     --no-cache=true \
-    --file ../../Dockerfile \
+    --file Dockerfile \
     .
 }
 
diff --git a/pkg/api/index.go b/pkg/api/index.go
index 469655292f43f..d33b183d0f3ea 100644
--- a/pkg/api/index.go
+++ b/pkg/api/index.go
@@ -131,14 +131,14 @@ func (hs *HTTPServer) setIndexViewData(c *contextmodel.ReqContext) (*dtos.IndexV
 		NewGrafanaVersionExists:             hs.grafanaUpdateChecker.UpdateAvailable(),
 		AppName:                             setting.ApplicationName,
 		AppNameBodyClass:                    "app-grafana",
-		FavIcon:                             "public/img/fav32.png",
-		AppleTouchIcon:                      "public/img/apple-touch-icon.png",
-		AppTitle:                            "Grafana",
+		FavIcon:                             "public/img/cloudian_logo_alt.png",
+		AppleTouchIcon:                      "public/img/cloudian_logo_alt.png",
+		AppTitle:                            "Cloudian® HyperIQ",
 		NavTree:                             navTree,
 		Sentry:                              &hs.Cfg.Sentry,
 		Nonce:                               c.RequestNonce,
 		ContentDeliveryURL:                  hs.Cfg.GetContentDeliveryURL(hs.License.ContentDeliveryPrefix()),
-		LoadingLogo:                         "public/img/grafana_icon.svg",
+		LoadingLogo:                         "public/img/cloudian_logo.png",
 	}
 
 	if !hs.AccessControl.IsDisabled() {
diff --git a/pkg/build/e2eutil/grafana_server.go b/pkg/build/e2eutil/grafana_server.go
index b232d4a042c5c..7a4e382c912a4 100644
--- a/pkg/build/e2eutil/grafana_server.go
+++ b/pkg/build/e2eutil/grafana_server.go
@@ -32,7 +32,7 @@ func (g *GrafanaServer) Wait() {
 	for {
 		select {
 		case <-timeoutExceeded:
-			log.Printf("grafana server failed to start after %d second(s) timeout", timeout)
+			log.Printf("server failed to start after %d second(s) timeout", timeout)
 			os.Exit(1)
 
 		case <-ticker.C:
diff --git a/pkg/middleware/recovery_test.go b/pkg/middleware/recovery_test.go
index 8a4251c791764..e3ac62bdf08ec 100644
--- a/pkg/middleware/recovery_test.go
+++ b/pkg/middleware/recovery_test.go
@@ -24,7 +24,7 @@ func TestRecoveryMiddleware(t *testing.T) {
 			sc.req.Header.Set("content-type", "application/json")
 
 			assert.Equal(t, 500, sc.resp.Code)
-			assert.Equal(t, "Internal Server Error - Check the Grafana server logs for the detailed error message.", sc.respJson["message"])
+			assert.Equal(t, "Internal Server Error - Check the HyperIQ server logs for the detailed error message.", sc.respJson["message"])
 			assert.True(t, strings.HasPrefix(sc.respJson["error"].(string), "Server Error"))
 		})
 	})
@@ -37,7 +37,7 @@ func TestRecoveryMiddleware(t *testing.T) {
 
 			assert.Equal(t, 500, sc.resp.Code)
 			assert.Equal(t, "text/html; charset=UTF-8", sc.resp.Header().Get("content-type"))
-			assert.Contains(t, sc.resp.Body.String(), "<title>Grafana - Error</title>")
+			assert.Contains(t, sc.resp.Body.String(), "<title>Cloudian® HyperIQ - Error</title>")
 		})
 	})
 }
diff --git a/pkg/services/accesscontrol/roles.go b/pkg/services/accesscontrol/roles.go
index 67beeb00fb392..e4af3b8915b0a 100644
--- a/pkg/services/accesscontrol/roles.go
+++ b/pkg/services/accesscontrol/roles.go
@@ -127,7 +127,7 @@ var (
 	usersWriterRole = RoleDTO{
 		Name:        "fixed:users:writer",
 		DisplayName: "User writer",
-		Description: "Read and update all attributes and settings for all users in Grafana: update user information, read user information, create or enable or disable a user, make a user a Grafana administrator, sign out a user, update a user’s authentication token, or update quotas for all users.",
+		Description: "Read and update all attributes and settings for all users in Grafana: update user information, read user information, create or enable or disable a user, make a user a HyperIQ administrator, sign out a user, update a user’s authentication token, or update quotas for all users.",
 		Group:       "User administration (global)",
 		Permissions: ConcatPermissions(usersReaderRole.Permissions, []Permission{
 			{
diff --git a/pkg/services/alerting/notifiers/discord.go b/pkg/services/alerting/notifiers/discord.go
index eeb68f23729c5..77a38dfa068b9 100644
--- a/pkg/services/alerting/notifiers/discord.go
+++ b/pkg/services/alerting/notifiers/discord.go
@@ -124,7 +124,7 @@ func (dn *DiscordNotifier) Notify(evalContext *alerting.EvalContext) error {
 
 	footer := map[string]interface{}{
 		"text":     "Grafana v" + setting.BuildVersion,
-		"icon_url": "https://grafana.com/static/assets/img/fav32.png",
+		"icon_url": "https://grafana.com/static/assets/img/cloudian_logo_alt.png",
 	}
 
 	color, _ := strconv.ParseInt(strings.TrimLeft(evalContext.GetStateModel().Color, "#"), 16, 0)
diff --git a/pkg/services/alerting/notifiers/discord_test.go b/pkg/services/alerting/notifiers/discord_test.go
index d173a85d21581..282a1c75dc466 100644
--- a/pkg/services/alerting/notifiers/discord_test.go
+++ b/pkg/services/alerting/notifiers/discord_test.go
@@ -31,7 +31,7 @@ func TestDiscordNotifier(t *testing.T) {
 		t.Run("settings should trigger incident", func(t *testing.T) {
 			json := `
 				{
-					"avatar_url": "https://grafana.com/img/fav32.png",
+					"avatar_url": "https://grafana.com/img/cloudian_logo_alt.png",
 					"content": "@everyone Please check this notification",
 					"url": "https://web.hook/"
 				}`
@@ -49,7 +49,7 @@ func TestDiscordNotifier(t *testing.T) {
 			require.Nil(t, err)
 			require.Equal(t, "discord_testing", discordNotifier.Name)
 			require.Equal(t, "discord", discordNotifier.Type)
-			require.Equal(t, "https://grafana.com/img/fav32.png", discordNotifier.AvatarURL)
+			require.Equal(t, "https://grafana.com/img/cloudian_logo_alt.png", discordNotifier.AvatarURL)
 			require.Equal(t, "@everyone Please check this notification", discordNotifier.Content)
 			require.Equal(t, "https://web.hook/", discordNotifier.WebhookURL)
 		})
diff --git a/pkg/services/alerting/notifiers/hipchat.go b/pkg/services/alerting/notifiers/hipchat.go
index cf3918092f95a..2f0e4732ad9e5 100644
--- a/pkg/services/alerting/notifiers/hipchat.go
+++ b/pkg/services/alerting/notifiers/hipchat.go
@@ -147,7 +147,7 @@ func (hc *HipChatNotifier) Notify(evalContext *alerting.EvalContext) error {
 		"title":       evalContext.GetNotificationTitle(),
 		"description": message,
 		"icon": map[string]interface{}{
-			"url": "https://grafana.com/static/assets/img/fav32.png",
+			"url": "https://grafana.com/static/assets/img/cloudian_logo_alt.png",
 		},
 		"date":       evalContext.EndTime.Unix(),
 		"attributes": attributes,
diff --git a/pkg/services/alerting/notifiers/slack.go b/pkg/services/alerting/notifiers/slack.go
index 7a673b99dd22d..bbc1f5529b832 100644
--- a/pkg/services/alerting/notifiers/slack.go
+++ b/pkg/services/alerting/notifiers/slack.go
@@ -284,7 +284,7 @@ func (sn *SlackNotifier) Notify(evalContext *alerting.EvalContext) error {
 		"fallback":    evalContext.GetNotificationTitle(),
 		"fields":      fields,
 		"footer":      "Grafana v" + setting.BuildVersion,
-		"footer_icon": "https://grafana.com/static/assets/img/fav32.png",
+		"footer_icon": "https://grafana.com/static/assets/img/cloudian_logo_alt.png",
 		"ts":          time.Now().Unix(),
 	}
 	if sn.NeedsImage() && imageURL != "" {
diff --git a/pkg/services/alerting/notifiers/slack_test.go b/pkg/services/alerting/notifiers/slack_test.go
index 909257c741a25..476d85e14e152 100644
--- a/pkg/services/alerting/notifiers/slack_test.go
+++ b/pkg/services/alerting/notifiers/slack_test.go
@@ -71,7 +71,7 @@ func TestSlackNotifier(t *testing.T) {
                       "recipient": "#ds-opentsdb",
                       "username": "Grafana Alerts",
                       "icon_emoji": ":smile:",
-                      "icon_url": "https://grafana.com/img/fav32.png",
+                      "icon_url": "https://grafana.com/img/cloudian_logo_alt.png",
                       "mentionUsers": "user1, user2",
                       "mentionGroups": "group1, group2",
                       "mentionChannel": "here",
@@ -95,7 +95,7 @@ func TestSlackNotifier(t *testing.T) {
 		assert.Equal(t, "#ds-opentsdb", slackNotifier.recipient)
 		assert.Equal(t, "Grafana Alerts", slackNotifier.username)
 		assert.Equal(t, ":smile:", slackNotifier.iconEmoji)
-		assert.Equal(t, "https://grafana.com/img/fav32.png", slackNotifier.iconURL)
+		assert.Equal(t, "https://grafana.com/img/cloudian_logo_alt.png", slackNotifier.iconURL)
 		assert.Equal(t, []string{"user1", "user2"}, slackNotifier.mentionUsers)
 		assert.Equal(t, []string{"group1", "group2"}, slackNotifier.mentionGroups)
 		assert.Equal(t, "here", slackNotifier.mentionChannel)
@@ -109,7 +109,7 @@ func TestSlackNotifier(t *testing.T) {
                       "recipient": "#ds-opentsdb",
                       "username": "Grafana Alerts",
                       "icon_emoji": ":smile:",
-                      "icon_url": "https://grafana.com/img/fav32.png",
+                      "icon_url": "https://grafana.com/img/cloudian_logo_alt.png",
                       "mentionUsers": "user1, user2",
                       "mentionGroups": "group1, group2",
                       "mentionChannel": "here",
@@ -143,7 +143,7 @@ func TestSlackNotifier(t *testing.T) {
 		assert.Equal(t, "#ds-opentsdb", slackNotifier.recipient)
 		assert.Equal(t, "Grafana Alerts", slackNotifier.username)
 		assert.Equal(t, ":smile:", slackNotifier.iconEmoji)
-		assert.Equal(t, "https://grafana.com/img/fav32.png", slackNotifier.iconURL)
+		assert.Equal(t, "https://grafana.com/img/cloudian_logo_alt.png", slackNotifier.iconURL)
 		assert.Equal(t, []string{"user1", "user2"}, slackNotifier.mentionUsers)
 		assert.Equal(t, []string{"group1", "group2"}, slackNotifier.mentionGroups)
 		assert.Equal(t, "here", slackNotifier.mentionChannel)
diff --git a/pkg/services/ldap/api/service.go b/pkg/services/ldap/api/service.go
index 8309a7bb429ad..e36b19a846752 100644
--- a/pkg/services/ldap/api/service.go
+++ b/pkg/services/ldap/api/service.go
@@ -205,7 +205,7 @@ func (s *Service) PostSyncUserWithLDAP(c *contextmodel.ReqContext) response.Resp
 	if err != nil {
 		if errors.Is(err, multildap.ErrDidNotFindUser) { // User was not in the LDAP server - we need to take action:
 			if s.cfg.AdminUser == usr.Login { // User is *the* Grafana Admin. We cannot disable it.
-				errMsg := fmt.Sprintf(`Refusing to sync grafana super admin "%s" - it would be disabled`, usr.Login)
+				errMsg := fmt.Sprintf(`Refusing to sync super admin "%s" - it would be disabled`, usr.Login)
 				s.log.Error(errMsg)
 				return response.Error(http.StatusBadRequest, errMsg, err)
 			}
diff --git a/pkg/services/ldap/service/helpers.go b/pkg/services/ldap/service/helpers.go
index 3de1570fad22b..ffb4d75b2448e 100644
--- a/pkg/services/ldap/service/helpers.go
+++ b/pkg/services/ldap/service/helpers.go
@@ -53,7 +53,7 @@ func readConfig(configFile string) (*ldap.Config, error) {
 
 		for _, groupMap := range server.Groups {
 			if groupMap.OrgRole == "" && groupMap.IsGrafanaAdmin == nil {
-				return nil, fmt.Errorf("LDAP group mapping: organization role or grafana admin status is required")
+				return nil, fmt.Errorf("LDAP group mapping: admin status is required")
 			}
 
 			if groupMap.OrgId == 0 {
diff --git a/pkg/services/ldap/settings.go b/pkg/services/ldap/settings.go
index 142a17d854cab..a13e911913571 100644
--- a/pkg/services/ldap/settings.go
+++ b/pkg/services/ldap/settings.go
@@ -159,7 +159,7 @@ func readConfig(configFile string) (*Config, error) {
 
 		for _, groupMap := range server.Groups {
 			if groupMap.OrgRole == "" && groupMap.IsGrafanaAdmin == nil {
-				return nil, fmt.Errorf("LDAP group mapping: organization role or grafana admin status is required")
+				return nil, fmt.Errorf("LDAP group mapping: admin status is required")
 			}
 
 			if groupMap.OrgId == 0 {
diff --git a/pkg/services/navtree/models.go b/pkg/services/navtree/models.go
index e857c08d848f6..bae8961533ae8 100644
--- a/pkg/services/navtree/models.go
+++ b/pkg/services/navtree/models.go
@@ -193,7 +193,6 @@ func ApplyAdminIA(root *NavTreeRoot) {
 			adminNodeLinks = append(adminNodeLinks, orgSettings)
 		}
 		adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("server-settings"))
-		adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("global-orgs"))
 
 		adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("upgrading"))
 		adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("licensing"))
diff --git a/pkg/services/navtree/navtreeimpl/admin.go b/pkg/services/navtree/navtreeimpl/admin.go
index ae43cded0ecc1..e0283570f7311 100644
--- a/pkg/services/navtree/navtreeimpl/admin.go
+++ b/pkg/services/navtree/navtreeimpl/admin.go
@@ -8,7 +8,6 @@ import (
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/navtree"
 	"github.com/grafana/grafana/pkg/services/org"
-	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginaccesscontrol"
 	"github.com/grafana/grafana/pkg/services/serviceaccounts"
 )
 
@@ -58,17 +57,6 @@ func (s *ServiceImpl) getOrgAdminNode(c *contextmodel.ReqContext) (*navtree.NavL
 		})
 	}
 
-	// FIXME: while we don't have a permissions for listing plugins the legacy check has to stay as a default
-	if pluginaccesscontrol.ReqCanAdminPlugins(s.cfg)(c) || hasAccess(pluginaccesscontrol.ReqCanAdminPlugins(s.cfg), pluginaccesscontrol.AdminAccessEvaluator) {
-		configNodes = append(configNodes, &navtree.NavLink{
-			Text:     "Plugins",
-			Id:       "plugins",
-			SubTitle: "Extend the Grafana experience with plugins",
-			Icon:     "plug",
-			Url:      s.cfg.AppSubURL + "/plugins",
-		})
-	}
-
 	if hasAccess(ac.ReqOrgAdmin, ac.OrgPreferencesAccessEvaluator) {
 		configNodes = append(configNodes, &navtree.NavLink{
 			Text:     "Preferences",
@@ -118,8 +106,6 @@ func (s *ServiceImpl) getOrgAdminNode(c *contextmodel.ReqContext) (*navtree.NavL
 
 func (s *ServiceImpl) getServerAdminNode(c *contextmodel.ReqContext) *navtree.NavLink {
 	hasAccess := ac.HasAccess(s.accessControl, c)
-	hasGlobalAccess := ac.HasGlobalAccess(s.accessControl, s.accesscontrolService, c)
-	orgsAccessEvaluator := ac.EvalPermission(ac.ActionOrgsRead)
 	adminNavLinks := []*navtree.NavLink{}
 
 	if s.features.IsEnabled(featuremgmt.FlagTopnav) {
@@ -136,12 +122,6 @@ func (s *ServiceImpl) getServerAdminNode(c *contextmodel.ReqContext) *navtree.Na
 		}
 	}
 
-	if hasGlobalAccess(ac.ReqGrafanaAdmin, orgsAccessEvaluator) {
-		adminNavLinks = append(adminNavLinks, &navtree.NavLink{
-			Text: "Organizations", SubTitle: "Isolated instances of Grafana running on the same server", Id: "global-orgs", Url: s.cfg.AppSubURL + "/admin/orgs", Icon: "building",
-		})
-	}
-
 	if hasAccess(ac.ReqGrafanaAdmin, ac.EvalPermission(ac.ActionSettingsRead)) {
 		adminNavLinks = append(adminNavLinks, &navtree.NavLink{
 			Text: "Settings", SubTitle: "View the settings defined in your Grafana config", Id: "server-settings", Url: s.cfg.AppSubURL + "/admin/settings", Icon: "sliders-v-alt",
diff --git a/pkg/services/navtree/navtreeimpl/navtree.go b/pkg/services/navtree/navtreeimpl/navtree.go
index b5722d093b97c..f883954eac8dd 100644
--- a/pkg/services/navtree/navtreeimpl/navtree.go
+++ b/pkg/services/navtree/navtreeimpl/navtree.go
@@ -1,7 +1,6 @@
 package navtreeimpl
 
 import (
-	"fmt"
 	"sort"
 
 	"github.com/grafana/grafana/pkg/api/dtos"
@@ -19,7 +18,6 @@ import (
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginsettings"
 	pref "github.com/grafana/grafana/pkg/services/preference"
 	"github.com/grafana/grafana/pkg/services/star"
-	"github.com/grafana/grafana/pkg/services/supportbundles/supportbundlesimpl"
 	"github.com/grafana/grafana/pkg/setting"
 )
 
@@ -101,7 +99,7 @@ func (s *ServiceImpl) GetNavTree(c *contextmodel.ReqContext, hasEditPerm bool, p
 			Id:         navtree.NavIDDashboards,
 			SubTitle:   "Create and manage dashboards to visualize your data",
 			Icon:       "apps",
-			Url:        s.cfg.AppSubURL + "/dashboards",
+			Url:        s.cfg.AppSubURL + "/dashboards?tag=HyperIQ",
 			SortWeight: navtree.WeightDashboard,
 			Section:    navtree.NavSectionCore,
 			Children:   dashboardChildLinks,
@@ -204,14 +202,9 @@ func isSupportBundlesEnabled(s *ServiceImpl) bool {
 
 func (s *ServiceImpl) addHelpLinks(treeRoot *navtree.NavTreeRoot, c *contextmodel.ReqContext) {
 	if setting.HelpEnabled {
-		helpVersion := fmt.Sprintf(`%s v%s (%s)`, setting.ApplicationName, setting.BuildVersion, setting.BuildCommit)
-		if s.cfg.AnonymousHideVersion && !c.IsSignedIn {
-			helpVersion = setting.ApplicationName
-		}
-
 		helpNode := &navtree.NavLink{
 			Text:       "Help",
-			SubTitle:   helpVersion,
+			SubTitle:   "",
 			Id:         "help",
 			Url:        "#",
 			Icon:       "question-circle",
@@ -221,25 +214,6 @@ func (s *ServiceImpl) addHelpLinks(treeRoot *navtree.NavTreeRoot, c *contextmode
 		}
 
 		treeRoot.AddSection(helpNode)
-
-		hasAccess := ac.HasAccess(s.accessControl, c)
-		supportBundleAccess := ac.EvalAny(
-			ac.EvalPermission(supportbundlesimpl.ActionRead),
-			ac.EvalPermission(supportbundlesimpl.ActionCreate),
-		)
-
-		if isSupportBundlesEnabled(s) && hasAccess(ac.ReqGrafanaAdmin, supportBundleAccess) {
-			supportBundleNode := &navtree.NavLink{
-				Text:       "Support bundles",
-				Id:         "support-bundles",
-				Url:        "/support-bundles",
-				Icon:       "wrench",
-				Section:    navtree.NavSectionConfig,
-				SortWeight: navtree.WeightHelp,
-			}
-
-			helpNode.Children = append(helpNode.Children, supportBundleNode)
-		}
 	}
 }
 
@@ -344,7 +318,7 @@ func (s *ServiceImpl) buildDashboardNavLinks(c *contextmodel.ReqContext, hasEdit
 
 	if !s.features.IsEnabled(featuremgmt.FlagTopnav) {
 		dashboardChildNavs = append(dashboardChildNavs, &navtree.NavLink{
-			Text: "Browse", Id: navtree.NavIDDashboardsBrowse, Url: s.cfg.AppSubURL + "/dashboards", Icon: "sitemap",
+			Text: "Browse", Id: navtree.NavIDDashboardsBrowse, Url: s.cfg.AppSubURL + "/dashboards?tag=HyperIQ", Icon: "sitemap",
 		})
 	}
 
@@ -539,16 +513,6 @@ func (s *ServiceImpl) buildDataConnectionsNavLink(c *contextmodel.ReqContext) *n
 	baseUrl := s.cfg.AppSubURL + "/connections"
 
 	if hasAccess(ac.ReqOrgAdmin, datasources.ConfigurationPageAccess) {
-		// Connect data
-		children = append(children, &navtree.NavLink{
-			Id:        "connections-connect-data",
-			Text:      "Connect data",
-			SubTitle:  "Browse and create new connections",
-			IsSection: true,
-			Url:       s.cfg.AppSubURL + "/connections/connect-data",
-			Children:  []*navtree.NavLink{},
-		})
-
 		// Your connections
 		children = append(children, &navtree.NavLink{
 			Id:       "connections-your-connections",
diff --git a/pkg/services/notifications/notifications_test.go b/pkg/services/notifications/notifications_test.go
index 47c1f56ccb89b..2b79026e76238 100644
--- a/pkg/services/notifications/notifications_test.go
+++ b/pkg/services/notifications/notifications_test.go
@@ -202,7 +202,7 @@ func TestSendEmailAsync(t *testing.T) {
 		sentMsg := <-sut.mailQueue
 		assert.Contains(t, sentMsg.Body["text/html"], "body")
 		assert.NotContains(t, sentMsg.Body["text/plain"], "body")
-		assert.Equal(t, "Reset your Grafana password - asd@asd.com", sentMsg.Subject)
+		assert.Equal(t, "Reset your password - asd@asd.com", sentMsg.Subject)
 		assert.NotContains(t, sentMsg.Body["text/html"], "Subject")
 		assert.NotContains(t, sentMsg.Body["text/plain"], "Subject")
 
diff --git a/pkg/services/store/kind/dashboard/summary.go b/pkg/services/store/kind/dashboard/summary.go
index 51a1193a8b706..2296b45613b3a 100644
--- a/pkg/services/store/kind/dashboard/summary.go
+++ b/pkg/services/store/kind/dashboard/summary.go
@@ -14,7 +14,7 @@ func GetEntityKindInfo() entity.EntityKindInfo {
 	return entity.EntityKindInfo{
 		ID:          entity.StandardKindDashboard,
 		Name:        "Dashboard",
-		Description: "Define a grafana dashboard layout",
+		Description: "Define a dashboard layout",
 	}
 }
 
diff --git a/pkg/services/store/storage_git.go b/pkg/services/store/storage_git.go
index d14bd515d0268..8e5334ba9ea3c 100644
--- a/pkg/services/store/storage_git.go
+++ b/pkg/services/store/storage_git.go
@@ -337,7 +337,7 @@ func (s *rootStorageGit) Write(ctx context.Context, cmd *WriteValueRequest) (*Wr
 
 	msg := cmd.Message
 	if msg == "" {
-		msg = "changes from grafana ui"
+		msg = "changes from ui"
 	}
 	usr := cmd.User
 	if usr == nil {
diff --git a/pkg/services/user/model.go b/pkg/services/user/model.go
index 989b2ecc7b4d1..fd6d9a95f4be7 100644
--- a/pkg/services/user/model.go
+++ b/pkg/services/user/model.go
@@ -24,7 +24,7 @@ var (
 	ErrCaseInsensitive   = errors.New("case insensitive conflict")
 	ErrUserNotFound      = errors.New("user not found")
 	ErrUserAlreadyExists = errors.New("user already exists")
-	ErrLastGrafanaAdmin  = errors.New("cannot remove last grafana admin")
+	ErrLastGrafanaAdmin  = errors.New("cannot remove last admin")
 	ErrProtectedUser     = errors.New("cannot adopt protected user")
 	ErrNoUniqueID        = errors.New("identifying id not found")
 )
diff --git a/pkg/tests/api/alerting/api_notification_channel_test.go b/pkg/tests/api/alerting/api_notification_channel_test.go
index ed583da38fd35..aa500205ee9c7 100644
--- a/pkg/tests/api/alerting/api_notification_channel_test.go
+++ b/pkg/tests/api/alerting/api_notification_channel_test.go
@@ -2352,7 +2352,7 @@ var expNonEmailNotifications = map[string][]string{
 			  "text": "Integration Test ",
 			  "fallback": "Integration Test [FIRING:1] SlackAlert1 (default)",
 			  "footer": "Grafana v",
-			  "footer_icon": "https://grafana.com/static/assets/img/fav32.png",
+			  "footer_icon": "https://grafana.com/static/assets/img/cloudian_logo_alt.png",
 			  "color": "#D63232",
 			  "ts": %s,
               "mrkdwn_in": ["pretext"],
@@ -2372,7 +2372,7 @@ var expNonEmailNotifications = map[string][]string{
 			  "text": "**Firing**\n\nValue: A=1\nLabels:\n - alertname = SlackAlert2\n - grafana_folder = default\nAnnotations:\nSource: http://localhost:3000/alerting/grafana/UID_SlackAlert2/view\nSilence: http://localhost:3000/alerting/silence/new?alertmanager=grafana&matcher=alertname%%3DSlackAlert2&matcher=grafana_folder%%3Ddefault\n",
 			  "fallback": "[FIRING:1] SlackAlert2 (default)",
 			  "footer": "Grafana v",
-			  "footer_icon": "https://grafana.com/static/assets/img/fav32.png",
+			  "footer_icon": "https://grafana.com/static/assets/img/cloudian_logo_alt.png",
 			  "color": "#D63232",
 			  "ts": %s,
               "mrkdwn_in": ["pretext"],
@@ -2510,7 +2510,7 @@ var expNonEmailNotifications = map[string][]string{
 			{
 			  "color": 14037554,
 			  "footer": {
-				"icon_url": "https://grafana.com/static/assets/img/fav32.png",
+				"icon_url": "https://grafana.com/static/assets/img/cloudian_logo_alt.png",
 				"text": "Grafana v"
 			  },
 			  "title": "[FIRING:1] DiscordAlert (default)",
diff --git a/public/app/core/components/AppChrome/TopSearchBar.tsx b/public/app/core/components/AppChrome/TopSearchBar.tsx
index 7038efdfccd8b..0a83698eb8ed7 100644
--- a/public/app/core/components/AppChrome/TopSearchBar.tsx
+++ b/public/app/core/components/AppChrome/TopSearchBar.tsx
@@ -10,7 +10,6 @@ import { useSelector } from 'app/types';
 
 import { Branding } from '../Branding/Branding';
 
-import { NewsContainer } from './News/NewsContainer';
 import { OrganizationSwitcher } from './Organization/OrganizationSwitcher';
 import { QuickAdd } from './QuickAdd/QuickAdd';
 import { SignInLink } from './TopBar/SignInLink';
@@ -52,7 +51,6 @@ export const TopSearchBar = React.memo(function TopSearchBar() {
             <ToolbarButton iconOnly icon="question-circle" aria-label="Help" />
           </Dropdown>
         )}
-        <NewsContainer className={styles.newsButton} />
         {!contextSrv.user.isSignedIn && <SignInLink />}
         {profileNode && (
           <Dropdown overlay={() => <TopNavBarMenu node={profileNode} />} placement="bottom-end">
diff --git a/public/app/core/components/Branding/Branding.tsx b/public/app/core/components/Branding/Branding.tsx
index 474ad7f850a12..16428c2983242 100644
--- a/public/app/core/components/Branding/Branding.tsx
+++ b/public/app/core/components/Branding/Branding.tsx
@@ -10,7 +10,7 @@ export interface BrandComponentProps {
 }
 
 export const LoginLogo: FC<BrandComponentProps & { logo?: string }> = ({ className, logo }) => {
-  return <img className={className} src={`${logo ? logo : 'public/img/grafana_icon.svg'}`} alt="Grafana" />;
+  return <img className={className} src={`${logo ? logo : 'public/img/cloudian_logo.png'}`} alt="Cloudian" />;
 };
 
 const LoginBackground: FC<BrandComponentProps> = ({ className, children }) => {
@@ -24,7 +24,7 @@ const LoginBackground: FC<BrandComponentProps> = ({ className, children }) => {
       right: 0;
       bottom: 0;
       top: 0;
-      background: url(public/img/g8_login_${theme.isDark ? 'dark' : 'light'}.svg);
+      background: url(public/img/login_bg.jpg);
       background-position: top center;
       background-size: auto;
       background-repeat: no-repeat;
@@ -43,7 +43,7 @@ const LoginBackground: FC<BrandComponentProps> = ({ className, children }) => {
 };
 
 const MenuLogo: FC<BrandComponentProps> = ({ className }) => {
-  return <img className={className} src="public/img/grafana_icon.svg" alt="Grafana" />;
+  return <img className={className} src="public/img/cloudian_logo.png" alt="Cloudian" />;
 };
 
 const LoginBoxBackground = () => {
@@ -59,9 +59,6 @@ export class Branding {
   static LoginBackground = LoginBackground;
   static MenuLogo = MenuLogo;
   static LoginBoxBackground = LoginBoxBackground;
-  static AppTitle = 'Grafana';
-  static LoginTitle = 'Welcome to Grafana';
-  static GetLoginSubTitle = (): null | string => {
-    return null;
-  };
+  static AppTitle = 'Cloudian® HyperIQ';
+  static LoginTitle = 'Welcome to Cloudian® HyperIQ';
 }
diff --git a/public/app/core/components/Footer/Footer.tsx b/public/app/core/components/Footer/Footer.tsx
index 3ebe9e3b73382..e9ce9e02e584a 100644
--- a/public/app/core/components/Footer/Footer.tsx
+++ b/public/app/core/components/Footer/Footer.tsx
@@ -20,21 +20,7 @@ export let getFooterLinks = (): FooterLink[] => {
       id: 'documentation',
       text: t('nav.help/documentation', 'Documentation'),
       icon: 'document-info',
-      url: 'https://grafana.com/docs/grafana/latest/?utm_source=grafana_footer',
-    },
-    {
-      target: '_blank',
-      id: 'support',
-      text: t('nav.help/support', 'Support'),
-      icon: 'question-circle',
-      url: 'https://grafana.com/products/enterprise/?utm_source=grafana_footer',
-    },
-    {
-      target: '_blank',
-      id: 'community',
-      text: t('nav.help/community', 'Community'),
-      icon: 'comments-alt',
-      url: 'https://community.grafana.com/?utm_source=grafana_footer',
+      url: 'public/docs/hyperiq_guide.pdf',
     },
   ];
 };
@@ -73,16 +59,6 @@ export function getVersionLinks(): FooterLink[] {
     url: hasReleaseNotes ? `https://github.com/grafana/grafana/blob/main/CHANGELOG.md` : undefined,
   });
 
-  if (buildInfo.hasUpdate) {
-    links.push({
-      target: '_blank',
-      id: 'updateVersion',
-      text: `New version available!`,
-      icon: 'download-alt',
-      url: 'https://grafana.com/grafana/download?utm_source=grafana_footer',
-    });
-  }
-
   return links;
 }
 
@@ -96,7 +72,7 @@ export interface Props {
 }
 
 export const Footer = React.memo(({ customLinks }: Props) => {
-  const links = (customLinks || getFooterLinks()).concat(getVersionLinks());
+  const links = customLinks || getFooterLinks();
 
   return (
     <footer className="footer">
diff --git a/public/app/core/components/ForgottenPassword/ForgottenPassword.tsx b/public/app/core/components/ForgottenPassword/ForgottenPassword.tsx
index 90e02383fcb0a..15a3a65aeb478 100644
--- a/public/app/core/components/ForgottenPassword/ForgottenPassword.tsx
+++ b/public/app/core/components/ForgottenPassword/ForgottenPassword.tsx
@@ -65,7 +65,7 @@ export const ForgottenPassword = () => {
             </LinkButton>
           </HorizontalGroup>
 
-          <p className={styles}>Did you forget your username or email? Contact your Grafana administrator.</p>
+          <p className={styles}>Did you forget your username or email? Contact your HyperIQ administrator.</p>
         </>
       )}
     </Form>
diff --git a/public/app/core/components/Login/LoginLayout.tsx b/public/app/core/components/Login/LoginLayout.tsx
index b4ca25ce50cb3..6483f6c44f991 100644
--- a/public/app/core/components/Login/LoginLayout.tsx
+++ b/public/app/core/components/Login/LoginLayout.tsx
@@ -24,7 +24,6 @@ export interface LoginLayoutProps {
 export const LoginLayout = ({ children, branding }: React.PropsWithChildren<LoginLayoutProps>) => {
   const loginStyles = useStyles2(getLoginStyles);
   const [startAnim, setStartAnim] = useState(false);
-  const subTitle = branding?.loginSubtitle ?? Branding.GetLoginSubTitle();
   const loginTitle = branding?.loginTitle ?? Branding.LoginTitle;
   const loginBoxBackground = branding?.loginBoxBackground || Branding.LoginBoxBackground();
   const loginLogo = branding?.loginLogo;
@@ -40,7 +39,6 @@ export const LoginLayout = ({ children, branding }: React.PropsWithChildren<Logi
           <Branding.LoginLogo className={loginStyles.loginLogo} logo={loginLogo} />
           <div className={loginStyles.titleWrapper}>
             <h1 className={loginStyles.mainTitle}>{loginTitle}</h1>
-            {subTitle && <h3 className={loginStyles.subTitle}>{subTitle}</h3>}
           </div>
         </div>
         <div className={loginStyles.loginOuterBox}>{children}</div>
diff --git a/public/app/features/admin/AdminSettings.tsx b/public/app/features/admin/AdminSettings.tsx
index 656709772bed7..9aa1bafba675a 100644
--- a/public/app/features/admin/AdminSettings.tsx
+++ b/public/app/features/admin/AdminSettings.tsx
@@ -13,8 +13,7 @@ function AdminSettings() {
     <Page navId="server-settings">
       <Page.Contents isLoading={loading}>
         <div className="grafana-info-box span8" style={{ margin: '20px 0 25px 0' }}>
-          These system settings are defined in grafana.ini or custom.ini (or overridden in ENV variables). To change
-          these you currently need to restart Grafana.
+          These system settings are defined in custom.ini (or overridden in ENV variables).
         </div>
 
         {settings && (
diff --git a/public/app/features/admin/LicenseChrome.tsx b/public/app/features/admin/LicenseChrome.tsx
index e46d77dce4892..0f9e4cac999aa 100644
--- a/public/app/features/admin/LicenseChrome.tsx
+++ b/public/app/features/admin/LicenseChrome.tsx
@@ -56,7 +56,7 @@ export function LicenseChrome({ header, editionNotice, subheader, children }: Pr
           }}
         >
           <img
-            src="public/img/grafana_icon.svg"
+            src="public/img/cloudian_logo.png"
             alt="Grafana"
             width="80px"
             style={{ position: 'absolute', left: '23px', top: '20px' }}
diff --git a/public/app/features/admin/UpgradePage.tsx b/public/app/features/admin/UpgradePage.tsx
index b6e7fc9ec85f0..0e93b185e1cfb 100644
--- a/public/app/features/admin/UpgradePage.tsx
+++ b/public/app/features/admin/UpgradePage.tsx
@@ -9,7 +9,6 @@ import { Page } from 'app/core/components/Page/Page';
 import { getNavModel } from '../../core/selectors/navModel';
 import { StoreState } from '../../types';
 
-import { LicenseChrome } from './LicenseChrome';
 import { ServerStats } from './ServerStats';
 
 interface Props {
@@ -21,10 +20,6 @@ export function UpgradePage({ navModel }: Props) {
     <Page navModel={navModel}>
       <Page.Contents>
         <ServerStats />
-        <UpgradeInfo
-          editionNotice="You are running the open-source version of Grafana.
-        You have to install the Enterprise edition in order enable Enterprise features."
-        />
       </Page.Contents>
     </Page>
   );
@@ -36,22 +31,6 @@ interface UpgradeInfoProps {
   editionNotice?: string;
 }
 
-export const UpgradeInfo = ({ editionNotice }: UpgradeInfoProps) => {
-  const styles = useStyles2(getStyles);
-
-  return (
-    <>
-      <h2 className={styles.title}>Enterprise license</h2>
-      <LicenseChrome header="Grafana Enterprise" subheader="Get your free trial" editionNotice={editionNotice}>
-        <div className={styles.column}>
-          <FeatureInfo />
-          <ServiceInfo />
-        </div>
-      </LicenseChrome>
-    </>
-  );
-};
-
 const getStyles = (theme: GrafanaTheme2) => {
   return {
     column: css`
@@ -70,19 +49,6 @@ const getStyles = (theme: GrafanaTheme2) => {
   };
 };
 
-const GetEnterprise = () => {
-  return (
-    <div style={{ marginTop: '40px', marginBottom: '30px' }}>
-      <h2 style={titleStyles}>Get Grafana Enterprise</h2>
-      <CallToAction />
-      <p style={{ paddingTop: '12px' }}>
-        You can use the trial version for free for 30 days. We will remind you about it five days before the trial
-        period ends.
-      </p>
-    </div>
-  );
-};
-
 const CallToAction = () => {
   return (
     <LinkButton
@@ -95,140 +61,6 @@ const CallToAction = () => {
   );
 };
 
-const ServiceInfo = () => {
-  return (
-    <div>
-      <h4>At your service</h4>
-
-      <List>
-        <Item title="Enterprise Plugins" image="public/img/licensing/plugin_enterprise.svg" />
-        <Item title="Critical SLA: 2 hours" image="public/img/licensing/sla.svg" />
-        <Item title="Unlimited Expert Support" image="public/img/licensing/customer_support.svg">
-          24 x 7 x 365 support via
-          <List nested={true}>
-            <Item title="Email" />
-            <Item title="Private Slack channel" />
-            <Item title="Phone" />
-          </List>
-        </Item>
-        <Item title="Hand-in-hand support" image="public/img/licensing/handinhand_support.svg">
-          in the upgrade process
-        </Item>
-      </List>
-
-      <div style={{ marginTop: '20px' }}>
-        <strong>Also included:</strong>
-        <br />
-        Indemnification, working with Grafana Labs on future prioritization, and training from the core Grafana team.
-      </div>
-
-      <GetEnterprise />
-    </div>
-  );
-};
-
-const FeatureInfo = () => {
-  return (
-    <div style={{ paddingRight: '11px' }}>
-      <h4>Enhanced functionality</h4>
-      <FeatureListing />
-    </div>
-  );
-};
-
-const FeatureListing = () => {
-  return (
-    <List>
-      <Item title="Data source permissions" />
-      <Item title="Reporting" />
-      <Item title="SAML authentication" />
-      <Item title="Enhanced LDAP integration" />
-      <Item title="Team Sync">LDAP, GitHub OAuth, Auth Proxy, Okta</Item>
-      <Item title="White labeling" />
-      <Item title="Auditing" />
-      <Item title="Settings updates at runtime" />
-      <Item title="Grafana usage insights">
-        <List nested={true}>
-          <Item title="Sort dashboards by popularity in search" />
-          <Item title="Find unused dashboards" />
-          <Item title="Dashboard usage stats drawer" />
-          <Item title="Dashboard presence indicators" />
-        </List>
-      </Item>
-      <Item title="Enterprise plugins">
-        <List nested={true}>
-          <Item title="Oracle" />
-          <Item title="Splunk" />
-          <Item title="Service Now" />
-          <Item title="Dynatrace" />
-          <Item title="New Relic" />
-          <Item title="DataDog" />
-          <Item title="AppDynamics" />
-          <Item title="SAP HANA®" />
-          <Item title="Gitlab" />
-          <Item title="Honeycomb" />
-          <Item title="Jira" />
-          <Item title="MongoDB" />
-          <Item title="Salesforce" />
-          <Item title="Snowflake" />
-          <Item title="Wavefront" />
-        </List>
-      </Item>
-    </List>
-  );
-};
-
-interface ListProps {
-  nested?: boolean;
-}
-
-const List = ({ children, nested }: React.PropsWithChildren<ListProps>) => {
-  const listStyle = css`
-    display: flex;
-    flex-direction: column;
-    padding-top: 8px;
-
-    > div {
-      margin-bottom: ${nested ? 0 : 8}px;
-    }
-  `;
-
-  return <div className={listStyle}>{children}</div>;
-};
-
-interface ItemProps {
-  title: string;
-  image?: string;
-}
-
-const Item = ({ children, title, image }: React.PropsWithChildren<ItemProps>) => {
-  const imageUrl = image ? image : 'public/img/licensing/checkmark.svg';
-  const itemStyle = css`
-    display: flex;
-
-    > img {
-      display: block;
-      height: 22px;
-      flex-grow: 0;
-      padding-right: 12px;
-    }
-  `;
-  const titleStyle = css`
-    font-weight: 500;
-    line-height: 1.7;
-  `;
-
-  return (
-    <div className={itemStyle}>
-      <img src={imageUrl} alt="" />
-      <div>
-        <div className={titleStyle}>{title}</div>
-        {children}
-      </div>
-    </div>
-  );
-};
-
 const mapStateToProps = (state: StoreState) => ({
   navModel: getNavModel(state.navIndex, 'upgrading'),
 });
diff --git a/public/app/features/admin/UserListAdminPage.tsx b/public/app/features/admin/UserListAdminPage.tsx
index a1c6e1f032782..fc854af4bc8a4 100644
--- a/public/app/features/admin/UserListAdminPage.tsx
+++ b/public/app/features/admin/UserListAdminPage.tsx
@@ -223,7 +223,7 @@ const UserListItem = memo(({ user, showLicensedRole }: UserListItemProps) => {
         <OrgUnits units={user.orgs} icon={'building'} />
         {user.isAdmin && (
           <a href={editUrl} aria-label={getUsersAriaLabel(user.name)}>
-            <Tooltip placement="top" content="Grafana Admin">
+            <Tooltip placement="top" content="HyperIQ Admin">
               <Icon name="shield" />
             </Tooltip>
           </a>
diff --git a/public/app/features/admin/UserPermissions.tsx b/public/app/features/admin/UserPermissions.tsx
index 41f6ac321cad3..e406c3b613da4 100644
--- a/public/app/features/admin/UserPermissions.tsx
+++ b/public/app/features/admin/UserPermissions.tsx
@@ -38,7 +38,7 @@ export function UserPermissions({ isGrafanaAdmin, onGrafanaAdminChange }: Props)
           <table className="filter-table form-inline">
             <tbody>
               <tr>
-                <td className="width-16">Grafana Admin</td>
+                <td className="width-16">HyperIQ Admin</td>
                 {isEditing ? (
                   <td colSpan={2}>
                     <RadioButtonGroup
diff --git a/public/app/features/alerting/components/NotificationSettings.tsx b/public/app/features/alerting/components/NotificationSettings.tsx
index c88191d65fe2a..ec3bca2c6931d 100644
--- a/public/app/features/alerting/components/NotificationSettings.tsx
+++ b/public/app/features/alerting/components/NotificationSettings.tsx
@@ -24,7 +24,7 @@ export const NotificationSettings = ({ currentFormValues, imageRendererAvailable
       {currentFormValues.uploadImage && !imageRendererAvailable && (
         <InfoBox title="No image renderer available/installed">
           Grafana cannot find an image renderer to capture an image for the notification. Please make sure the Grafana
-          Image Renderer plugin is installed. Please contact your Grafana administrator to install the plugin.
+          Image Renderer plugin is installed. Please contact your HyperIQ administrator to install the plugin.
         </InfoBox>
       )}
       <Field>
diff --git a/public/app/features/alerting/unified/components/rule-editor/rule-types/GrafanaManagedAlert.tsx b/public/app/features/alerting/unified/components/rule-editor/rule-types/GrafanaManagedAlert.tsx
index ce10238a32965..1691f7168c2cd 100644
--- a/public/app/features/alerting/unified/components/rule-editor/rule-types/GrafanaManagedAlert.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/rule-types/GrafanaManagedAlert.tsx
@@ -15,7 +15,7 @@ const GrafanaManagedRuleType = ({ selected = false, disabled, onClick }: SharedP
           Transform data with expressions.
         </span>
       }
-      image="public/img/grafana_icon.svg"
+      image="public/img/cloudian_logo.png"
       selected={selected}
       disabled={disabled}
       value={RuleFormType.grafana}
diff --git a/public/app/features/alerting/unified/utils/datasource.ts b/public/app/features/alerting/unified/utils/datasource.ts
index 23b234dbeccca..a13387785aa29 100644
--- a/public/app/features/alerting/unified/utils/datasource.ts
+++ b/public/app/features/alerting/unified/utils/datasource.ts
@@ -49,7 +49,7 @@ export function getAlertManagerDataSources() {
 
 const grafanaAlertManagerDataSource: AlertManagerDataSource = {
   name: GRAFANA_RULES_SOURCE_NAME,
-  imgUrl: 'public/img/grafana_icon.svg',
+  imgUrl: 'public/img/cloudian_logo.png',
 };
 
 // Used only as a fallback for Alert Group plugin
diff --git a/public/app/features/connections/__mocks__/store.navIndex.mock.ts b/public/app/features/connections/__mocks__/store.navIndex.mock.ts
index aba3149da068a..dde6565f703d0 100644
--- a/public/app/features/connections/__mocks__/store.navIndex.mock.ts
+++ b/public/app/features/connections/__mocks__/store.navIndex.mock.ts
@@ -393,13 +393,6 @@ export const navIndex: NavIndex = {
             icon: 'user',
             url: '/admin/users',
           },
-          {
-            id: 'global-orgs',
-            text: 'Organizations',
-            subTitle: 'Isolated instances of Grafana running on the same server',
-            icon: 'building',
-            url: '/admin/orgs',
-          },
           {
             id: 'server-settings',
             text: 'Settings',
@@ -489,13 +482,6 @@ export const navIndex: NavIndex = {
         icon: 'user',
         url: '/admin/users',
       },
-      {
-        id: 'global-orgs',
-        text: 'Organizations',
-        subTitle: 'Isolated instances of Grafana running on the same server',
-        icon: 'building',
-        url: '/admin/orgs',
-      },
       {
         id: 'server-settings',
         text: 'Settings',
@@ -518,13 +504,6 @@ export const navIndex: NavIndex = {
     icon: 'user',
     url: '/admin/users',
   },
-  'global-orgs': {
-    id: 'global-orgs',
-    text: 'Organizations',
-    subTitle: 'Isolated instances of Grafana running on the same server',
-    icon: 'building',
-    url: '/admin/orgs',
-  },
   'server-settings': {
     id: 'server-settings',
     text: 'Settings',
diff --git a/public/app/features/dashboard/components/PublicDashboardFooter/PublicDashboardsFooter.tsx b/public/app/features/dashboard/components/PublicDashboardFooter/PublicDashboardsFooter.tsx
index 4b65096307d71..0b8b31d688699 100644
--- a/public/app/features/dashboard/components/PublicDashboardFooter/PublicDashboardsFooter.tsx
+++ b/public/app/features/dashboard/components/PublicDashboardFooter/PublicDashboardsFooter.tsx
@@ -30,7 +30,7 @@ export function setPublicDashboardFooterConfigFn(fn: typeof getPublicDashboardFo
 export let getPublicDashboardFooterConfig = (): PublicDashboardFooterCfg => ({
   hide: false,
   text: 'powered by Grafana',
-  logo: 'public/img/grafana_icon.svg',
+  logo: 'public/img/cloudian_logo.png',
   link: 'https://grafana.com/',
 });
 
diff --git a/public/app/features/dashboard/components/ShareModal/ShareLink.tsx b/public/app/features/dashboard/components/ShareModal/ShareLink.tsx
index db86d45953322..d691d2a98a1b9 100644
--- a/public/app/features/dashboard/components/ShareModal/ShareLink.tsx
+++ b/public/app/features/dashboard/components/ShareModal/ShareLink.tsx
@@ -168,7 +168,7 @@ export class ShareLink extends PureComponent<Props, State> {
               >
                 Grafana image renderer plugin
               </a>
-              . Please contact your Grafana administrator to install the plugin.
+              . Please contact your HyperIQ administrator to install the plugin.
             </Trans>
           </Alert>
         )}
diff --git a/public/app/features/datasources/__mocks__/store.navIndex.mock.ts b/public/app/features/datasources/__mocks__/store.navIndex.mock.ts
index 9ceb0484c093b..bde793ee0f9c8 100644
--- a/public/app/features/datasources/__mocks__/store.navIndex.mock.ts
+++ b/public/app/features/datasources/__mocks__/store.navIndex.mock.ts
@@ -2137,7 +2137,7 @@ export const navIndex: NavIndex = {
     id: 'admin',
     text: 'Server Admin',
     section: NavSection.Config,
-    subTitle: 'Manage all users and orgs',
+    subTitle: 'Manage all users',
     icon: 'shield',
     url: '/admin/users',
     sortWeight: -1200,
@@ -2149,12 +2149,6 @@ export const navIndex: NavIndex = {
         icon: 'user',
         url: '/admin/users',
       },
-      {
-        id: 'global-orgs',
-        text: 'Orgs',
-        icon: 'building',
-        url: '/admin/orgs',
-      },
       {
         id: 'server-settings',
         text: 'Settings',
@@ -2184,55 +2178,7 @@ export const navIndex: NavIndex = {
       id: 'admin',
       text: 'Server Admin',
       section: NavSection.Config,
-      subTitle: 'Manage all users and orgs',
-      icon: 'shield',
-      url: '/admin/users',
-      sortWeight: -1200,
-      hideFromTabs: true,
-      children: [
-        {
-          id: 'global-users',
-          text: 'Users',
-          icon: 'user',
-          url: '/admin/users',
-        },
-        {
-          id: 'global-orgs',
-          text: 'Orgs',
-          icon: 'building',
-          url: '/admin/orgs',
-        },
-        {
-          id: 'server-settings',
-          text: 'Settings',
-          icon: 'sliders-v-alt',
-          url: '/admin/settings',
-        },
-        {
-          id: 'admin-plugins',
-          text: 'Plugins',
-          icon: 'plug',
-          url: '/admin/plugins',
-        },
-        {
-          id: 'upgrading',
-          text: 'Stats and license',
-          icon: 'unlock',
-          url: '/admin/upgrading',
-        },
-      ],
-    },
-  },
-  'global-orgs': {
-    id: 'global-orgs',
-    text: 'Orgs',
-    icon: 'building',
-    url: '/admin/orgs',
-    parentItem: {
-      id: 'admin',
-      text: 'Server Admin',
-      section: NavSection.Config,
-      subTitle: 'Manage all users and orgs',
+      subTitle: 'Manage all users',
       icon: 'shield',
       url: '/admin/users',
       sortWeight: -1200,
@@ -2244,12 +2190,6 @@ export const navIndex: NavIndex = {
           icon: 'user',
           url: '/admin/users',
         },
-        {
-          id: 'global-orgs',
-          text: 'Orgs',
-          icon: 'building',
-          url: '/admin/orgs',
-        },
         {
           id: 'server-settings',
           text: 'Settings',
@@ -2280,7 +2220,7 @@ export const navIndex: NavIndex = {
       id: 'admin',
       text: 'Server Admin',
       section: NavSection.Config,
-      subTitle: 'Manage all users and orgs',
+      subTitle: 'Manage all users',
       icon: 'shield',
       url: '/admin/users',
       sortWeight: -1200,
@@ -2292,12 +2232,6 @@ export const navIndex: NavIndex = {
           icon: 'user',
           url: '/admin/users',
         },
-        {
-          id: 'global-orgs',
-          text: 'Orgs',
-          icon: 'building',
-          url: '/admin/orgs',
-        },
         {
           id: 'server-settings',
           text: 'Settings',
@@ -2328,7 +2262,7 @@ export const navIndex: NavIndex = {
       id: 'admin',
       text: 'Server Admin',
       section: NavSection.Config,
-      subTitle: 'Manage all users and orgs',
+      subTitle: 'Manage all users',
       icon: 'shield',
       url: '/admin/users',
       sortWeight: -1200,
@@ -2340,12 +2274,6 @@ export const navIndex: NavIndex = {
           icon: 'user',
           url: '/admin/users',
         },
-        {
-          id: 'global-orgs',
-          text: 'Orgs',
-          icon: 'building',
-          url: '/admin/orgs',
-        },
         {
           id: 'server-settings',
           text: 'Settings',
@@ -2376,7 +2304,7 @@ export const navIndex: NavIndex = {
       id: 'admin',
       text: 'Server Admin',
       section: NavSection.Config,
-      subTitle: 'Manage all users and orgs',
+      subTitle: 'Manage all users',
       icon: 'shield',
       url: '/admin/users',
       sortWeight: -1200,
@@ -2388,12 +2316,6 @@ export const navIndex: NavIndex = {
           icon: 'user',
           url: '/admin/users',
         },
-        {
-          id: 'global-orgs',
-          text: 'Orgs',
-          icon: 'building',
-          url: '/admin/orgs',
-        },
         {
           id: 'server-settings',
           text: 'Settings',
diff --git a/public/app/features/datasources/state/buildCategories.ts b/public/app/features/datasources/state/buildCategories.ts
index 68fa9f45d2d3c..c8c48a6f7b3b1 100644
--- a/public/app/features/datasources/state/buildCategories.ts
+++ b/public/app/features/datasources/state/buildCategories.ts
@@ -209,7 +209,7 @@ function getGrafanaCloudPhantomPlugin(): DataSourcePluginMeta {
     baseUrl: '',
     info: {
       description: 'Hosted Graphite, Prometheus, and Loki',
-      logos: { small: 'public/img/grafana_icon.svg', large: 'asd' },
+      logos: { small: 'public/img/cloudian_logo.png', large: 'asd' },
       author: { name: 'Grafana Labs' },
       links: [
         {
diff --git a/public/app/features/org/OrgDetailsPage.tsx b/public/app/features/org/OrgDetailsPage.tsx
index b3340e841ec48..8e9d787719d8f 100644
--- a/public/app/features/org/OrgDetailsPage.tsx
+++ b/public/app/features/org/OrgDetailsPage.tsx
@@ -10,7 +10,6 @@ import { getNavModel } from 'app/core/selectors/navModel';
 import { AccessControlAction, Organization, StoreState } from 'app/types';
 import { ShowConfirmModalEvent } from 'app/types/events';
 
-import OrgProfile from './OrgProfile';
 import { loadOrganization, updateOrganization } from './state/actions';
 import { setOrganizationName } from './state/reducers';
 
@@ -50,7 +49,6 @@ export class OrgDetailsPage extends PureComponent<Props> {
   render() {
     const { navModel, organization } = this.props;
     const isLoading = Object.keys(organization).length === 0;
-    const canReadOrg = contextSrv.hasPermission(AccessControlAction.OrgsRead);
     const canReadPreferences = contextSrv.hasPermission(AccessControlAction.OrgsPreferencesRead);
     const canWritePreferences = contextSrv.hasPermission(AccessControlAction.OrgsPreferencesWrite);
 
@@ -59,7 +57,6 @@ export class OrgDetailsPage extends PureComponent<Props> {
         <Page.Contents isLoading={isLoading}>
           {!isLoading && (
             <VerticalGroup spacing="lg">
-              {canReadOrg && <OrgProfile onSubmit={this.onUpdateOrganization} orgName={organization.name} />}
               {canReadPreferences && (
                 <SharedPreferences
                   resourceUri="org"
diff --git a/public/app/features/panel/components/PanelPluginError.tsx b/public/app/features/panel/components/PanelPluginError.tsx
index 0ce26af720f73..475e9f092e5c1 100644
--- a/public/app/features/panel/components/PanelPluginError.tsx
+++ b/public/app/features/panel/components/PanelPluginError.tsx
@@ -74,7 +74,7 @@ export function getPanelPluginNotFound(id: string, silent?: boolean): PanelPlugi
       links: [],
       logos: {
         large: '',
-        small: 'public/img/grafana_icon.svg',
+        small: 'public/img/cloudian_logo.png',
       },
       screenshots: [],
       updated: '',
diff --git a/public/app/features/plugins/admin/pages/PluginDetails.test.tsx b/public/app/features/plugins/admin/pages/PluginDetails.test.tsx
index 24f2fdde93450..5c4b107542a56 100644
--- a/public/app/features/plugins/admin/pages/PluginDetails.test.tsx
+++ b/public/app/features/plugins/admin/pages/PluginDetails.test.tsx
@@ -108,7 +108,7 @@ describe('Plugin details page', () => {
     Object.defineProperty(window, 'location', { configurable: true, value: originalWindowLocation });
   });
 
-  describe('viewed as user with grafana admin permissions', () => {
+  describe('viewed as user with hyperiq admin permissions', () => {
     beforeAll(() => {
       mockUserPermissions({
         isAdmin: true,
@@ -727,7 +727,7 @@ describe('Plugin details page', () => {
     });
   });
 
-  describe('viewed as user without grafana admin permissions', () => {
+  describe('viewed as user without hyperiq admin permissions', () => {
     beforeAll(() => {
       mockUserPermissions({
         isAdmin: false,
diff --git a/public/app/features/search/components/PreviewsSystemRequirements.tsx b/public/app/features/search/components/PreviewsSystemRequirements.tsx
index c3ba284c01b4f..229c2f4b46df1 100644
--- a/public/app/features/search/components/PreviewsSystemRequirements.tsx
+++ b/public/app/features/search/components/PreviewsSystemRequirements.tsx
@@ -28,7 +28,7 @@ const Message = ({ requiredImageRendererPluginVersion }: { requiredImageRenderer
     return (
       <>
         You must update the <MessageLink text="Grafana image renderer plugin" /> to version{' '}
-        {requiredImageRendererPluginVersion} to enable dashboard previews. Please contact your Grafana administrator to
+        {requiredImageRendererPluginVersion} to enable dashboard previews. Please contact your HyperIQ administrator to
         update the plugin.
       </>
     );
@@ -37,7 +37,7 @@ const Message = ({ requiredImageRendererPluginVersion }: { requiredImageRenderer
   return (
     <>
       You must install the <MessageLink text="Grafana image renderer plugin" /> to enable dashboard previews. Please
-      contact your Grafana administrator to install the plugin.
+      contact your HyperIQ administrator to install the plugin.
     </>
   );
 };
diff --git a/public/app/plugins/datasource/prometheus/img/mimir_logo.svg b/public/app/plugins/datasource/prometheus/img/mimir_logo.svg
index bd9605f592b5a..b3f41ba4ff8f7 100644
--- a/public/app/plugins/datasource/prometheus/img/mimir_logo.svg
+++ b/public/app/plugins/datasource/prometheus/img/mimir_logo.svg
@@ -1 +1 @@
-<svg clip-rule="evenodd" fill-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="2" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" gradientTransform="matrix(0 14.3827 -14.3827 0 7.68261 2.43042)" gradientUnits="userSpaceOnUse" x1="0" x2="1" y1="0" y2="0"><stop offset="0" stop-color="#f2c144"/><stop offset=".24" stop-color="#f1a03b"/><stop offset=".57" stop-color="#f17a31"/><stop offset=".84" stop-color="#f0632a"/><stop offset="1" stop-color="#f05a28"/></linearGradient><path d="m1.941 13.102h2.194l1.538-2.953-1.065-2.043zm11.935-5.079-1.2 2.303 1.406 2.742 1.2-2.313zm-.364-.705-2.562-4.971-1.263 2.228 2.623 5.049zm-3.991 3.039 1.429 2.743h2.436l-2.648-5.083zm-5.276-2.952-1.195-2.305-1.525 2.933 1.172 2.269zm-3.077 1.327-1.09 2.152 1.2 2.179 1.063-2.057zm8.113-3.494-1.27 2.243 1.146 2.179 1.219-2.34zm-4.792-2.98-1.096 2.133 4.264 8.154 1.137-2.182-2.155-4.135z" fill="url(#a)" fill-rule="nonzero"/></svg>
\ No newline at end of file
+<svg clip-rule="evenodd" fill-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="2" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" gradientTransform="matrix(0 14.3827 -14.3827 0 7.68261 2.43042)" gradientUnits="userSpaceOnUse" x1="0" x2="1" y1="0" y2="0"><stop offset="0" stop-color="#f2c144"/><stop offset=".24" stop-color="#f1a03b"/><stop offset=".57" stop-color="#f17a31"/><stop offset=".84" stop-color="#f0632a"/><stop offset="1" stop-color="#c1d500"/></linearGradient><path d="m1.941 13.102h2.194l1.538-2.953-1.065-2.043zm11.935-5.079-1.2 2.303 1.406 2.742 1.2-2.313zm-.364-.705-2.562-4.971-1.263 2.228 2.623 5.049zm-3.991 3.039 1.429 2.743h2.436l-2.648-5.083zm-5.276-2.952-1.195-2.305-1.525 2.933 1.172 2.269zm-3.077 1.327-1.09 2.152 1.2 2.179 1.063-2.057zm8.113-3.494-1.27 2.243 1.146 2.179 1.219-2.34zm-4.792-2.98-1.096 2.133 4.264 8.154 1.137-2.182-2.155-4.135z" fill="url(#a)" fill-rule="nonzero"/></svg>
\ No newline at end of file
diff --git a/public/app/plugins/datasource/tempo/img/tempo_logo.svg b/public/app/plugins/datasource/tempo/img/tempo_logo.svg
index c1f0ea76e5622..7190f4b27fa5b 100644
--- a/public/app/plugins/datasource/tempo/img/tempo_logo.svg
+++ b/public/app/plugins/datasource/tempo/img/tempo_logo.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 121.85 99.17"><defs><style>.cls-1{fill:url(#linear-gradient);}</style><linearGradient id="linear-gradient" x1="168.55" y1="13.4" x2="27.2" y2="57" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff100"/><stop offset="1" stop-color="#f05a28"/></linearGradient></defs><g id="Layer_6" data-name="Layer 6"><path class="cls-1" d="M4.66,25H2.37a2.37,2.37,0,0,0,0,4.74H4.66a2.37,2.37,0,1,0,0-4.74ZM48.48,59.57H46.19a2.37,2.37,0,1,0,0,4.74h2.29a2.37,2.37,0,1,0,0-4.74ZM46.56,37a2.37,2.37,0,0,0-2.37-2.37H36.27a2.37,2.37,0,0,0,0,4.74h7.92A2.37,2.37,0,0,0,46.56,37ZM121.73,22.1,119.32,8.56A9.88,9.88,0,0,0,109.07,0H16.24A6.28,6.28,0,0,0,9.9,7.7l2.54,14.4a3.38,3.38,0,0,0,.08.34v0c.3,1.76-.59,2.47-1.39,2.73h0a2.37,2.37,0,0,0,.79,4.6H115.39A6.28,6.28,0,0,0,121.73,22.1ZM90.15,76.42c-1-5.25-4-7.2-7.39-7.2H58.24a2.39,2.39,0,0,0-2.37,2.4A2.37,2.37,0,0,0,58,74h0c.78.14,1.62,1.16,2.15,3.68l2.52,14a9.59,9.59,0,0,0,9.19,7.54l14.63-.07a6.28,6.28,0,0,0,6.44-7.61ZM57.73,64.48H84.34a2.27,2.27,0,0,0,.59-.09c2.46-.52,2.58-2.52,2.26-4.51L83.8,41.27c-.93-4.84-3.74-6.75-7.43-6.75H52a2.37,2.37,0,0,0-.28,4.72h0c.81.15,1.7,1.24,2.22,4l2.57,14.24v0A1.92,1.92,0,0,1,55,59.87h0a2.36,2.36,0,0,0,.79,4.59h1.9Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 121.85 99.17"><defs><style>.cls-1{fill:url(#linear-gradient);}</style><linearGradient id="linear-gradient" x1="168.55" y1="13.4" x2="27.2" y2="57" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff100"/><stop offset="1" stop-color="#c1d500"/></linearGradient></defs><g id="Layer_6" data-name="Layer 6"><path class="cls-1" d="M4.66,25H2.37a2.37,2.37,0,0,0,0,4.74H4.66a2.37,2.37,0,1,0,0-4.74ZM48.48,59.57H46.19a2.37,2.37,0,1,0,0,4.74h2.29a2.37,2.37,0,1,0,0-4.74ZM46.56,37a2.37,2.37,0,0,0-2.37-2.37H36.27a2.37,2.37,0,0,0,0,4.74h7.92A2.37,2.37,0,0,0,46.56,37ZM121.73,22.1,119.32,8.56A9.88,9.88,0,0,0,109.07,0H16.24A6.28,6.28,0,0,0,9.9,7.7l2.54,14.4a3.38,3.38,0,0,0,.08.34v0c.3,1.76-.59,2.47-1.39,2.73h0a2.37,2.37,0,0,0,.79,4.6H115.39A6.28,6.28,0,0,0,121.73,22.1ZM90.15,76.42c-1-5.25-4-7.2-7.39-7.2H58.24a2.39,2.39,0,0,0-2.37,2.4A2.37,2.37,0,0,0,58,74h0c.78.14,1.62,1.16,2.15,3.68l2.52,14a9.59,9.59,0,0,0,9.19,7.54l14.63-.07a6.28,6.28,0,0,0,6.44-7.61ZM57.73,64.48H84.34a2.27,2.27,0,0,0,.59-.09c2.46-.52,2.58-2.52,2.26-4.51L83.8,41.27c-.93-4.84-3.74-6.75-7.43-6.75H52a2.37,2.37,0,0,0-.28,4.72h0c.81.15,1.7,1.24,2.22,4l2.57,14.24v0A1.92,1.92,0,0,1,55,59.87h0a2.36,2.36,0,0,0,.79,4.59h1.9Z"/></g></svg>
\ No newline at end of file
diff --git a/public/app/plugins/panel/gettingstarted/components/sharedStyles.ts b/public/app/plugins/panel/gettingstarted/components/sharedStyles.ts
index d2bd43184e735..11a4193ad7c42 100644
--- a/public/app/plugins/panel/gettingstarted/components/sharedStyles.ts
+++ b/public/app/plugins/panel/gettingstarted/components/sharedStyles.ts
@@ -3,9 +3,13 @@ import { css } from '@emotion/css';
 import { GrafanaTheme2 } from '@grafana/data';
 
 export const cardStyle = (theme: GrafanaTheme2, complete: boolean) => {
-  const completeGradient = 'linear-gradient(to right, #5182CC 0%, #245BAF 100%)';
-  const darkThemeGradients = complete ? completeGradient : 'linear-gradient(to right, #f05a28 0%, #fbca0a 100%)';
-  const lightThemeGradients = complete ? completeGradient : 'linear-gradient(to right, #FBCA0A 0%, #F05A28 100%)';
+  const completeGradient = 'linear-gradient(to right, #c1d500 30%, #9a989b 60%, #ffffff 100%)';
+  const darkThemeGradients = complete
+    ? completeGradient
+    : 'linear-gradient(to right, #c1d500 30%, #9a989b 60%, #ffffff 100%)';
+  const lightThemeGradients = complete
+    ? completeGradient
+    : 'linear-gradient(to right, #c1d500 30%, #9a989b 60%, #ffffff 100%)';
 
   const borderGradient = theme.isDark ? darkThemeGradients : lightThemeGradients;
 
diff --git a/public/docs/hyperiq_guide.pdf b/public/docs/hyperiq_guide.pdf
new file mode 100644
index 0000000000000..5ad098c0b6455
Binary files /dev/null and b/public/docs/hyperiq_guide.pdf differ
diff --git a/public/emails/alert_notification.html b/public/emails/alert_notification.html
index 4408da8d9160d..27398d2b35b66 100644
--- a/public/emails/alert_notification.html
+++ b/public/emails/alert_notification.html
@@ -184,7 +184,7 @@
 						            <table class="twelve columns" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; width: 580px; margin: 0 auto; padding: 0;">
 						              <tr style="vertical-align: top; padding: 0;" align="left">
 						                <td class="twelve sub-columns center" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; min-width: 0px; width: 100%; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0px 10px 10px 0px;" align="center" valign="top">
-                              <img class="logo" src="https://grafana.com/static/assets/img/logo_new_transparent_200x48.png" style="width: 200px; display: inline; outline: none !important; text-decoration: none !important; -ms-interpolation-mode: bicubic; clear: both; border-width: 0;" align="none" />
+                              <img class="logo" src="https://data.cloudian.com/l/677273/2019-01-29/6ns/677273/1811/cloudian_logo_438.png" style="width: 200px; display: inline; outline: none !important; text-decoration: none !important; -ms-interpolation-mode: bicubic; clear: both; border-width: 0;" align="none" />
                             </td>
                             <td class="expander" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; visibility: hidden; width: 0px; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0;" align="left" valign="top"></td>
                           </tr>
diff --git a/public/emails/alert_notification_example.html b/public/emails/alert_notification_example.html
index 34c0c34ab05aa..b75a17c4a1e57 100644
--- a/public/emails/alert_notification_example.html
+++ b/public/emails/alert_notification_example.html
@@ -191,7 +191,7 @@
 						            <table class="twelve columns" style="border-collapse: collapse; border-spacing: 0; margin: 0 auto; padding: 0; text-align: left; vertical-align: top; width: 580px;">
 						              <tr style="padding: 0; vertical-align: top;" align="left">
 						                <td class="six sub-columns center" style="-moz-hyphens: auto; -webkit-font-smoothing: antialiased; -webkit-hyphens: auto; -webkit-text-size-adjust: none; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; hyphens: auto; line-height: 19px; margin: 0; min-width: 0px; padding: 0px 10px 10px 0px; width: 50%; word-break: break-word;" align="center" valign="top">
-											<img class="logo" src="https://grafana.com/static/assets/img/logo_new_transparent_200x48.png" style="-ms-interpolation-mode: bicubic; border: 0; clear: both; display: inline; outline: none !important; text-decoration: none !important; width: 200px;" align="none" />
+											<img class="logo" src="https://data.cloudian.com/l/677273/2019-01-29/6ns/677273/1811/cloudian_logo_438.png" style="-ms-interpolation-mode: bicubic; border: 0; clear: both; display: inline; outline: none !important; text-decoration: none !important; width: 200px;" align="none" />
 						                </td>
 										<td class="expander" style="-moz-hyphens: auto; -webkit-font-smoothing: antialiased; -webkit-hyphens: auto; -webkit-text-size-adjust: none; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; hyphens: auto; line-height: 19px; margin: 0; padding: 0; visibility: hidden; width: 0px; word-break: break-word;" align="left" valign="top"></td>
 						              </tr>
diff --git a/public/emails/reset_password.html b/public/emails/reset_password.html
index a09859c8f432d..5031510bd7451 100644
--- a/public/emails/reset_password.html
+++ b/public/emails/reset_password.html
@@ -3,7 +3,7 @@
 
 <head>
   <title>
-    {{ Subject .Subject .TemplateData "Reset your Grafana password - {{.Name}}" }}
+    {{ Subject .Subject .TemplateData "Reset your HyperIQ password - {{.Name}}" }}
   </title>
   {{ __dangerouslyInjectHTML `<!--[if !mso]><!-->` }}
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
diff --git a/public/emails/reset_password.txt b/public/emails/reset_password.txt
index b8bf248c1a578..120303dc3d1dc 100644
--- a/public/emails/reset_password.txt
+++ b/public/emails/reset_password.txt
@@ -1,4 +1,4 @@
-{{HiddenSubject .Subject "Reset your Grafana password - {{.Name}}"}}
+{{HiddenSubject .Subject "Reset your HyperIQ password - {{.Name}}"}}
 
 Hi {{.Name}},
 
@@ -6,4 +6,4 @@ Copy and paste the following link directly in your browser to reset your passwor
 {{.AppUrl}}user/password/reset?code={{.Code}}
 
 
-Sent by Grafana v{{.BuildVersion}} (c) {{now | date "2006"}} Grafana Labs
+Sent by HyperIQ (c) {{now | date "2006"}} Grafana Labs and Cloudian, Inc.
diff --git a/public/img/alerting/mimir_logo.svg b/public/img/alerting/mimir_logo.svg
index c530cb6cfa106..3859aeb13929f 100644
--- a/public/img/alerting/mimir_logo.svg
+++ b/public/img/alerting/mimir_logo.svg
@@ -1 +1 @@
-<svg clip-rule="evenodd" fill-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="2" viewBox="0 0 440 440" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" gradientTransform="matrix(0 413.9 -413.9 0 219.645 68.5)" gradientUnits="userSpaceOnUse" x1="0" x2="1" y1="0" y2="0"><stop offset="0" stop-color="#f2c144"/><stop offset=".24" stop-color="#f1a03b"/><stop offset=".57" stop-color="#f17a31"/><stop offset=".84" stop-color="#f0632a"/><stop offset="1" stop-color="#f05a28"/></linearGradient><path d="m54.404 375.588h63.152l44.246-84.969-30.624-58.779zm343.478-146.147-34.53 66.276 40.44 78.896 34.555-66.55zm-10.492-20.293-73.719-143.047-36.358 64.127 75.497 145.272zm-114.835 87.469 41.116 78.921h70.113l-76.222-146.271zm-151.844-84.969-34.381-66.326-43.895 84.42 33.729 65.275zm-88.543 38.186-31.375 61.952 34.53 62.703 30.6-59.204zm233.477-100.538-36.559 64.551 33.002 62.702 35.057-67.35zm-137.898-85.744-31.551 61.377 122.698 234.64 32.728-62.802-62-118.982z" fill="url(#a)" fill-rule="nonzero"/></svg>
\ No newline at end of file
+<svg clip-rule="evenodd" fill-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="2" viewBox="0 0 440 440" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" gradientTransform="matrix(0 413.9 -413.9 0 219.645 68.5)" gradientUnits="userSpaceOnUse" x1="0" x2="1" y1="0" y2="0"><stop offset="0" stop-color="#f2c144"/><stop offset=".24" stop-color="#f1a03b"/><stop offset=".57" stop-color="#f17a31"/><stop offset=".84" stop-color="#f0632a"/><stop offset="1" stop-color="#c1d500"/></linearGradient><path d="m54.404 375.588h63.152l44.246-84.969-30.624-58.779zm343.478-146.147-34.53 66.276 40.44 78.896 34.555-66.55zm-10.492-20.293-73.719-143.047-36.358 64.127 75.497 145.272zm-114.835 87.469 41.116 78.921h70.113l-76.222-146.271zm-151.844-84.969-34.381-66.326-43.895 84.42 33.729 65.275zm-88.543 38.186-31.375 61.952 34.53 62.703 30.6-59.204zm233.477-100.538-36.559 64.551 33.002 62.702 35.057-67.35zm-137.898-85.744-31.551 61.377 122.698 234.64 32.728-62.802-62-118.982z" fill="url(#a)" fill-rule="nonzero"/></svg>
\ No newline at end of file
diff --git a/public/img/alerting/mimir_logo_recording.svg b/public/img/alerting/mimir_logo_recording.svg
index bc5c1e898f770..23c3765407cdc 100644
--- a/public/img/alerting/mimir_logo_recording.svg
+++ b/public/img/alerting/mimir_logo_recording.svg
@@ -1 +1 @@
-<svg clip-rule="evenodd" fill-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="2" viewBox="0 0 440 440" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" gradientTransform="matrix(0 413.9 -413.9 0 219.645 68.5)" gradientUnits="userSpaceOnUse" x1="0" x2="1" y1="0" y2="0"><stop offset="0" stop-color="#f2c144"/><stop offset=".24" stop-color="#f1a03b"/><stop offset=".57" stop-color="#f17a31"/><stop offset=".84" stop-color="#f0632a"/><stop offset="1" stop-color="#f05a28"/></linearGradient><path d="m54.404 375.588h63.152l44.246-84.969-30.624-58.779zm343.478-146.147-34.53 66.276 40.44 78.896 34.555-66.55zm-10.492-20.293-73.719-143.047-36.358 64.127 75.497 145.272zm-114.835 87.469 41.116 78.921h70.113l-76.222-146.271zm-151.844-84.969-34.381-66.326-43.895 84.42 33.729 65.275zm-88.543 38.186-31.375 61.952 34.53 62.703 30.6-59.204zm233.477-100.538-36.559 64.551 33.002 62.702 35.057-67.35zm-137.898-85.744-31.551 61.377 122.698 234.64 32.728-62.802-62-118.982z" fill="url(#a)" fill-rule="nonzero"/><path d="m383.609 330.855c0-17.198-13.961-31.16-31.159-31.16h-264.898c-17.198 0-31.161 13.962-31.161 31.16v62.32c0 17.198 13.963 31.16 31.161 31.16h264.898c17.198 0 31.159-13.962 31.159-31.16z"/><circle cx="131.052" cy="362.017" fill="#f00" r="36.225"/><g fill="#fff" fill-rule="nonzero"><path d="m188.372 389.94v-55.846h23.732c5.968 0 10.305.501 13.009 1.504 2.706 1.003 4.87 2.787 6.496 5.353 1.625 2.565 2.438 5.498 2.438 8.799 0 4.19-1.233 7.651-3.696 10.381s-6.145 4.45-11.047 5.161c2.438 1.423 4.451 2.984 6.038 4.686 1.587 1.701 3.727 4.724 6.418 9.066l6.82 10.896h-13.485l-8.153-12.153c-2.895-4.342-4.875-7.079-5.942-8.209s-2.197-1.904-3.39-2.323c-1.194-.42-3.086-.63-5.677-.63h-2.285v23.315zm11.276-32.229h8.342c5.41 0 8.788-.228 10.133-.685 1.346-.456 2.4-1.245 3.162-2.362.761-1.117 1.143-2.514 1.143-4.19 0-1.879-.502-3.397-1.505-4.552-1.004-1.156-2.419-1.886-4.248-2.19-.914-.127-3.657-.191-8.228-.191h-8.799z"/><path d="m244.675 389.94v-55.846h41.407v9.447h-30.132v12.38h28.037v9.41h-28.037v15.199h31.199v9.41z"/><path d="m332.443 369.406 10.933 3.467c-1.677 6.094-4.464 10.621-8.362 13.581-3.898 2.958-8.844 4.437-14.838 4.437-7.415 0-13.509-2.533-18.285-7.6-4.774-5.065-7.161-11.992-7.161-20.78 0-9.294 2.4-16.513 7.2-21.656s11.111-7.714 18.932-7.714c6.832 0 12.381 2.02 16.648 6.057 2.539 2.387 4.444 5.815 5.713 10.285l-11.16 2.667c-.662-2.895-2.039-5.181-4.134-6.857-2.096-1.676-4.641-2.514-7.637-2.514-4.14 0-7.5 1.486-10.077 4.457s-3.867 7.784-3.867 14.438c0 7.059 1.27 12.088 3.81 15.085s5.841 4.494 9.904 4.494c2.997 0 5.575-.952 7.734-2.857 2.158-1.904 3.707-4.901 4.647-8.99z"/></g></svg>
\ No newline at end of file
+<svg clip-rule="evenodd" fill-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="2" viewBox="0 0 440 440" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" gradientTransform="matrix(0 413.9 -413.9 0 219.645 68.5)" gradientUnits="userSpaceOnUse" x1="0" x2="1" y1="0" y2="0"><stop offset="0" stop-color="#f2c144"/><stop offset=".24" stop-color="#f1a03b"/><stop offset=".57" stop-color="#f17a31"/><stop offset=".84" stop-color="#f0632a"/><stop offset="1" stop-color="#c1d500"/></linearGradient><path d="m54.404 375.588h63.152l44.246-84.969-30.624-58.779zm343.478-146.147-34.53 66.276 40.44 78.896 34.555-66.55zm-10.492-20.293-73.719-143.047-36.358 64.127 75.497 145.272zm-114.835 87.469 41.116 78.921h70.113l-76.222-146.271zm-151.844-84.969-34.381-66.326-43.895 84.42 33.729 65.275zm-88.543 38.186-31.375 61.952 34.53 62.703 30.6-59.204zm233.477-100.538-36.559 64.551 33.002 62.702 35.057-67.35zm-137.898-85.744-31.551 61.377 122.698 234.64 32.728-62.802-62-118.982z" fill="url(#a)" fill-rule="nonzero"/><path d="m383.609 330.855c0-17.198-13.961-31.16-31.159-31.16h-264.898c-17.198 0-31.161 13.962-31.161 31.16v62.32c0 17.198 13.963 31.16 31.161 31.16h264.898c17.198 0 31.159-13.962 31.159-31.16z"/><circle cx="131.052" cy="362.017" fill="#f00" r="36.225"/><g fill="#fff" fill-rule="nonzero"><path d="m188.372 389.94v-55.846h23.732c5.968 0 10.305.501 13.009 1.504 2.706 1.003 4.87 2.787 6.496 5.353 1.625 2.565 2.438 5.498 2.438 8.799 0 4.19-1.233 7.651-3.696 10.381s-6.145 4.45-11.047 5.161c2.438 1.423 4.451 2.984 6.038 4.686 1.587 1.701 3.727 4.724 6.418 9.066l6.82 10.896h-13.485l-8.153-12.153c-2.895-4.342-4.875-7.079-5.942-8.209s-2.197-1.904-3.39-2.323c-1.194-.42-3.086-.63-5.677-.63h-2.285v23.315zm11.276-32.229h8.342c5.41 0 8.788-.228 10.133-.685 1.346-.456 2.4-1.245 3.162-2.362.761-1.117 1.143-2.514 1.143-4.19 0-1.879-.502-3.397-1.505-4.552-1.004-1.156-2.419-1.886-4.248-2.19-.914-.127-3.657-.191-8.228-.191h-8.799z"/><path d="m244.675 389.94v-55.846h41.407v9.447h-30.132v12.38h28.037v9.41h-28.037v15.199h31.199v9.41z"/><path d="m332.443 369.406 10.933 3.467c-1.677 6.094-4.464 10.621-8.362 13.581-3.898 2.958-8.844 4.437-14.838 4.437-7.415 0-13.509-2.533-18.285-7.6-4.774-5.065-7.161-11.992-7.161-20.78 0-9.294 2.4-16.513 7.2-21.656s11.111-7.714 18.932-7.714c6.832 0 12.381 2.02 16.648 6.057 2.539 2.387 4.444 5.815 5.713 10.285l-11.16 2.667c-.662-2.895-2.039-5.181-4.134-6.857-2.096-1.676-4.641-2.514-7.637-2.514-4.14 0-7.5 1.486-10.077 4.457s-3.867 7.784-3.867 14.438c0 7.059 1.27 12.088 3.81 15.085s5.841 4.494 9.904 4.494c2.997 0 5.575-.952 7.734-2.857 2.158-1.904 3.707-4.901 4.647-8.99z"/></g></svg>
\ No newline at end of file
diff --git a/public/img/cloudian_logo.png b/public/img/cloudian_logo.png
new file mode 100644
index 0000000000000..008505caa10b4
Binary files /dev/null and b/public/img/cloudian_logo.png differ
diff --git a/public/img/cloudian_logo_alt.png b/public/img/cloudian_logo_alt.png
new file mode 100644
index 0000000000000..8941fe5da33c1
Binary files /dev/null and b/public/img/cloudian_logo_alt.png differ
diff --git a/public/img/grafana_text_logo-dark.svg b/public/img/grafana_text_logo-dark.svg
index 33be11e1ec7bb..10c4ae88ceaee 100644
--- a/public/img/grafana_text_logo-dark.svg
+++ b/public/img/grafana_text_logo-dark.svg
@@ -6,28 +6,28 @@
   <g>
     <linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="432.53" y1="105.725" x2="432.53" y2="21.688">
       <stop offset="0" style="stop-color:#fff100"/>
-      <stop offset="1" style="stop-color:#f05a28"/>
+      <stop offset="1" style="stop-color:#c1d500"/>
     </linearGradient>
     <path d="M447.6 78.5h-30.14V19.02h8.04v51.36h22.1v8.12z" style="fill:url(#SVGID_1_)"/>
     <linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="469.662" y1="105.725" x2="469.662" y2="21.688">
       <stop offset="0" style="stop-color:#fff100"/>
-      <stop offset="1" style="stop-color:#f05a28"/>
+      <stop offset="1" style="stop-color:#c1d500"/>
     </linearGradient>
     <path d="M490.36 78.5h-6.83v-5.06c-3.54 3.46-8.44 5.71-13.82 5.71-11.49 0-20.74-9.32-20.74-20.82 0-11.33 9.24-20.66 20.74-20.66 5.39 0 10.21 2.17 13.74 5.71v-5.06h6.91V78.5zm-7.88-20.18c0-6.91-5.63-12.62-12.7-12.62-6.99 0-12.62 5.71-12.62 12.62 0 7.07 5.63 12.7 12.62 12.7 7.08 0 12.7-5.62 12.7-12.7z" style="fill:url(#SVGID_2_)"/>
     <linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="517.805" y1="105.725" x2="517.805" y2="21.688">
       <stop offset="0" style="stop-color:#fff100"/>
-      <stop offset="1" style="stop-color:#f05a28"/>
+      <stop offset="1" style="stop-color:#c1d500"/>
     </linearGradient>
     <path d="M538.5 58.4c0 11.41-9.32 20.74-20.73 20.74-5.39 0-10.37-2.25-13.91-5.71v5.06h-6.75V22.24h7.96v20.25c3.3-2.97 7.8-4.82 12.7-4.82 11.41 0 20.73 9.24 20.73 20.73zm-8.2 0c0-6.99-5.71-12.62-12.62-12.62s-12.62 5.63-12.62 12.62c0 6.91 5.71 12.54 12.62 12.54s12.62-5.62 12.62-12.54z" style="fill:url(#SVGID_3_)"/>
     <linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="554.375" y1="105.725" x2="554.375" y2="21.688">
       <stop offset="0" style="stop-color:#fff100"/>
-      <stop offset="1" style="stop-color:#f05a28"/>
+      <stop offset="1" style="stop-color:#c1d500"/>
     </linearGradient>
     <path d="m565.99 41.2-3.54 5.87c-1.69-1.04-4.58-2.65-7.8-2.65-3.05 0-5.79 1.53-5.79 4.02 0 2.73 3.13 3.78 7.07 5.22 6.43 2.25 12.06 6.59 12.06 13.18 0 6.67-5.71 12.3-13.9 12.3-4.98 0-9.97-2.01-13.34-4.1l3.14-6.67c2.33 1.37 6.67 3.05 9.97 3.05 4.02 0 5.79-2.41 5.79-4.74 0-2.73-2.49-4.26-8.04-6.43-4.02-1.61-10.53-4.26-10.53-11.41 0-6.67 5.71-11.17 13.34-11.17 4.5 0 8.19 1.52 11.57 3.53z" style="fill:url(#SVGID_4_)"/>
   </g>
   <linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="42.775" y1="113.822" x2="42.775" y2="28.926">
     <stop offset="0" style="stop-color:#fff100"/>
-    <stop offset="1" style="stop-color:#f05a28"/>
+    <stop offset="1" style="stop-color:#c1d500"/>
   </linearGradient>
   <path d="M85.43 41a32.59 32.59 0 0 0-.93-5.35c-.52-1.98-1.29-4.15-2.4-6.41a35.402 35.402 0 0 0-6.93-9.46c1.31-5.2-1.59-9.7-1.59-9.7-5-.31-8.18 1.55-9.36 2.41-.2-.08-.39-.17-.59-.25-.85-.35-1.73-.67-2.63-.95-.9-.28-1.82-.54-2.76-.77-.94-.22-1.9-.41-2.87-.56-.17-.03-.34-.05-.51-.07C52.68 2.91 46.41 0 46.41 0c-6.98 4.43-8.31 10.63-8.31 10.63s-.03.14-.07.37c-.39.11-.77.22-1.16.34-.54.16-1.06.36-1.6.55-.53.21-1.06.41-1.59.64-1.05.45-2.1.96-3.12 1.53-.99.56-1.96 1.17-2.91 1.83-.14-.06-.24-.11-.24-.11-9.67-3.69-18.26.75-18.26.75-.78 10.29 3.86 16.77 4.78 17.94-.23.64-.44 1.28-.64 1.93a43.921 43.921 0 0 0-1.71 8.27C2.65 49.08 0 58.13 0 58.13c7.46 8.58 16.15 9.11 16.15 9.11.01-.01.02-.01.02-.02 1.11 1.97 2.39 3.85 3.82 5.6.6.73 1.24 1.44 1.89 2.12-2.72 7.77.38 14.25.38 14.25 8.3.31 13.76-3.63 14.9-4.54.83.28 1.66.53 2.51.75 2.55.66 5.16 1.04 7.77 1.16.65.03 1.3.04 1.96.04h.32l.21-.01.41-.01.41-.02.01.01c3.91 5.58 10.79 6.37 10.79 6.37 4.89-5.16 5.17-10.27 5.17-11.38v-.23c0-.08-.01-.15-.01-.24 1.03-.72 2.01-1.49 2.93-2.32 1.96-1.77 3.67-3.79 5.09-5.96.13-.2.26-.41.39-.62 5.54.32 9.44-3.43 9.44-3.43-.92-5.77-4.21-8.58-4.89-9.12 0 0-.03-.02-.07-.05a.612.612 0 0 1-.06-.05c-.04-.02-.08-.05-.12-.08.03-.35.06-.69.08-1.04.04-.62.06-1.24.06-1.86V55.59l-.02-.39-.03-.52a7.25 7.25 0 0 0-.04-.5c-.01-.16-.03-.32-.05-.48l-.06-.48-.07-.48a24.091 24.091 0 0 0-3.19-8.86c-1.28-2.12-2.88-4-4.67-5.58-1.8-1.59-3.81-2.86-5.92-3.81-2.11-.95-4.33-1.56-6.54-1.84-1.1-.14-2.21-.2-3.3-.19l-.41.01H55.02l-.17.01-.4.03c-.15.01-.31.02-.45.04-.56.05-1.12.13-1.66.24-2.19.41-4.26 1.2-6.09 2.29a18.628 18.628 0 0 0-4.7 4 18.247 18.247 0 0 0-2.98 5.03 17.884 17.884 0 0 0-1.21 6.7c0 .11 0 .22.01.33l.01.36c.02.21.03.43.05.64.09.9.25 1.76.49 2.6a13.92 13.92 0 0 0 5.51 7.62c1.21.83 2.5 1.42 3.78 1.79 1.28.38 2.55.54 3.75.54.15 0 .3 0 .45-.01.08 0 .16-.01.24-.01.08 0 .16-.01.24-.01.13-.01.25-.03.38-.04.03 0 .07-.01.11-.01l.12-.02.23-.03c.16-.02.29-.05.44-.08.14-.03.28-.05.42-.09.28-.06.54-.14.8-.23.52-.17 1.01-.38 1.47-.61.46-.24.88-.5 1.27-.77.11-.08.22-.16.33-.25.42-.33.49-.94.15-1.35a.954.954 0 0 0-1.2-.23c-.1.05-.2.11-.3.16-.35.17-.71.32-1.1.45-.39.12-.79.22-1.21.3-.21.03-.42.06-.64.08-.11.01-.22.02-.32.02-.11 0-.22.01-.32.01s-.21 0-.31-.01c-.13-.01-.26-.01-.39-.02h-.05l-.09-.01c-.06-.01-.12-.01-.17-.02-.12-.01-.23-.03-.35-.04-.94-.13-1.89-.4-2.8-.82a9.99 9.99 0 0 1-2.59-1.7 9.886 9.886 0 0 1-2.02-2.54c-.54-.97-.92-2.04-1.1-3.17-.09-.56-.13-1.15-.11-1.72.01-.16.01-.31.02-.47v-.09l.01-.12c.01-.08.01-.15.02-.23.03-.31.08-.62.13-.93a12.2 12.2 0 0 1 3.57-6.68 12.365 12.365 0 0 1 3.27-2.24c.61-.28 1.24-.51 1.89-.68.65-.17 1.32-.29 1.99-.35.34-.03.68-.04 1.02-.04h.23l.28.01.17.01h.1l.28.02c.73.06 1.46.16 2.18.33 1.44.32 2.84.85 4.15 1.57 2.61 1.45 4.84 3.71 6.2 6.44.69 1.36 1.17 2.82 1.41 4.33.06.38.1.76.13 1.14l.02.29.01.29c.01.1.01.19.01.29 0 .1.01.2 0 .27v.25l-.01.28c-.01.19-.02.49-.03.68-.03.42-.07.83-.12 1.25-.05.41-.12.82-.19 1.23-.08.41-.17.81-.27 1.21-.2.8-.46 1.6-.77 2.37-.61 1.55-1.43 3.02-2.41 4.38a19.79 19.79 0 0 1-7.72 6.32c-1.53.69-3.15 1.2-4.8 1.47-.83.14-1.67.22-2.51.25l-.16.01h-1.11c-.45-.01-.9-.03-1.35-.07-1.8-.13-3.57-.45-5.29-.95-1.72-.5-3.39-1.17-4.97-2.01-3.16-1.69-5.98-4-8.19-6.79a26.224 26.224 0 0 1-2.88-4.45c-.8-1.57-1.43-3.22-1.9-4.9-.46-1.69-.75-3.41-.86-5.15l-.02-.33-.01-.08V49.84l-.01-.29v-.37l-.01-.4v-.27c0-.21.01-.42.01-.64.03-.86.1-1.74.22-2.62A34.845 34.845 0 0 1 25.35 40c.49-1.71 1.1-3.37 1.83-4.94 1.45-3.14 3.35-5.91 5.64-8.13a23.769 23.769 0 0 1 3.69-2.96c.65-.43 1.33-.83 2.03-1.19.34-.19.7-.35 1.05-.52l.54-.24c.18-.08.36-.16.54-.23.72-.31 1.47-.56 2.22-.8.19-.06.38-.11.57-.17.19-.06.38-.1.57-.16.38-.11.77-.2 1.15-.29.19-.05.39-.09.58-.13l.58-.12c.2-.04.39-.07.59-.11l.29-.05.29-.04.59-.09c.22-.04.44-.05.66-.09.18-.02.48-.06.66-.08.14-.01.28-.03.42-.04l.28-.03.14-.01.16-.01c.22-.01.44-.03.67-.04l.33-.02H51.51l.14-.01.57-.03c.75-.02 1.5-.02 2.25 0 1.49.06 2.95.22 4.37.49 2.84.53 5.51 1.44 7.93 2.64 2.42 1.18 4.59 2.64 6.47 4.22.12.1.23.2.35.3.11.1.23.2.34.3.23.2.45.41.67.61.22.2.43.41.64.62.21.21.42.42.61.63.8.85 1.54 1.7 2.2 2.56 1.34 1.72 2.41 3.46 3.26 5.1.05.1.11.2.16.31.05.1.1.2.15.31.1.2.2.4.29.6.09.2.19.4.27.59.09.2.17.39.25.58.32.77.61 1.5.84 2.19.39 1.11.68 2.12.9 3 .09.35.42.58.78.55.37-.03.66-.34.67-.71-.06-1-.08-2.1-.19-3.36z" style="fill:url(#SVGID_5_)"/>
 </svg>
\ No newline at end of file
diff --git a/public/img/grafana_text_logo-light.svg b/public/img/grafana_text_logo-light.svg
index 13ba4548af3c4..1448a81a1499c 100644
--- a/public/img/grafana_text_logo-light.svg
+++ b/public/img/grafana_text_logo-light.svg
@@ -6,28 +6,28 @@
   <g>
     <linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="432.53" y1="105.725" x2="432.53" y2="21.688">
       <stop offset="0" style="stop-color:#fff100"/>
-      <stop offset="1" style="stop-color:#f05a28"/>
+      <stop offset="1" style="stop-color:#c1d500"/>
     </linearGradient>
     <path d="M447.6 78.5h-30.14V19.02h8.04v51.36h22.1v8.12z" style="fill:url(#SVGID_1_)"/>
     <linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="469.662" y1="105.725" x2="469.662" y2="21.688">
       <stop offset="0" style="stop-color:#fff100"/>
-      <stop offset="1" style="stop-color:#f05a28"/>
+      <stop offset="1" style="stop-color:#c1d500"/>
     </linearGradient>
     <path d="M490.36 78.5h-6.83v-5.06c-3.54 3.46-8.44 5.71-13.82 5.71-11.49 0-20.74-9.32-20.74-20.82 0-11.33 9.24-20.66 20.74-20.66 5.39 0 10.21 2.17 13.74 5.71v-5.06h6.91V78.5zm-7.88-20.18c0-6.91-5.63-12.62-12.7-12.62-6.99 0-12.62 5.71-12.62 12.62 0 7.07 5.63 12.7 12.62 12.7 7.08 0 12.7-5.62 12.7-12.7z" style="fill:url(#SVGID_2_)"/>
     <linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="517.805" y1="105.725" x2="517.805" y2="21.688">
       <stop offset="0" style="stop-color:#fff100"/>
-      <stop offset="1" style="stop-color:#f05a28"/>
+      <stop offset="1" style="stop-color:#c1d500"/>
     </linearGradient>
     <path d="M538.5 58.4c0 11.41-9.32 20.74-20.73 20.74-5.39 0-10.37-2.25-13.91-5.71v5.06h-6.75V22.24h7.96v20.25c3.3-2.97 7.8-4.82 12.7-4.82 11.41 0 20.73 9.24 20.73 20.73zm-8.2 0c0-6.99-5.71-12.62-12.62-12.62s-12.62 5.63-12.62 12.62c0 6.91 5.71 12.54 12.62 12.54s12.62-5.62 12.62-12.54z" style="fill:url(#SVGID_3_)"/>
     <linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="554.375" y1="105.725" x2="554.375" y2="21.688">
       <stop offset="0" style="stop-color:#fff100"/>
-      <stop offset="1" style="stop-color:#f05a28"/>
+      <stop offset="1" style="stop-color:#c1d500"/>
     </linearGradient>
     <path d="m565.99 41.2-3.54 5.87c-1.69-1.04-4.58-2.65-7.8-2.65-3.05 0-5.79 1.53-5.79 4.02 0 2.73 3.13 3.78 7.07 5.22 6.43 2.25 12.06 6.59 12.06 13.18 0 6.67-5.71 12.3-13.9 12.3-4.98 0-9.97-2.01-13.34-4.1l3.14-6.67c2.33 1.37 6.67 3.05 9.97 3.05 4.02 0 5.79-2.41 5.79-4.74 0-2.73-2.49-4.26-8.04-6.43-4.02-1.61-10.53-4.26-10.53-11.41 0-6.67 5.71-11.17 13.34-11.17 4.5 0 8.19 1.52 11.57 3.53z" style="fill:url(#SVGID_4_)"/>
   </g>
   <linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="42.775" y1="113.822" x2="42.775" y2="28.926">
     <stop offset="0" style="stop-color:#fff100"/>
-    <stop offset="1" style="stop-color:#f05a28"/>
+    <stop offset="1" style="stop-color:#c1d500"/>
   </linearGradient>
   <path d="M85.43 41a32.59 32.59 0 0 0-.93-5.35c-.52-1.98-1.29-4.15-2.4-6.41a35.402 35.402 0 0 0-6.93-9.46c1.31-5.2-1.59-9.7-1.59-9.7-5-.31-8.18 1.55-9.36 2.41-.2-.08-.39-.17-.59-.25-.85-.35-1.73-.67-2.63-.95-.9-.28-1.82-.54-2.76-.77-.94-.22-1.9-.41-2.87-.56-.17-.03-.34-.05-.51-.07C52.68 2.91 46.41 0 46.41 0c-6.98 4.43-8.31 10.63-8.31 10.63s-.03.14-.07.37c-.39.11-.77.22-1.16.34-.54.16-1.06.36-1.6.55-.53.21-1.06.41-1.59.64-1.05.45-2.1.96-3.12 1.53-.99.56-1.96 1.17-2.91 1.83-.14-.06-.24-.11-.24-.11-9.67-3.69-18.26.75-18.26.75-.78 10.29 3.86 16.77 4.78 17.94-.23.64-.44 1.28-.64 1.93a43.921 43.921 0 0 0-1.71 8.27C2.65 49.08 0 58.13 0 58.13c7.46 8.58 16.15 9.11 16.15 9.11.01-.01.02-.01.02-.02 1.11 1.97 2.39 3.85 3.82 5.6.6.73 1.24 1.44 1.89 2.12-2.72 7.77.38 14.25.38 14.25 8.3.31 13.76-3.63 14.9-4.54.83.28 1.66.53 2.51.75 2.55.66 5.16 1.04 7.77 1.16.65.03 1.3.04 1.96.04h.32l.21-.01.41-.01.41-.02.01.01c3.91 5.58 10.79 6.37 10.79 6.37 4.89-5.16 5.17-10.27 5.17-11.38v-.23c0-.08-.01-.15-.01-.24 1.03-.72 2.01-1.49 2.93-2.32 1.96-1.77 3.67-3.79 5.09-5.96.13-.2.26-.41.39-.62 5.54.32 9.44-3.43 9.44-3.43-.92-5.77-4.21-8.58-4.89-9.12 0 0-.03-.02-.07-.05a.612.612 0 0 1-.06-.05c-.04-.02-.08-.05-.12-.08.03-.35.06-.69.08-1.04.04-.62.06-1.24.06-1.86V55.59l-.02-.39-.03-.52a7.25 7.25 0 0 0-.04-.5c-.01-.16-.03-.32-.05-.48l-.06-.48-.07-.48a24.091 24.091 0 0 0-3.19-8.86c-1.28-2.12-2.88-4-4.67-5.58-1.8-1.59-3.81-2.86-5.92-3.81-2.11-.95-4.33-1.56-6.54-1.84-1.1-.14-2.21-.2-3.3-.19l-.41.01H55.02l-.17.01-.4.03c-.15.01-.31.02-.45.04-.56.05-1.12.13-1.66.24-2.19.41-4.26 1.2-6.09 2.29a18.628 18.628 0 0 0-4.7 4 18.247 18.247 0 0 0-2.98 5.03 17.884 17.884 0 0 0-1.21 6.7c0 .11 0 .22.01.33l.01.36c.02.21.03.43.05.64.09.9.25 1.76.49 2.6a13.92 13.92 0 0 0 5.51 7.62c1.21.83 2.5 1.42 3.78 1.79 1.28.38 2.55.54 3.75.54.15 0 .3 0 .45-.01.08 0 .16-.01.24-.01.08 0 .16-.01.24-.01.13-.01.25-.03.38-.04.03 0 .07-.01.11-.01l.12-.02.23-.03c.16-.02.29-.05.44-.08.14-.03.28-.05.42-.09.28-.06.54-.14.8-.23.52-.17 1.01-.38 1.47-.61.46-.24.88-.5 1.27-.77.11-.08.22-.16.33-.25.42-.33.49-.94.15-1.35a.954.954 0 0 0-1.2-.23c-.1.05-.2.11-.3.16-.35.17-.71.32-1.1.45-.39.12-.79.22-1.21.3-.21.03-.42.06-.64.08-.11.01-.22.02-.32.02-.11 0-.22.01-.32.01s-.21 0-.31-.01c-.13-.01-.26-.01-.39-.02h-.05l-.09-.01c-.06-.01-.12-.01-.17-.02-.12-.01-.23-.03-.35-.04-.94-.13-1.89-.4-2.8-.82a9.99 9.99 0 0 1-2.59-1.7 9.886 9.886 0 0 1-2.02-2.54c-.54-.97-.92-2.04-1.1-3.17-.09-.56-.13-1.15-.11-1.72.01-.16.01-.31.02-.47v-.09l.01-.12c.01-.08.01-.15.02-.23.03-.31.08-.62.13-.93a12.2 12.2 0 0 1 3.57-6.68 12.365 12.365 0 0 1 3.27-2.24c.61-.28 1.24-.51 1.89-.68.65-.17 1.32-.29 1.99-.35.34-.03.68-.04 1.02-.04h.23l.28.01.17.01h.1l.28.02c.73.06 1.46.16 2.18.33 1.44.32 2.84.85 4.15 1.57 2.61 1.45 4.84 3.71 6.2 6.44.69 1.36 1.17 2.82 1.41 4.33.06.38.1.76.13 1.14l.02.29.01.29c.01.1.01.19.01.29 0 .1.01.2 0 .27v.25l-.01.28c-.01.19-.02.49-.03.68-.03.42-.07.83-.12 1.25-.05.41-.12.82-.19 1.23-.08.41-.17.81-.27 1.21-.2.8-.46 1.6-.77 2.37-.61 1.55-1.43 3.02-2.41 4.38a19.79 19.79 0 0 1-7.72 6.32c-1.53.69-3.15 1.2-4.8 1.47-.83.14-1.67.22-2.51.25l-.16.01h-1.11c-.45-.01-.9-.03-1.35-.07-1.8-.13-3.57-.45-5.29-.95-1.72-.5-3.39-1.17-4.97-2.01-3.16-1.69-5.98-4-8.19-6.79a26.224 26.224 0 0 1-2.88-4.45c-.8-1.57-1.43-3.22-1.9-4.9-.46-1.69-.75-3.41-.86-5.15l-.02-.33-.01-.08V49.84l-.01-.29v-.37l-.01-.4v-.27c0-.21.01-.42.01-.64.03-.86.1-1.74.22-2.62A34.845 34.845 0 0 1 25.35 40c.49-1.71 1.1-3.37 1.83-4.94 1.45-3.14 3.35-5.91 5.64-8.13a23.769 23.769 0 0 1 3.69-2.96c.65-.43 1.33-.83 2.03-1.19.34-.19.7-.35 1.05-.52l.54-.24c.18-.08.36-.16.54-.23.72-.31 1.47-.56 2.22-.8.19-.06.38-.11.57-.17.19-.06.38-.1.57-.16.38-.11.77-.2 1.15-.29.19-.05.39-.09.58-.13l.58-.12c.2-.04.39-.07.59-.11l.29-.05.29-.04.59-.09c.22-.04.44-.05.66-.09.18-.02.48-.06.66-.08.14-.01.28-.03.42-.04l.28-.03.14-.01.16-.01c.22-.01.44-.03.67-.04l.33-.02H51.51l.14-.01.57-.03c.75-.02 1.5-.02 2.25 0 1.49.06 2.95.22 4.37.49 2.84.53 5.51 1.44 7.93 2.64 2.42 1.18 4.59 2.64 6.47 4.22.12.1.23.2.35.3.11.1.23.2.34.3.23.2.45.41.67.61.22.2.43.41.64.62.21.21.42.42.61.63.8.85 1.54 1.7 2.2 2.56 1.34 1.72 2.41 3.46 3.26 5.1.05.1.11.2.16.31.05.1.1.2.15.31.1.2.2.4.29.6.09.2.19.4.27.59.09.2.17.39.25.58.32.77.61 1.5.84 2.19.39 1.11.68 2.12.9 3 .09.35.42.58.78.55.37-.03.66-.34.67-.71-.06-1-.08-2.1-.19-3.36z" style="fill:url(#SVGID_5_)"/>
 </svg>
\ No newline at end of file
diff --git a/public/img/icn-row.svg b/public/img/icn-row.svg
index 5218991033bbe..fa8923378a7ed 100644
--- a/public/img/icn-row.svg
+++ b/public/img/icn-row.svg
@@ -15,9 +15,9 @@
 		<stop  offset="4.010540e-02" style="stop-color:#FEE62D"/>
 		<stop  offset="0.1171" style="stop-color:#FED41A"/>
 		<stop  offset="0.1964" style="stop-color:#FDC90F"/>
-		<stop  offset="0.2809" style="stop-color:#FDC60B"/>
-		<stop  offset="0.6685" style="stop-color:#F28F3F"/>
-		<stop  offset="0.8876" style="stop-color:#ED693C"/>
+		<stop  offset="0.2809" style="stop-color:#F2FF80"/>
+		<stop  offset="0.6685" style="stop-color:#C1D500"/>
+		<stop  offset="0.8876" style="stop-color:#A1B300"/>
 		<stop  offset="1" style="stop-color:#E83E39"/>
 	</linearGradient>
 	<path class="st1" d="M0,61.8V38.2c0-1.1,0.9-2,2-2H98c1.1,0,2,0.9,2,2v23.6c0,1.1-0.9,2-2,2H2C0.9,63.8,0,62.9,0,61.8z"/>
diff --git a/public/img/icons/mono/panel-add.svg b/public/img/icons/mono/panel-add.svg
index fc441aa920110..df16f5af31572 100644
--- a/public/img/icons/mono/panel-add.svg
+++ b/public/img/icons/mono/panel-add.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 117.8 64"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="96.44" y1="83.7" x2="96.44" y2="-9.48"><stop offset="0" stop-color="#FFF23A"/><stop offset=".04" stop-color="#FEE62D"/><stop offset=".12" stop-color="#FED41A"/><stop offset=".2" stop-color="#FDC90F"/><stop offset=".28" stop-color="#FDC60B"/><stop offset=".67" stop-color="#F28F3F"/><stop offset=".89" stop-color="#ED693C"/><stop offset="1" stop-color="#E83E39"/></linearGradient><path d="M15.2 22.7H1.9c-1.1 0-1.9.9-1.9 1.9v37.5C0 63.2.9 64 1.9 64h13.3c1.1 0 1.9-.9 1.9-1.9V24.6c0-1.1-.8-1.9-1.9-1.9zM36.3 10.2H23c-1.1 0-1.9.9-1.9 1.9v50c0 1.1.9 1.9 1.9 1.9h13.3c1.1 0 1.9-.9 1.9-1.9v-50c0-1-.9-1.9-1.9-1.9zM57.3 32H44c-1.1 0-1.9.9-1.9 1.9V62c0 1.1.9 1.9 1.9 1.9h13.3c1.1 0 1.9-.9 1.9-1.9V34c0-1.1-.8-2-1.9-2zM70.1 38V26.1c0-3.4 2.7-6.1 6.1-6.1h4.1V2c0-1.1-.9-1.9-1.9-1.9H65.1c-1.1-.1-2 .8-2 1.9v60.1c0 1.1.9 1.9 1.9 1.9h13.3c1.1 0 1.9-.9 1.9-1.9v-18h-4.1c-3.2 0-6-2.8-6-6.1z"/><path fill="url(#a)" d="M116.7 24.9H103.6V11.8c0-.6-.5-1.1-1.1-1.1h-12c-.6 0-1.1.5-1.1 1.1v13.1H76.2c-.6 0-1.1.5-1.1 1.1v12c0 .6.5 1.1 1.1 1.1h13.2v13.2c0 .6.5 1.1 1.1 1.1h11.9c.6 0 1.1-.5 1.1-1.1V39.1h13.1c.6 0 1.1-.5 1.1-1.1V26.1c.1-.6-.4-1.2-1-1.2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 117.8 64"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="96.44" y1="83.7" x2="96.44" y2="-9.48"><stop offset="0" stop-color="#FFF23A"/><stop offset=".04" stop-color="#FEE62D"/><stop offset=".12" stop-color="#FED41A"/><stop offset=".2" stop-color="#FDC90F"/><stop offset=".28" stop-color="#F2FF80"/><stop offset=".67" stop-color="#C1D500"/><stop offset=".89" stop-color="#A1B300"/><stop offset="1" stop-color="#E83E39"/></linearGradient><path d="M15.2 22.7H1.9c-1.1 0-1.9.9-1.9 1.9v37.5C0 63.2.9 64 1.9 64h13.3c1.1 0 1.9-.9 1.9-1.9V24.6c0-1.1-.8-1.9-1.9-1.9zM36.3 10.2H23c-1.1 0-1.9.9-1.9 1.9v50c0 1.1.9 1.9 1.9 1.9h13.3c1.1 0 1.9-.9 1.9-1.9v-50c0-1-.9-1.9-1.9-1.9zM57.3 32H44c-1.1 0-1.9.9-1.9 1.9V62c0 1.1.9 1.9 1.9 1.9h13.3c1.1 0 1.9-.9 1.9-1.9V34c0-1.1-.8-2-1.9-2zM70.1 38V26.1c0-3.4 2.7-6.1 6.1-6.1h4.1V2c0-1.1-.9-1.9-1.9-1.9H65.1c-1.1-.1-2 .8-2 1.9v60.1c0 1.1.9 1.9 1.9 1.9h13.3c1.1 0 1.9-.9 1.9-1.9v-18h-4.1c-3.2 0-6-2.8-6-6.1z"/><path fill="url(#a)" d="M116.7 24.9H103.6V11.8c0-.6-.5-1.1-1.1-1.1h-12c-.6 0-1.1.5-1.1 1.1v13.1H76.2c-.6 0-1.1.5-1.1 1.1v12c0 .6.5 1.1 1.1 1.1h13.2v13.2c0 .6.5 1.1 1.1 1.1h11.9c.6 0 1.1-.5 1.1-1.1V39.1h13.1c.6 0 1.1-.5 1.1-1.1V26.1c.1-.6-.4-1.2-1-1.2z"/></svg>
\ No newline at end of file
diff --git a/public/img/icons_dark_theme/icon_add_annotation.svg b/public/img/icons_dark_theme/icon_add_annotation.svg
index 330dfad85addb..7469ea4f18364 100644
--- a/public/img/icons_dark_theme/icon_add_annotation.svg
+++ b/public/img/icons_dark_theme/icon_add_annotation.svg
@@ -19,9 +19,9 @@
 		<stop  offset="4.010540e-02" style="stop-color:#FEE62D"/>
 		<stop  offset="0.1171" style="stop-color:#FED41A"/>
 		<stop  offset="0.1964" style="stop-color:#FDC90F"/>
-		<stop  offset="0.2809" style="stop-color:#FDC60B"/>
-		<stop  offset="0.6685" style="stop-color:#F28F3F"/>
-		<stop  offset="0.8876" style="stop-color:#ED693C"/>
+		<stop  offset="0.2809" style="stop-color:#F2FF80"/>
+		<stop  offset="0.6685" style="stop-color:#C1D500"/>
+		<stop  offset="0.8876" style="stop-color:#A1B300"/>
 		<stop  offset="1" style="stop-color:#E83E39"/>
 	</linearGradient>
 	<path class="st2" d="M63.2,41.1h-4.8h-0.4h-3.6v-8.7c0-0.4-0.3-0.8-0.8-0.8h-7.9c-0.4,0-0.8,0.3-0.8,0.8v8.7h-8.7
diff --git a/public/img/icons_dark_theme/icon_add_annotation_alt.svg b/public/img/icons_dark_theme/icon_add_annotation_alt.svg
index f24a46ee75c1f..3630d2a313478 100644
--- a/public/img/icons_dark_theme/icon_add_annotation_alt.svg
+++ b/public/img/icons_dark_theme/icon_add_annotation_alt.svg
@@ -19,9 +19,9 @@
 		<stop  offset="4.010540e-02" style="stop-color:#FEE62D"/>
 		<stop  offset="0.1171" style="stop-color:#FED41A"/>
 		<stop  offset="0.1964" style="stop-color:#FDC90F"/>
-		<stop  offset="0.2809" style="stop-color:#FDC60B"/>
-		<stop  offset="0.6685" style="stop-color:#F28F3F"/>
-		<stop  offset="0.8876" style="stop-color:#ED693C"/>
+		<stop  offset="0.2809" style="stop-color:#F2FF80"/>
+		<stop  offset="0.6685" style="stop-color:#C1D500"/>
+		<stop  offset="0.8876" style="stop-color:#A1B300"/>
 		<stop  offset="1" style="stop-color:#E83E39"/>
 	</linearGradient>
 	<path class="st1" d="M63.2,43.1h-4.8h-0.4h-3.6v-8.7c0-0.4-0.3-0.8-0.8-0.8h-7.9c-0.4,0-0.8,0.3-0.8,0.8v8.7h-8.7
diff --git a/public/img/icons_dark_theme/icon_add_data_sources.svg b/public/img/icons_dark_theme/icon_add_data_sources.svg
index 6ea76c00735e0..d1747822b07d4 100644
--- a/public/img/icons_dark_theme/icon_add_data_sources.svg
+++ b/public/img/icons_dark_theme/icon_add_data_sources.svg
@@ -19,9 +19,9 @@
 		<stop  offset="4.010540e-02" style="stop-color:#FEE62D"/>
 		<stop  offset="0.1171" style="stop-color:#FED41A"/>
 		<stop  offset="0.1964" style="stop-color:#FDC90F"/>
-		<stop  offset="0.2809" style="stop-color:#FDC60B"/>
-		<stop  offset="0.6685" style="stop-color:#F28F3F"/>
-		<stop  offset="0.8876" style="stop-color:#ED693C"/>
+		<stop  offset="0.2809" style="stop-color:#F2FF80"/>
+		<stop  offset="0.6685" style="stop-color:#C1D500"/>
+		<stop  offset="0.8876" style="stop-color:#A1B300"/>
 		<stop  offset="1" style="stop-color:#E83E39"/>
 	</linearGradient>
 	<path class="st1" d="M63.2,43.2h-5.1h-0.4h-1.8h-2v-3.6v-5.7c0-0.2-0.1-0.5-0.3-0.6c-0.1-0.1-0.3-0.2-0.5-0.2h-8.4
diff --git a/public/img/icons_dark_theme/icon_add_folder.svg b/public/img/icons_dark_theme/icon_add_folder.svg
index 0e3357d1086ab..23fc6b307010a 100644
--- a/public/img/icons_dark_theme/icon_add_folder.svg
+++ b/public/img/icons_dark_theme/icon_add_folder.svg
@@ -17,9 +17,9 @@
 		<stop  offset="4.010540e-02" style="stop-color:#FEE62D"/>
 		<stop  offset="0.1171" style="stop-color:#FED41A"/>
 		<stop  offset="0.1964" style="stop-color:#FDC90F"/>
-		<stop  offset="0.2809" style="stop-color:#FDC60B"/>
-		<stop  offset="0.6685" style="stop-color:#F28F3F"/>
-		<stop  offset="0.8876" style="stop-color:#ED693C"/>
+		<stop  offset="0.2809" style="stop-color:#F2FF80"/>
+		<stop  offset="0.6685" style="stop-color:#C1D500"/>
+		<stop  offset="0.8876" style="stop-color:#A1B300"/>
 		<stop  offset="1" style="stop-color:#E83E39"/>
 	</linearGradient>
 	<path class="st1" d="M63.2,38.8h-5h-0.4h-3.7v-0.7v-8.4c0-0.4-0.4-0.8-0.8-0.8H45c-0.4,0-0.8,0.4-0.8,0.8v9.1h-9.1
diff --git a/public/img/icons_dark_theme/icon_add_link.svg b/public/img/icons_dark_theme/icon_add_link.svg
index fe8e95f1eda69..baa1b9eec7c78 100644
--- a/public/img/icons_dark_theme/icon_add_link.svg
+++ b/public/img/icons_dark_theme/icon_add_link.svg
@@ -24,9 +24,9 @@
 		<stop  offset="4.010540e-02" style="stop-color:#FEE62D"/>
 		<stop  offset="0.1171" style="stop-color:#FED41A"/>
 		<stop  offset="0.1964" style="stop-color:#FDC90F"/>
-		<stop  offset="0.2809" style="stop-color:#FDC60B"/>
-		<stop  offset="0.6685" style="stop-color:#F28F3F"/>
-		<stop  offset="0.8876" style="stop-color:#ED693C"/>
+		<stop  offset="0.2809" style="stop-color:#F2FF80"/>
+		<stop  offset="0.6685" style="stop-color:#C1D500"/>
+		<stop  offset="0.8876" style="stop-color:#A1B300"/>
 		<stop  offset="1" style="stop-color:#E83E39"/>
 	</linearGradient>
 	<path class="st3" d="M59.4,44.5h-5H54h-3.7v-9c0-0.4-0.4-0.8-0.8-0.8h-8.2c-0.4,0-0.8,0.4-0.8,0.8v9h-9c-0.4,0-0.8,0.4-0.8,0.8v8.2
diff --git a/public/img/icons_dark_theme/icon_add_panel.svg b/public/img/icons_dark_theme/icon_add_panel.svg
index a3005b3ee1cd3..3cd2f3794c61c 100644
--- a/public/img/icons_dark_theme/icon_add_panel.svg
+++ b/public/img/icons_dark_theme/icon_add_panel.svg
@@ -20,9 +20,9 @@
 		<stop  offset="4.010540e-02" style="stop-color:#FEE62D"/>
 		<stop  offset="0.1171" style="stop-color:#FED41A"/>
 		<stop  offset="0.1964" style="stop-color:#FDC90F"/>
-		<stop  offset="0.2809" style="stop-color:#FDC60B"/>
-		<stop  offset="0.6685" style="stop-color:#F28F3F"/>
-		<stop  offset="0.8876" style="stop-color:#ED693C"/>
+		<stop  offset="0.2809" style="stop-color:#F2FF80"/>
+		<stop  offset="0.6685" style="stop-color:#C1D500"/>
+		<stop  offset="0.8876" style="stop-color:#A1B300"/>
 		<stop  offset="1" style="stop-color:#E83E39"/>
 	</linearGradient>
 	<path class="st1" d="M116.7,24.9h-7.2h-0.5h-5.4V11.8c0-0.6-0.5-1.1-1.1-1.1H90.5c-0.6,0-1.1,0.5-1.1,1.1v13.1h-9.1h-4.1
diff --git a/public/img/icons_dark_theme/icon_add_team.svg b/public/img/icons_dark_theme/icon_add_team.svg
index 35fd526e053de..7eed7f5bf9cb9 100644
--- a/public/img/icons_dark_theme/icon_add_team.svg
+++ b/public/img/icons_dark_theme/icon_add_team.svg
@@ -23,9 +23,9 @@
 		<stop  offset="4.010540e-02" style="stop-color:#FEE62D"/>
 		<stop  offset="0.1171" style="stop-color:#FED41A"/>
 		<stop  offset="0.1964" style="stop-color:#FDC90F"/>
-		<stop  offset="0.2809" style="stop-color:#FDC60B"/>
-		<stop  offset="0.6685" style="stop-color:#F28F3F"/>
-		<stop  offset="0.8876" style="stop-color:#ED693C"/>
+		<stop  offset="0.2809" style="stop-color:#F2FF80"/>
+		<stop  offset="0.6685" style="stop-color:#C1D500"/>
+		<stop  offset="0.8876" style="stop-color:#A1B300"/>
 		<stop  offset="1" style="stop-color:#E83E39"/>
 	</linearGradient>
 	<path class="st1" d="M55.5,46.9h-4.3h-0.3h-3.2v-7.9c0-0.4-0.3-0.7-0.7-0.7h-2.3h-1.9h-2.9c-0.4,0-0.7,0.3-0.7,0.7v7.9H39h-7.7
diff --git a/public/img/icons_dark_theme/icon_add_user.svg b/public/img/icons_dark_theme/icon_add_user.svg
index 6a09f96ef1e31..ef599b0111003 100644
--- a/public/img/icons_dark_theme/icon_add_user.svg
+++ b/public/img/icons_dark_theme/icon_add_user.svg
@@ -18,9 +18,9 @@
 		<stop  offset="4.010540e-02" style="stop-color:#FEE62D"/>
 		<stop  offset="0.1171" style="stop-color:#FED41A"/>
 		<stop  offset="0.1964" style="stop-color:#FDC90F"/>
-		<stop  offset="0.2809" style="stop-color:#FDC60B"/>
-		<stop  offset="0.6685" style="stop-color:#F28F3F"/>
-		<stop  offset="0.8876" style="stop-color:#ED693C"/>
+		<stop  offset="0.2809" style="stop-color:#F2FF80"/>
+		<stop  offset="0.6685" style="stop-color:#C1D500"/>
+		<stop  offset="0.8876" style="stop-color:#A1B300"/>
 		<stop  offset="1" style="stop-color:#E83E39"/>
 	</linearGradient>
 	<path class="st1" d="M63.2,43.1h-5.1h-0.4H54v-9.2c0-0.4-0.4-0.8-0.8-0.8h-8.3c-0.4,0-0.8,0.4-0.8,0.8v9.2h-0.1h-9.1
diff --git a/public/img/icons_dark_theme/icon_add_variable.svg b/public/img/icons_dark_theme/icon_add_variable.svg
index 9b10092e78f97..ad0e1ea689772 100644
--- a/public/img/icons_dark_theme/icon_add_variable.svg
+++ b/public/img/icons_dark_theme/icon_add_variable.svg
@@ -31,9 +31,9 @@
 		<stop  offset="4.010540e-02" style="stop-color:#FEE62D"/>
 		<stop  offset="0.1171" style="stop-color:#FED41A"/>
 		<stop  offset="0.1964" style="stop-color:#FDC90F"/>
-		<stop  offset="0.2809" style="stop-color:#FDC60B"/>
-		<stop  offset="0.6685" style="stop-color:#F28F3F"/>
-		<stop  offset="0.8876" style="stop-color:#ED693C"/>
+		<stop  offset="0.2809" style="stop-color:#F2FF80"/>
+		<stop  offset="0.6685" style="stop-color:#C1D500"/>
+		<stop  offset="0.8876" style="stop-color:#A1B300"/>
 		<stop  offset="1" style="stop-color:#E83E39"/>
 	</linearGradient>
 	<path class="st1" d="M39.5,42.3c-0.2,0-0.4,0.1-0.5,0.3c0.1-0.1,0.3-0.1,0.4-0.2C39.4,42.4,39.4,42.3,39.5,42.3z"/>
@@ -42,9 +42,9 @@
 		<stop  offset="4.010540e-02" style="stop-color:#FEE62D"/>
 		<stop  offset="0.1171" style="stop-color:#FED41A"/>
 		<stop  offset="0.1964" style="stop-color:#FDC90F"/>
-		<stop  offset="0.2809" style="stop-color:#FDC60B"/>
-		<stop  offset="0.6685" style="stop-color:#F28F3F"/>
-		<stop  offset="0.8876" style="stop-color:#ED693C"/>
+		<stop  offset="0.2809" style="stop-color:#F2FF80"/>
+		<stop  offset="0.6685" style="stop-color:#C1D500"/>
+		<stop  offset="0.8876" style="stop-color:#A1B300"/>
 		<stop  offset="1" style="stop-color:#E83E39"/>
 	</linearGradient>
 	<path class="st2" d="M63.3,42.3h-4.2h-0.3h-3.2v-7.7c0-0.4-0.3-0.7-0.7-0.7h-7c-0.4,0-0.7,0.3-0.7,0.7v7.7h-0.8h-6.9c0,0,0,0-0.1,0
diff --git a/public/img/icons_dark_theme/icon_import_dashboard.svg b/public/img/icons_dark_theme/icon_import_dashboard.svg
index d21511c31c5dd..c340abdc9ae56 100644
--- a/public/img/icons_dark_theme/icon_import_dashboard.svg
+++ b/public/img/icons_dark_theme/icon_import_dashboard.svg
@@ -19,9 +19,9 @@
 	<stop  offset="4.010540e-02" style="stop-color:#FEE62D"/>
 	<stop  offset="0.1171" style="stop-color:#FED41A"/>
 	<stop  offset="0.1964" style="stop-color:#FDC90F"/>
-	<stop  offset="0.2809" style="stop-color:#FDC60B"/>
-	<stop  offset="0.6685" style="stop-color:#F28F3F"/>
-	<stop  offset="0.8876" style="stop-color:#ED693C"/>
+	<stop  offset="0.2809" style="stop-color:#F2FF80"/>
+	<stop  offset="0.6685" style="stop-color:#C1D500"/>
+	<stop  offset="0.8876" style="stop-color:#A1B300"/>
 	<stop  offset="1" style="stop-color:#E83E39"/>
 </linearGradient>
 <path class="st1" d="M45.3,47.3l-6.4-6.4l-2.6-2.6l-3.8-3.8l-1.3-1.3l-0.3-0.3c-0.2-0.2-0.6-0.4-0.9-0.4s-0.7,0.1-0.9,0.4l-0.3,0.3
diff --git a/public/img/icons_dark_theme/icon_new_dashboard.svg b/public/img/icons_dark_theme/icon_new_dashboard.svg
index 33f116dcab14f..1b7a89ff95856 100644
--- a/public/img/icons_dark_theme/icon_new_dashboard.svg
+++ b/public/img/icons_dark_theme/icon_new_dashboard.svg
@@ -20,9 +20,9 @@
 		<stop  offset="4.010540e-02" style="stop-color:#FEE62D"/>
 		<stop  offset="0.1171" style="stop-color:#FED41A"/>
 		<stop  offset="0.1964" style="stop-color:#FDC90F"/>
-		<stop  offset="0.2809" style="stop-color:#FDC60B"/>
-		<stop  offset="0.6685" style="stop-color:#F28F3F"/>
-		<stop  offset="0.8876" style="stop-color:#ED693C"/>
+		<stop  offset="0.2809" style="stop-color:#F2FF80"/>
+		<stop  offset="0.6685" style="stop-color:#C1D500"/>
+		<stop  offset="0.8876" style="stop-color:#A1B300"/>
 		<stop  offset="1" style="stop-color:#E83E39"/>
 	</linearGradient>
 	<path class="st1" d="M63.2,44.2h-5h-0.4h-3.7h0v-0.7v-8.4c0-0.4-0.4-0.8-0.8-0.8H45c-0.4,0-0.8,0.4-0.8,0.8v9.1h-9.1
diff --git a/public/img/icons_light_theme/icon_add_annotation.svg b/public/img/icons_light_theme/icon_add_annotation.svg
index 1cf90df2bcb8a..2a50da8b3c651 100644
--- a/public/img/icons_light_theme/icon_add_annotation.svg
+++ b/public/img/icons_light_theme/icon_add_annotation.svg
@@ -19,9 +19,9 @@
 		<stop  offset="4.010540e-02" style="stop-color:#FEE62D"/>
 		<stop  offset="0.1171" style="stop-color:#FED41A"/>
 		<stop  offset="0.1964" style="stop-color:#FDC90F"/>
-		<stop  offset="0.2809" style="stop-color:#FDC60B"/>
-		<stop  offset="0.6685" style="stop-color:#F28F3F"/>
-		<stop  offset="0.8876" style="stop-color:#ED693C"/>
+		<stop  offset="0.2809" style="stop-color:#F2FF80"/>
+		<stop  offset="0.6685" style="stop-color:#C1D500"/>
+		<stop  offset="0.8876" style="stop-color:#A1B300"/>
 		<stop  offset="1" style="stop-color:#E83E39"/>
 	</linearGradient>
 	<path class="st2" d="M63.2,41.1h-4.8H58h-3.6v-8.7c0-0.4-0.3-0.8-0.8-0.8h-7.9c-0.4,0-0.8,0.3-0.8,0.8v8.7h-8.7
diff --git a/public/img/icons_light_theme/icon_add_annotation_alt.svg b/public/img/icons_light_theme/icon_add_annotation_alt.svg
index 990df3a9d606b..a73214e816bad 100644
--- a/public/img/icons_light_theme/icon_add_annotation_alt.svg
+++ b/public/img/icons_light_theme/icon_add_annotation_alt.svg
@@ -20,9 +20,9 @@
 		<stop  offset="4.010540e-02" style="stop-color:#FEE62D"/>
 		<stop  offset="0.1171" style="stop-color:#FED41A"/>
 		<stop  offset="0.1964" style="stop-color:#FDC90F"/>
-		<stop  offset="0.2809" style="stop-color:#FDC60B"/>
-		<stop  offset="0.6685" style="stop-color:#F28F3F"/>
-		<stop  offset="0.8876" style="stop-color:#ED693C"/>
+		<stop  offset="0.2809" style="stop-color:#F2FF80"/>
+		<stop  offset="0.6685" style="stop-color:#C1D500"/>
+		<stop  offset="0.8876" style="stop-color:#A1B300"/>
 		<stop  offset="1" style="stop-color:#E83E39"/>
 	</linearGradient>
 	<path class="st1" d="M63.2,43.1h-4.8H58h-3.6v-8.7c0-0.4-0.3-0.8-0.8-0.8h-7.9c-0.4,0-0.8,0.3-0.8,0.8v8.7h-8.7
diff --git a/public/img/icons_light_theme/icon_add_data_sources.svg b/public/img/icons_light_theme/icon_add_data_sources.svg
index 554af86bfc8c5..5a56959ccaecd 100644
--- a/public/img/icons_light_theme/icon_add_data_sources.svg
+++ b/public/img/icons_light_theme/icon_add_data_sources.svg
@@ -20,9 +20,9 @@
 		<stop  offset="4.010540e-02" style="stop-color:#FEE62D"/>
 		<stop  offset="0.1171" style="stop-color:#FED41A"/>
 		<stop  offset="0.1964" style="stop-color:#FDC90F"/>
-		<stop  offset="0.2809" style="stop-color:#FDC60B"/>
-		<stop  offset="0.6685" style="stop-color:#F28F3F"/>
-		<stop  offset="0.8876" style="stop-color:#ED693C"/>
+		<stop  offset="0.2809" style="stop-color:#F2FF80"/>
+		<stop  offset="0.6685" style="stop-color:#C1D500"/>
+		<stop  offset="0.8876" style="stop-color:#A1B300"/>
 		<stop  offset="1" style="stop-color:#E83E39"/>
 	</linearGradient>
 	<path class="st1" d="M63.2,43.2h-5.1h-0.4h-1.8h-2v-3.6v-5.7c0-0.2-0.1-0.5-0.3-0.6c-0.1-0.1-0.3-0.2-0.5-0.2h-8.4
diff --git a/public/img/icons_light_theme/icon_add_folder.svg b/public/img/icons_light_theme/icon_add_folder.svg
index a127eeb4deeb9..04affb6559b10 100644
--- a/public/img/icons_light_theme/icon_add_folder.svg
+++ b/public/img/icons_light_theme/icon_add_folder.svg
@@ -16,9 +16,9 @@
 		<stop  offset="4.010540e-02" style="stop-color:#FEE62D"/>
 		<stop  offset="0.1171" style="stop-color:#FED41A"/>
 		<stop  offset="0.1964" style="stop-color:#FDC90F"/>
-		<stop  offset="0.2809" style="stop-color:#FDC60B"/>
-		<stop  offset="0.6685" style="stop-color:#F28F3F"/>
-		<stop  offset="0.8876" style="stop-color:#ED693C"/>
+		<stop  offset="0.2809" style="stop-color:#F2FF80"/>
+		<stop  offset="0.6685" style="stop-color:#C1D500"/>
+		<stop  offset="0.8876" style="stop-color:#A1B300"/>
 		<stop  offset="1" style="stop-color:#E83E39"/>
 	</linearGradient>
 	<path class="st1" d="M62.6,40h-4.4h-0.3h-3.2v-7.9c0-0.4-0.3-0.7-0.7-0.7h-7.2c-0.4,0-0.7,0.3-0.7,0.7V40h-7.9
diff --git a/public/img/icons_light_theme/icon_add_link.svg b/public/img/icons_light_theme/icon_add_link.svg
index cdeb4450bb4ff..4694060e70f84 100644
--- a/public/img/icons_light_theme/icon_add_link.svg
+++ b/public/img/icons_light_theme/icon_add_link.svg
@@ -23,9 +23,9 @@
 	<stop  offset="4.010540e-02" style="stop-color:#FEE62D"/>
 	<stop  offset="0.1171" style="stop-color:#FED41A"/>
 	<stop  offset="0.1964" style="stop-color:#FDC90F"/>
-	<stop  offset="0.2809" style="stop-color:#FDC60B"/>
-	<stop  offset="0.6685" style="stop-color:#F28F3F"/>
-	<stop  offset="0.8876" style="stop-color:#ED693C"/>
+	<stop  offset="0.2809" style="stop-color:#F2FF80"/>
+	<stop  offset="0.6685" style="stop-color:#C1D500"/>
+	<stop  offset="0.8876" style="stop-color:#A1B300"/>
 	<stop  offset="1" style="stop-color:#E83E39"/>
 </linearGradient>
 <path class="st3" d="M59.4,44.5h-5H54h-3.7v-9c0-0.4-0.4-0.8-0.8-0.8h-8.2c-0.4,0-0.8,0.4-0.8,0.8v9h-9c-0.4,0-0.8,0.4-0.8,0.8v8.2
diff --git a/public/img/icons_light_theme/icon_add_panel.svg b/public/img/icons_light_theme/icon_add_panel.svg
index e5630d26bb64f..b33c7f6ae9e2e 100644
--- a/public/img/icons_light_theme/icon_add_panel.svg
+++ b/public/img/icons_light_theme/icon_add_panel.svg
@@ -20,9 +20,9 @@
 		<stop  offset="4.010540e-02" style="stop-color:#FEE62D"/>
 		<stop  offset="0.1171" style="stop-color:#FED41A"/>
 		<stop  offset="0.1964" style="stop-color:#FDC90F"/>
-		<stop  offset="0.2809" style="stop-color:#FDC60B"/>
-		<stop  offset="0.6685" style="stop-color:#F28F3F"/>
-		<stop  offset="0.8876" style="stop-color:#ED693C"/>
+		<stop  offset="0.2809" style="stop-color:#F2FF80"/>
+		<stop  offset="0.6685" style="stop-color:#C1D500"/>
+		<stop  offset="0.8876" style="stop-color:#A1B300"/>
 		<stop  offset="1" style="stop-color:#E83E39"/>
 	</linearGradient>
 	<path class="st1" d="M116.7,24.9h-7.2h-0.5h-5.4V11.8c0-0.6-0.5-1.1-1.1-1.1H90.5c-0.6,0-1.1,0.5-1.1,1.1v13.1h-9.1h-4.1
diff --git a/public/img/icons_light_theme/icon_add_team.svg b/public/img/icons_light_theme/icon_add_team.svg
index dd1580f3a3d2d..02a3087893c22 100644
--- a/public/img/icons_light_theme/icon_add_team.svg
+++ b/public/img/icons_light_theme/icon_add_team.svg
@@ -24,9 +24,9 @@
 		<stop  offset="4.010540e-02" style="stop-color:#FEE62D"/>
 		<stop  offset="0.1171" style="stop-color:#FED41A"/>
 		<stop  offset="0.1964" style="stop-color:#FDC90F"/>
-		<stop  offset="0.2809" style="stop-color:#FDC60B"/>
-		<stop  offset="0.6685" style="stop-color:#F28F3F"/>
-		<stop  offset="0.8876" style="stop-color:#ED693C"/>
+		<stop  offset="0.2809" style="stop-color:#F2FF80"/>
+		<stop  offset="0.6685" style="stop-color:#C1D500"/>
+		<stop  offset="0.8876" style="stop-color:#A1B300"/>
 		<stop  offset="1" style="stop-color:#E83E39"/>
 	</linearGradient>
 	<path class="st1" d="M55.5,46.9h-4.3h-0.3h-3.2V39c0-0.4-0.3-0.7-0.7-0.7h-2.3h-1.9h-2.9c-0.4,0-0.7,0.3-0.7,0.7v7.9H39h-7.7
diff --git a/public/img/icons_light_theme/icon_add_user.svg b/public/img/icons_light_theme/icon_add_user.svg
index ef0d1d785f0b6..65f823af5ee95 100644
--- a/public/img/icons_light_theme/icon_add_user.svg
+++ b/public/img/icons_light_theme/icon_add_user.svg
@@ -17,9 +17,9 @@
 	<stop  offset="4.010540e-02" style="stop-color:#FEE62D"/>
 	<stop  offset="0.1171" style="stop-color:#FED41A"/>
 	<stop  offset="0.1964" style="stop-color:#FDC90F"/>
-	<stop  offset="0.2809" style="stop-color:#FDC60B"/>
-	<stop  offset="0.6685" style="stop-color:#F28F3F"/>
-	<stop  offset="0.8876" style="stop-color:#ED693C"/>
+	<stop  offset="0.2809" style="stop-color:#F2FF80"/>
+	<stop  offset="0.6685" style="stop-color:#C1D500"/>
+	<stop  offset="0.8876" style="stop-color:#A1B300"/>
 	<stop  offset="1" style="stop-color:#E83E39"/>
 </linearGradient>
 <path class="st1" d="M63.2,43.1h-5.1h-0.4H54v-9.2c0-0.4-0.4-0.8-0.8-0.8h-8.3c-0.4,0-0.8,0.4-0.8,0.8v9.2H44h-9.1
diff --git a/public/img/icons_light_theme/icon_add_variable.svg b/public/img/icons_light_theme/icon_add_variable.svg
index 3ae26bf4d9f00..0fe953c39c062 100644
--- a/public/img/icons_light_theme/icon_add_variable.svg
+++ b/public/img/icons_light_theme/icon_add_variable.svg
@@ -30,9 +30,9 @@
 	<stop  offset="4.010540e-02" style="stop-color:#FEE62D"/>
 	<stop  offset="0.1171" style="stop-color:#FED41A"/>
 	<stop  offset="0.1964" style="stop-color:#FDC90F"/>
-	<stop  offset="0.2809" style="stop-color:#FDC60B"/>
-	<stop  offset="0.6685" style="stop-color:#F28F3F"/>
-	<stop  offset="0.8876" style="stop-color:#ED693C"/>
+	<stop  offset="0.2809" style="stop-color:#F2FF80"/>
+	<stop  offset="0.6685" style="stop-color:#C1D500"/>
+	<stop  offset="0.8876" style="stop-color:#A1B300"/>
 	<stop  offset="1" style="stop-color:#E83E39"/>
 </linearGradient>
 <path class="st1" d="M39.5,42.3c-0.2,0-0.4,0.1-0.5,0.3C39.1,42.5,39.3,42.5,39.5,42.3C39.4,42.4,39.4,42.3,39.5,42.3z"/>
@@ -41,9 +41,9 @@
 	<stop  offset="4.010540e-02" style="stop-color:#FEE62D"/>
 	<stop  offset="0.1171" style="stop-color:#FED41A"/>
 	<stop  offset="0.1964" style="stop-color:#FDC90F"/>
-	<stop  offset="0.2809" style="stop-color:#FDC60B"/>
-	<stop  offset="0.6685" style="stop-color:#F28F3F"/>
-	<stop  offset="0.8876" style="stop-color:#ED693C"/>
+	<stop  offset="0.2809" style="stop-color:#F2FF80"/>
+	<stop  offset="0.6685" style="stop-color:#C1D500"/>
+	<stop  offset="0.8876" style="stop-color:#A1B300"/>
 	<stop  offset="1" style="stop-color:#E83E39"/>
 </linearGradient>
 <path class="st2" d="M63.3,42.3h-4.2h-0.3h-3.2v-7.7c0-0.4-0.3-0.7-0.7-0.7h-7c-0.4,0-0.7,0.3-0.7,0.7v7.7h-0.8h-6.9c0,0,0,0-0.1,0
diff --git a/public/img/icons_light_theme/icon_import_dashboard.svg b/public/img/icons_light_theme/icon_import_dashboard.svg
index f2015379be31f..aa14cb4211f75 100644
--- a/public/img/icons_light_theme/icon_import_dashboard.svg
+++ b/public/img/icons_light_theme/icon_import_dashboard.svg
@@ -19,9 +19,9 @@
 	<stop  offset="4.010540e-02" style="stop-color:#FEE62D"/>
 	<stop  offset="0.1171" style="stop-color:#FED41A"/>
 	<stop  offset="0.1964" style="stop-color:#FDC90F"/>
-	<stop  offset="0.2809" style="stop-color:#FDC60B"/>
-	<stop  offset="0.6685" style="stop-color:#F28F3F"/>
-	<stop  offset="0.8876" style="stop-color:#ED693C"/>
+	<stop  offset="0.2809" style="stop-color:#F2FF80"/>
+	<stop  offset="0.6685" style="stop-color:#C1D500"/>
+	<stop  offset="0.8876" style="stop-color:#A1B300"/>
 	<stop  offset="1" style="stop-color:#E83E39"/>
 </linearGradient>
 <path class="st1" d="M45.3,47.3l-6.4-6.4l-2.6-2.6l-3.8-3.8l-1.3-1.3l-0.3-0.3c-0.2-0.2-0.6-0.4-0.9-0.4s-0.7,0.1-0.9,0.4l-0.3,0.3
diff --git a/public/img/icons_light_theme/icon_new_dashboard.svg b/public/img/icons_light_theme/icon_new_dashboard.svg
index 83e04863aa4fe..09b564307fef7 100644
--- a/public/img/icons_light_theme/icon_new_dashboard.svg
+++ b/public/img/icons_light_theme/icon_new_dashboard.svg
@@ -20,9 +20,9 @@
 		<stop  offset="4.010540e-02" style="stop-color:#FEE62D"/>
 		<stop  offset="0.1171" style="stop-color:#FED41A"/>
 		<stop  offset="0.1964" style="stop-color:#FDC90F"/>
-		<stop  offset="0.2809" style="stop-color:#FDC60B"/>
-		<stop  offset="0.6685" style="stop-color:#F28F3F"/>
-		<stop  offset="0.8876" style="stop-color:#ED693C"/>
+		<stop  offset="0.2809" style="stop-color:#F2FF80"/>
+		<stop  offset="0.6685" style="stop-color:#C1D500"/>
+		<stop  offset="0.8876" style="stop-color:#A1B300"/>
 		<stop  offset="1" style="stop-color:#E83E39"/>
 	</linearGradient>
 	<path class="st1" d="M63.2,44.2h-5h-0.4h-3.7h0v-0.7v-8.4c0-0.4-0.4-0.8-0.8-0.8H45c-0.4,0-0.8,0.4-0.8,0.8v9.1h-9.1
diff --git a/public/img/login_bg.jpg b/public/img/login_bg.jpg
new file mode 100644
index 0000000000000..f143d6fced3a4
Binary files /dev/null and b/public/img/login_bg.jpg differ
diff --git a/public/locales/de-DE/grafana.json b/public/locales/de-DE/grafana.json
index a42b6ef2842c6..2f4a661f6b02a 100644
--- a/public/locales/de-DE/grafana.json
+++ b/public/locales/de-DE/grafana.json
@@ -238,10 +238,6 @@
     "explore": {
       "title": "Entdecken"
     },
-    "global-orgs": {
-      "subtitle": "Isolierte Instanzen von Grafana auf dem gleichen Server",
-      "title": "Organisationen"
-    },
     "global-users": {
       "subtitle": "Benutzer in Grafana verwalten",
       "title": "Benutzer"
diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json
index bd6610270a14c..1aac765bf2751 100644
--- a/public/locales/en-US/grafana.json
+++ b/public/locales/en-US/grafana.json
@@ -238,10 +238,6 @@
     "explore": {
       "title": "Explore"
     },
-    "global-orgs": {
-      "subtitle": "Isolated instances of Grafana running on the same server",
-      "title": "Organizations"
-    },
     "global-users": {
       "subtitle": "Manage users in Grafana",
       "title": "Users"
@@ -284,10 +280,6 @@
       "subtitle": "Groups of dashboards that are displayed in a sequence",
       "title": "Playlists"
     },
-    "plugins": {
-      "subtitle": "Extend the Grafana experience with plugins",
-      "title": "Plugins"
-    },
     "profile/notifications": {
       "title": "Notification history"
     },
@@ -471,7 +463,7 @@
       "info-text": "Create a direct link to this dashboard or panel, customized with the options below.",
       "link-url": "Link URL",
       "render-alert": "Image renderer plugin not installed",
-      "render-instructions": "To render a panel image, you must install the&nbsp;<1>Grafana image renderer plugin</1>. Please contact your Grafana administrator to install the plugin.",
+      "render-instructions": "To render a panel image, you must install the&nbsp;<1>Grafana image renderer plugin</1>. Please contact your HyperIQ administrator to install the plugin.",
       "rendered-image": "Direct link rendered image",
       "save-alert": "Dashboard is not saved",
       "save-dashboard": "To render a panel image, you must save the dashboard first.",
diff --git a/public/locales/es-ES/grafana.json b/public/locales/es-ES/grafana.json
index 6f68b2c91636f..528f490dfaf7f 100644
--- a/public/locales/es-ES/grafana.json
+++ b/public/locales/es-ES/grafana.json
@@ -238,10 +238,6 @@
     "explore": {
       "title": "Explorar"
     },
-    "global-orgs": {
-      "subtitle": "Instancias aisladas de Grafana ejecutándose en el mismo servidor",
-      "title": "Organizaciones"
-    },
     "global-users": {
       "subtitle": "Gestionar usuarios de Grafana",
       "title": "Usuarios"
diff --git a/public/locales/fr-FR/grafana.json b/public/locales/fr-FR/grafana.json
index a25d4e8a0f811..f42b58bceddbe 100644
--- a/public/locales/fr-FR/grafana.json
+++ b/public/locales/fr-FR/grafana.json
@@ -238,10 +238,6 @@
     "explore": {
       "title": "Explorer"
     },
-    "global-orgs": {
-      "subtitle": "Instances isolées de Grafana exécutées sur le même serveur",
-      "title": "Organisations"
-    },
     "global-users": {
       "subtitle": "Gérer les utilisateurs dans Grafana",
       "title": "Utilisateurs"
diff --git a/public/locales/pseudo-LOCALE/grafana.json b/public/locales/pseudo-LOCALE/grafana.json
index d1305b9083327..9b5e7e71c03d7 100644
--- a/public/locales/pseudo-LOCALE/grafana.json
+++ b/public/locales/pseudo-LOCALE/grafana.json
@@ -238,10 +238,6 @@
     "explore": {
       "title": "Ēχpľőřę"
     },
-    "global-orgs": {
-      "subtitle": "Ĩşőľäŧęđ įʼnşŧäʼnčęş őƒ Ğřäƒäʼnä řūʼnʼnįʼnģ őʼn ŧĥę şämę şęřvęř",
-      "title": "Øřģäʼnįžäŧįőʼnş"
-    },
     "global-users": {
       "subtitle": "Mäʼnäģę ūşęřş įʼn Ğřäƒäʼnä",
       "title": "Ůşęřş"
diff --git a/public/locales/zh-Hans/grafana.json b/public/locales/zh-Hans/grafana.json
index af27b8ef6d2b3..61c0bd223d497 100644
--- a/public/locales/zh-Hans/grafana.json
+++ b/public/locales/zh-Hans/grafana.json
@@ -238,10 +238,6 @@
     "explore": {
       "title": "探索"
     },
-    "global-orgs": {
-      "subtitle": "在同一服务器上运行的 Grafana 的孤立实例",
-      "title": "组织"
-    },
     "global-users": {
       "subtitle": "在 Grafana 中管理用户",
       "title": "用户"
diff --git a/public/sass/_variables.dark.generated.scss b/public/sass/_variables.dark.generated.scss
index e1197d4f35ed9..9ec465ddc9000 100644
--- a/public/sass/_variables.dark.generated.scss
+++ b/public/sass/_variables.dark.generated.scss
@@ -76,6 +76,7 @@ $red: $red-base;
 $yellow: #ecbb13;
 $orange: #eb7b18;
 $purple: #9933cc;
+$green: #b7eb19;
 $variable: #6E9FFF;
 
 $brand-primary: #eb7b18;
diff --git a/public/sass/_variables.light.generated.scss b/public/sass/_variables.light.generated.scss
index 84147e39fc4e2..282577c0744b7 100644
--- a/public/sass/_variables.light.generated.scss
+++ b/public/sass/_variables.light.generated.scss
@@ -71,6 +71,7 @@ $red: $red-base;
 $yellow: #ecbb13;
 $orange: #eb7b18;
 $purple: #9933cc;
+$green: #b7eb19;
 $variable: #1F62E0;
 
 $brand-primary: #eb7b18;
diff --git a/public/sass/base/_icons.scss b/public/sass/base/_icons.scss
index cda0323f055e2..729d8ed80430c 100644
--- a/public/sass/base/_icons.scss
+++ b/public/sass/base/_icons.scss
@@ -99,7 +99,7 @@
 }
 
 .gicon-branding {
-  background-image: url('../img/grafana_icon.svg');
+  background-image: url('../img/cloudian_logo.png');
 }
 
 .gicon-cog {
diff --git a/public/test/mocks/navModel.ts b/public/test/mocks/navModel.ts
index 0bcd93530f732..87bd0e17e3c86 100644
--- a/public/test/mocks/navModel.ts
+++ b/public/test/mocks/navModel.ts
@@ -1081,7 +1081,7 @@ export const mockNavModel: NavIndex = {
     id: 'admin',
     text: 'Server Admin',
     section: NavSection.Config,
-    subTitle: 'Manage all users and orgs',
+    subTitle: 'Manage all users',
     icon: 'shield',
     url: '/admin/users',
     hideFromTabs: true,
@@ -1092,12 +1092,6 @@ export const mockNavModel: NavIndex = {
         icon: 'user',
         url: '/admin/users',
       },
-      {
-        id: 'global-orgs',
-        text: 'Orgs',
-        icon: 'building',
-        url: '/admin/orgs',
-      },
       {
         id: 'server-settings',
         text: 'Settings',
@@ -1121,7 +1115,7 @@ export const mockNavModel: NavIndex = {
       id: 'admin',
       text: 'Server Admin',
       section: NavSection.Config,
-      subTitle: 'Manage all users and orgs',
+      subTitle: 'Manage all users',
       icon: 'shield',
       url: '/admin/users',
       hideFromTabs: true,
@@ -1132,53 +1126,6 @@ export const mockNavModel: NavIndex = {
           icon: 'user',
           url: '/admin/users',
         },
-        {
-          id: 'global-orgs',
-          text: 'Orgs',
-          icon: 'building',
-          url: '/admin/orgs',
-        },
-        {
-          id: 'server-settings',
-          text: 'Settings',
-          icon: 'sliders-v-alt',
-          url: '/admin/settings',
-        },
-        {
-          id: 'upgrading',
-          text: 'Stats and license',
-          icon: 'unlock',
-          url: '/admin/upgrading',
-        },
-      ],
-    },
-  },
-  'global-orgs': {
-    id: 'global-orgs',
-    text: 'Orgs',
-    icon: 'building',
-    url: '/admin/orgs',
-    parentItem: {
-      id: 'admin',
-      text: 'Server Admin',
-      section: NavSection.Config,
-      subTitle: 'Manage all users and orgs',
-      icon: 'shield',
-      url: '/admin/users',
-      hideFromTabs: true,
-      children: [
-        {
-          id: 'global-users',
-          text: 'Users',
-          icon: 'user',
-          url: '/admin/users',
-        },
-        {
-          id: 'global-orgs',
-          text: 'Orgs',
-          icon: 'building',
-          url: '/admin/orgs',
-        },
         {
           id: 'server-settings',
           text: 'Settings',
@@ -1209,7 +1156,7 @@ export const mockNavModel: NavIndex = {
       id: 'admin',
       text: 'Server Admin',
       section: NavSection.Config,
-      subTitle: 'Manage all users and orgs',
+      subTitle: 'Manage all users',
       icon: 'shield',
       url: '/admin/users',
       hideFromTabs: true,
@@ -1220,12 +1167,6 @@ export const mockNavModel: NavIndex = {
           icon: 'user',
           url: '/admin/users',
         },
-        {
-          id: 'global-orgs',
-          text: 'Orgs',
-          icon: 'building',
-          url: '/admin/orgs',
-        },
         {
           id: 'server-settings',
           text: 'Settings',
@@ -1250,7 +1191,7 @@ export const mockNavModel: NavIndex = {
       id: 'admin',
       text: 'Server Admin',
       section: NavSection.Config,
-      subTitle: 'Manage all users and orgs',
+      subTitle: 'Manage all users',
       icon: 'shield',
       url: '/admin/users',
       hideFromTabs: true,
@@ -1261,12 +1202,6 @@ export const mockNavModel: NavIndex = {
           icon: 'user',
           url: '/admin/users',
         },
-        {
-          id: 'global-orgs',
-          text: 'Orgs',
-          icon: 'building',
-          url: '/admin/orgs',
-        },
         {
           id: 'server-settings',
           text: 'Settings',
diff --git a/public/views/error-template.html b/public/views/error-template.html
index 28e828a155439..45ca1ca2c955f 100644
--- a/public/views/error-template.html
+++ b/public/views/error-template.html
@@ -16,7 +16,7 @@
     <link rel="stylesheet" href="public/build/<%= htmlWebpackPlugin.files.cssChunks.dark %>" />
     [[ end ]]
 
-    <link rel="icon" type="image/png" href="public/img/fav32.png" />
+    <link rel="icon" type="image/png" href="public/img/cloudian_logo_alt.png" />
     <link rel="mask-icon" href="public/img/grafana_mask_icon.svg" color="#F05A28" />
   </head>
 
diff --git a/public/views/index-template.html b/public/views/index-template.html
index 90b5914df847c..e630ef4879033 100644
--- a/public/views/index-template.html
+++ b/public/views/index-template.html
@@ -66,7 +66,7 @@
         height: 60px;
         background-repeat: no-repeat;
         background-size: contain;
-        background-image: url('[[.LoadingLogo]]');
+        background-image: url("public/img/cloudian_logo.png");
       }
 
       .preloader__text {
@@ -176,26 +176,22 @@
           <div class="preloader__logo"></div>
         </div>
       </div>
-      <div class="preloader__text">Loading Grafana</div>
+      <div class="preloader__text">Loading Cloudian® HyperIQ</div>
       <div class="preloader__text preloader__text--fail">
         <p>
-          <strong>If you're seeing this Grafana has failed to load its application files</strong>
+          <strong>If you're seeing this HyperIQ has failed to load its application files</strong>
           <br />
           <br />
         </p>
         <p>
           1. This could be caused by your reverse proxy settings.<br /><br />
-          2. If you host grafana under subpath make sure your grafana.ini root_url setting includes subpath. If not
+          2. If you host HyperIQ under subpath make sure your grafana.ini root_url setting includes subpath. If not
           using a reverse proxy make sure to set serve_from_sub_path to true.<br />
           <br />
           3. If you have a local dev build make sure you build frontend using: yarn start, or yarn build<br />
           <br />
           4. Sometimes restarting grafana-server can help<br />
           <br />
-          5. Check if you are using a non-supported browser. For more information, refer to the list of
-          <a href="https://grafana.com/docs/grafana/latest/installation/requirements/#supported-web-browsers">
-            supported browsers</a
-          >.
         </p>
       </div>
       <script nonce="[[.Nonce]]">