diff --git a/src/components/Layout/UserDropdown/index.tsx b/src/components/Layout/UserDropdown/index.tsx
index b766bc4c..209dfa4d 100644
--- a/src/components/Layout/UserDropdown/index.tsx
+++ b/src/components/Layout/UserDropdown/index.tsx
@@ -67,7 +67,7 @@ const UserDropdown: React.FC = () => {
           >
             <Link href={`/profile`}>
               <a
-                className="items-center block px-4 py-2 text-sm text-gray-200 transition duration-150 ease-in-out hover:bg-gray-600"
+                className="flex items-center px-4 py-2 text-sm text-gray-200 transition duration-150 ease-in-out hover:bg-gray-600"
                 role="menuitem"
                 tabIndex={0}
                 onKeyDown={(e) => {
@@ -78,12 +78,12 @@ const UserDropdown: React.FC = () => {
                 onClick={() => setDropdownOpen(false)}
               >
                 <UserIcon className="inline w-5 h-5 mr-2" />
-                {intl.formatMessage(messages.myprofile)}
+                <span>{intl.formatMessage(messages.myprofile)}</span>
               </a>
             </Link>
             <Link href={`/profile/settings`}>
               <a
-                className="items-center block px-4 py-2 text-sm text-gray-200 transition duration-150 ease-in-out hover:bg-gray-600"
+                className="flex items-center px-4 py-2 text-sm text-gray-200 transition duration-150 ease-in-out hover:bg-gray-600"
                 role="menuitem"
                 tabIndex={0}
                 onKeyDown={(e) => {
@@ -94,17 +94,17 @@ const UserDropdown: React.FC = () => {
                 onClick={() => setDropdownOpen(false)}
               >
                 <CogIcon className="inline w-5 h-5 mr-2" />
-                {intl.formatMessage(messages.settings)}
+                <span>{intl.formatMessage(messages.settings)}</span>
               </a>
             </Link>
             <a
               href="#"
-              className="block px-4 py-2 text-sm text-gray-200 transition duration-150 ease-in-out hover:bg-gray-600"
+              className="flex items-center px-4 py-2 text-sm text-gray-200 transition duration-150 ease-in-out hover:bg-gray-600"
               role="menuitem"
               onClick={() => logout()}
             >
               <LogoutIcon className="inline w-5 h-5 mr-2" />
-              {intl.formatMessage(messages.signout)}
+              <span>{intl.formatMessage(messages.signout)}</span>
             </a>
           </div>
         </div>
diff --git a/src/components/Settings/SettingsJobsCache/index.tsx b/src/components/Settings/SettingsJobsCache/index.tsx
index ffd3446f..992e3ac4 100644
--- a/src/components/Settings/SettingsJobsCache/index.tsx
+++ b/src/components/Settings/SettingsJobsCache/index.tsx
@@ -1,4 +1,4 @@
-import { PlayIcon, StopIcon, XCircleIcon } from '@heroicons/react/solid';
+import { PlayIcon, StopIcon, TrashIcon } from '@heroicons/react/outline';
 import axios from 'axios';
 import React from 'react';
 import {
@@ -226,7 +226,7 @@ const SettingsJobs: React.FC = () => {
                 <Table.TD>{formatBytes(cache.stats.vsize)}</Table.TD>
                 <Table.TD alignText="right">
                   <Button buttonType="danger" onClick={() => flushCache(cache)}>
-                    <XCircleIcon className="w-5 h-5 mr-1" />
+                    <TrashIcon className="w-5 h-5 mr-1" />
                     {intl.formatMessage(messages.flushcache)}
                   </Button>
                 </Table.TD>