diff --git a/public/app/core/components/NavBar/Next/NavBarMenu.tsx b/public/app/core/components/NavBar/Next/NavBarMenu.tsx
index 2a6cebd020e..c6e5cefd2b4 100644
--- a/public/app/core/components/NavBar/Next/NavBarMenu.tsx
+++ b/public/app/core/components/NavBar/Next/NavBarMenu.tsx
@@ -5,6 +5,7 @@ import { CollapsableSection, CustomScrollbar, Icon, IconButton, IconName, useSty
import { FocusScope } from '@react-aria/focus';
import { useDialog } from '@react-aria/dialog';
import { OverlayContainer, useOverlay } from '@react-aria/overlays';
+import { Branding } from 'app/core/components/Branding/Branding';
import { css, cx } from '@emotion/css';
import { NavBarMenuItem } from './NavBarMenuItem';
import { NavBarItemWithoutMenu } from './NavBarItemWithoutMenu';
@@ -266,12 +267,7 @@ function NavItem({
isActive={link === activeItem}
>
-
- {link.icon &&
}
- {link.img && (
-

- )}
-
+
{getLinkIcon(link)}
{link.text}
@@ -362,10 +358,7 @@ function CollapsibleNavItem({
className={styles.collapsibleMenuItem}
elClassName={styles.collapsibleIcon}
>
- {link.img && (
-
- )}
- {link.icon && }
+ {getLinkIcon(link)}
({
function linkHasChildren(link: NavModelItem): link is NavModelItem & { children: NavModelItem[] } {
return Boolean(link.children && link.children.length > 0);
}
+
+function getLinkIcon(link: NavModelItem) {
+ if (link.id === 'home') {
+ return ;
+ } else if (link.icon) {
+ return ;
+ } else if (link.img) {
+ return
;
+ } else {
+ return null;
+ }
+}
diff --git a/public/app/core/components/NavBar/Next/NavBarNext.tsx b/public/app/core/components/NavBar/Next/NavBarNext.tsx
index 11961c6d8eb..3a9410d8e15 100644
--- a/public/app/core/components/NavBar/Next/NavBarNext.tsx
+++ b/public/app/core/components/NavBar/Next/NavBarNext.tsx
@@ -6,6 +6,7 @@ import { GrafanaTheme2, NavModelItem, NavSection } from '@grafana/data';
import { CustomScrollbar, Icon, IconName, useTheme2 } from '@grafana/ui';
import { config, locationService } from '@grafana/runtime';
import { getKioskMode } from 'app/core/navigation/kiosk';
+import { Branding } from 'app/core/components/Branding/Branding';
import { KioskMode, StoreState } from 'app/types';
import { enrichConfigItems, getActiveItem, isMatchOrChildMatch, isSearchActive, SEARCH_ITEM_ID } from '../utils';
import { OrgSwitcher } from '../../OrgSwitcher';
@@ -96,7 +97,7 @@ export const NavBarNext = React.memo(() => {
className={styles.grafanaLogo}
url={homeItem.url}
>
-
+