diff --git a/src/app/atoms/CleanButton.tsx b/src/app/atoms/CleanButton.tsx
index 3a7724ca30..b76dfae8b1 100644
--- a/src/app/atoms/CleanButton.tsx
+++ b/src/app/atoms/CleanButton.tsx
@@ -8,12 +8,14 @@ import useTippy from 'lib/ui/useTippy';
 
 type CleanButtonProps = HTMLAttributes<HTMLButtonElement> & {
   bottomOffset?: string;
+  iconClassName?: string;
   iconStyle?: React.CSSProperties;
 };
 
 const CleanButton: FC<CleanButtonProps> = ({
   bottomOffset = '0.4rem',
   className,
+  iconClassName,
   style = {},
   iconStyle = {},
   ...rest
@@ -48,7 +50,7 @@ const CleanButton: FC<CleanButtonProps> = ({
       tabIndex={-1}
       {...rest}
     >
-      <CloseIcon className="w-auto h-4 stroke-current" style={iconStyle} />
+      <CloseIcon className={classNames('w-auto h-4 stroke-current', iconClassName)} style={iconStyle} />
     </button>
   );
 };
diff --git a/src/app/hooks/use-current-os.ts b/src/app/hooks/use-current-os.ts
deleted file mode 100644
index 39b84157eb..0000000000
--- a/src/app/hooks/use-current-os.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { useEffect, useState } from 'react';
-
-import browser from 'webextension-polyfill';
-
-export const useCurrentOs = () => {
-  const [currentOs, setCurrentOs] = useState('');
-
-  const getCurrentOs = async () => {
-    const { os } = await browser.runtime.getPlatformInfo();
-    setCurrentOs(os);
-  };
-
-  useEffect(() => {
-    getCurrentOs();
-  }, []);
-
-  return currentOs;
-};
diff --git a/src/app/layouts/PageLayout/Header/AccountDropdown/index.tsx b/src/app/layouts/PageLayout/Header/AccountDropdown/index.tsx
index ad87c3cf53..5c72faf959 100644
--- a/src/app/layouts/PageLayout/Header/AccountDropdown/index.tsx
+++ b/src/app/layouts/PageLayout/Header/AccountDropdown/index.tsx
@@ -5,7 +5,6 @@ import classNames from 'clsx';
 import { Button } from 'app/atoms/Button';
 import DropdownWrapper from 'app/atoms/DropdownWrapper';
 import { openInFullPage, useAppEnv } from 'app/env';
-import { useCurrentOs } from 'app/hooks/use-current-os';
 import { ReactComponent as AddIcon } from 'app/icons/add.svg';
 import { ReactComponent as DAppsIcon } from 'app/icons/apps-alt.svg';
 import { ReactComponent as DownloadIcon } from 'app/icons/download.svg';
@@ -24,7 +23,8 @@ import { AccountItem } from './AccountItem';
 import { ActionButtonProps, ActionButton } from './ActionButton';
 import { AccountDropdownSelectors } from './selectors';
 
-const COLOR_GRAY_600 = '#718096';
+const isMacOS = /Mac OS/.test(navigator.userAgent);
+const searchHotkey = ` (${isMacOS ? '⌘' : 'Ctrl + '}K)`;
 
 type AccountDropdownProps = PopperRenderProps;
 
@@ -39,7 +39,6 @@ const AccountDropdown: FC<AccountDropdownProps> = ({ opened, setOpened }) => {
   const account = useAccount();
   const setAccountPkh = useSetAccountPkh();
   const { assetName: gasTokenName } = useGasToken();
-  const os = useCurrentOs();
 
   const [searchValue, setSearchValue] = useState('');
   const [attractSelectedAccount, setAttractSelectedAccount] = useState(true);
@@ -137,8 +136,6 @@ const AccountDropdown: FC<AccountDropdownProps> = ({ opened, setOpened }) => {
     [appEnv.fullPage, closeDropdown, handleMaximiseViewClick]
   );
 
-  const searchHotkey = useMemo(() => ` (${os === 'mac' ? '⌘' : 'Ctrl + '}K)`, [os]);
-
   useEffect(() => {
     if (searchValue) setAttractSelectedAccount(false);
     else if (!opened) setAttractSelectedAccount(true);
@@ -194,11 +191,11 @@ const AccountDropdown: FC<AccountDropdownProps> = ({ opened, setOpened }) => {
             'text-gray-500 placeholder-gray-600 text-sm leading-tight'
           )}
           placeholder={t('searchAccount', [searchHotkey])}
-          searchIconClassName="h-5 w-auto"
+          searchIconClassName="h-5 w-auto text-gray-600 stroke-current"
           searchIconWrapperClassName="px-2"
-          cleanButtonStyle={{ backgroundColor: 'transparent', borderColor: COLOR_GRAY_600 }}
-          cleanButtonIconStyle={{ stroke: COLOR_GRAY_600 }}
-          searchIconStyle={{ stroke: COLOR_GRAY_600 }}
+          cleanButtonClassName="border-gray-600"
+          cleanButtonIconClassName="text-gray-600 stroke-current"
+          cleanButtonStyle={{ backgroundColor: 'transparent' }}
           onValueChange={setSearchValue}
         />
 
diff --git a/src/app/templates/SearchField.tsx b/src/app/templates/SearchField.tsx
index 14e42b93fd..0bf55699c5 100644
--- a/src/app/templates/SearchField.tsx
+++ b/src/app/templates/SearchField.tsx
@@ -12,6 +12,7 @@ export interface SearchFieldProps extends InputHTMLAttributes<HTMLInputElement>,
   searchIconClassName?: string;
   searchIconWrapperClassName?: string;
   cleanButtonClassName?: string;
+  cleanButtonIconClassName?: string;
   searchIconStyle?: React.CSSProperties;
   cleanButtonStyle?: React.CSSProperties;
   cleanButtonIconStyle?: React.CSSProperties;
@@ -29,6 +30,7 @@ const SearchField: FC<SearchFieldProps> = ({
   searchIconWrapperClassName,
   cleanButtonClassName,
   searchIconStyle,
+  cleanButtonIconClassName,
   cleanButtonStyle,
   cleanButtonIconStyle,
   testID,
@@ -72,6 +74,7 @@ const SearchField: FC<SearchFieldProps> = ({
           <CleanButton
             bottomOffset={bottomOffset}
             className={cleanButtonClassName}
+            iconClassName={cleanButtonIconClassName}
             style={cleanButtonStyle}
             iconStyle={cleanButtonIconStyle}
             onClick={handleClean}