diff --git a/ui/src/app/core/components/Header.js b/ui/src/app/core/components/Header.js
index 0c925ac50..259903a31 100644
--- a/ui/src/app/core/components/Header.js
+++ b/ui/src/app/core/components/Header.js
@@ -8,7 +8,7 @@ import OverlayTrigger from 'react-bootstrap/OverlayTrigger';
 import Tooltip from 'react-bootstrap/Tooltip';
 
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { faTh, faSignOutAlt, faPlusCircle, faCube, faCubes, faUsersCog, faUser, faSpinner, faUserCircle } from '@fortawesome/free-solid-svg-icons';
+import { faTh, faSignOutAlt, faPlusCircle, faCube, faCubes, faUsersCog, faUser, faSpinner, faUserCircle, faCog } from '@fortawesome/free-solid-svg-icons';
 
 import Translate from '../../i18n/components/translate';
 import { useTranslator } from '../../i18n/hooks';
@@ -67,7 +67,7 @@ export function Header () {
                     {isAdmin &&
                     <Dropdown className="border-md-right px-2" id="basic-nav-dropdown">
                         <Dropdown.Toggle variant="link" id="dropdown-basic" size="sm">
-                            <FontAwesomeIcon icon={faPlusCircle} className="mr-2" />
+                            <FontAwesomeIcon icon={faCog} className="mr-2" />
                             <Translate value={'action.advanced'} />
                         </Dropdown.Toggle>
                         <Dropdown.Menu>
@@ -84,7 +84,7 @@ export function Header () {
                     }
                     <Dropdown className="pl-2" id="basic-nav-dropdown">
                         <Dropdown.Toggle variant="link" id="dropdown-basic" size="sm" bsPrefix="dropdown-toggle-shibui">
-                            <FontAwesomeIcon icon={faUserCircle} size="" className="mr-2" />
+                            <FontAwesomeIcon icon={faUserCircle} size="lg" className="mr-2" />
                             <Translate value={'action.logged-in'} params={{ username }} />
                         </Dropdown.Toggle>
                         <Dropdown.Menu alignRight={true}>
diff --git a/ui/src/app/core/components/Header.test.js b/ui/src/app/core/components/Header.test.js
index f154789b2..6b09a6b5c 100644
--- a/ui/src/app/core/components/Header.test.js
+++ b/ui/src/app/core/components/Header.test.js
@@ -9,14 +9,20 @@ jest.mock('../../i18n/hooks', () => ({
 }));
 
 const mockIsAdmin = jest.fn();
+const mockCurrentUser = jest.fn();
+const mockCurrentUserLoading = jest.fn();
 
 jest.mock('../user/UserContext', () => ({
-    useIsAdmin: () => mockIsAdmin()
+    useIsAdmin: () => mockIsAdmin(),
+    useCurrentUser: () => mockCurrentUser(),
+    useCurrentUserLoading: () => mockCurrentUserLoading()
 }));
 
 describe('header for admins', () => {
     beforeEach(() => {
         mockIsAdmin.mockReturnValue(true);
+        mockCurrentUser.mockReturnValue({ username: 'foo', groupId: 'bar' });
+        mockCurrentUserLoading.mockReturnValue(false);
     });
 
     it('should display logo and navigation', () => {