diff --git a/ui/dev-dist/sw.js b/ui/dev-dist/sw.js
index 65e34dd6..d9ba6e78 100644
--- a/ui/dev-dist/sw.js
+++ b/ui/dev-dist/sw.js
@@ -82,7 +82,7 @@ define(['./workbox-54d0af47'], (function (workbox) { 'use strict';
     "revision": "3ca0b8505b4bec776b69afdba2768812"
   }, {
     "url": "index.html",
-    "revision": "0.271iot081v"
+    "revision": "0.tihrrtufp5o"
   }], {});
   workbox.cleanupOutdatedCaches();
   workbox.registerRoute(new workbox.NavigationRoute(workbox.createHandlerBoundToURL("index.html"), {
diff --git a/ui/src/components/layouts/SimpleLayout.tsx b/ui/src/components/layouts/SimpleLayout.tsx
index ff6a8878..5a56c9b7 100644
--- a/ui/src/components/layouts/SimpleLayout.tsx
+++ b/ui/src/components/layouts/SimpleLayout.tsx
@@ -24,9 +24,9 @@ const HeaderActionsEnd = () => {
     <>
       <Search />
       <AiAssistant />
-      <LanguageSelector />
       <Notification />
       <SidePanel />
+      <LanguageSelector />
       <UserDropdown hoverable={false} />
     </>
   )
diff --git a/ui/src/components/template/AiAssistant.tsx b/ui/src/components/template/AiAssistant.tsx
index 6ffea875..afd13c64 100644
--- a/ui/src/components/template/AiAssistant.tsx
+++ b/ui/src/components/template/AiAssistant.tsx
@@ -2,7 +2,7 @@ import Tooltip from '@/components/ui/Tooltip'
 import { ROUTES_ENUM } from '@/routes/route.constant'
 import { useLocalization } from '@/utils/hooks/useLocalization'
 import { usePermission } from '@/utils/hooks/usePermission'
-import { FaHeadset } from 'react-icons/fa';
+import { FcAssistant } from 'react-icons/fc';
 import { useNavigate } from 'react-router-dom'
 
 const AiAssistant = () => {
@@ -23,7 +23,7 @@ const AiAssistant = () => {
           onClick={() => navigate(ROUTES_ENUM.protected.admin.ai)}
           className="flex items-center justify-center w-9 h-9 m-2 rounded-full hover:bg-gray-100 dark:hover:bg-gray-700 cursor-pointer transition-colors duration-200"
         >
-          <FaHeadset size={28} />
+          <FcAssistant size={28} />
         </div>
       </Tooltip>
     </>
diff --git a/ui/src/components/template/Notification.tsx b/ui/src/components/template/Notification.tsx
index 9364c637..993cbae4 100644
--- a/ui/src/components/template/Notification.tsx
+++ b/ui/src/components/template/Notification.tsx
@@ -19,9 +19,10 @@ import classNames from 'classnames'
 import dayjs from 'dayjs'
 import relativeTime from 'dayjs/plugin/relativeTime'
 import { useCallback, useEffect, useRef, useState } from 'react'
-import { FaBell, FaEnvelopeOpen } from 'react-icons/fa';
+import { FaEnvelopeOpen } from 'react-icons/fa';
 import { Link } from 'react-router-dom'
 import { Notification as Notify, toast } from '../ui'
+import { FcAdvertising } from 'react-icons/fc'
 
 dayjs.extend(relativeTime)
 
@@ -57,10 +58,10 @@ const NotificationToggle = ({
           content={unreadCount}
           innerClass="py-0 px-1"
         >
-          <FaBell />
+          <FcAdvertising />
         </Badge>
       ) : (
-        <FaBell />
+        <FcAdvertising />
       )}
     </div>
   )
diff --git a/ui/src/components/template/Search.tsx b/ui/src/components/template/Search.tsx
index 39df0596..e2bec4e3 100644
--- a/ui/src/components/template/Search.tsx
+++ b/ui/src/components/template/Search.tsx
@@ -12,6 +12,7 @@ import { PermissionCheck } from '../shared'
 import { Badge, Checkbox, Pagination } from '../ui'
 import { useLocalization } from '@/utils/hooks/useLocalization'
 import { getSearch, getSystems } from '@/services/global-search.service'
+import { FcSearch } from 'react-icons/fc'
 
 type SearchData = {
   title: string
@@ -174,7 +175,7 @@ const _Search = ({ className }: { className?: string }) => {
   return (
     <PermissionCheck permissions={[GLOBAL_SEARCH]}>
       <div className={classNames(className, 'text-2xl')} onClick={handleSearchOpen}>
-        <FaSearch />
+        <FcSearch />
       </div>
       <Dialog
         contentClassName="p-0"
@@ -193,7 +194,7 @@ const _Search = ({ className }: { className?: string }) => {
                 onKeyDown={(e) => e.key === 'Enter' && handleSearch()}
               />
             </div>
-            <Button size="xs" onClick={handleSearch}>
+            <Button size="sm" onClick={handleSearch}>
               <FaSearch />
             </Button>
           </div>
diff --git a/ui/src/components/template/SidePanel/SidePanel.tsx b/ui/src/components/template/SidePanel/SidePanel.tsx
index aeed9439..02c48e27 100644
--- a/ui/src/components/template/SidePanel/SidePanel.tsx
+++ b/ui/src/components/template/SidePanel/SidePanel.tsx
@@ -1,11 +1,11 @@
 import classNames from 'classnames'
 import Drawer from '@/components/ui/Drawer'
-import { FaCog } from 'react-icons/fa';
 import SidePanelContent, { SidePanelContentProps } from './SidePanelContent'
 import withHeaderItem from '@/utils/hoc/withHeaderItem'
 import { useStoreState, useStoreActions } from '@/store'
 import type { CommonProps } from '@/@types/common'
 import { useLocalization } from '@/utils/hooks/useLocalization'
+import { FcEngineering } from 'react-icons/fc';
 
 type SidePanelProps = SidePanelContentProps & CommonProps
 
@@ -35,7 +35,7 @@ const _SidePanel = (props: SidePanelProps) => {
   return (
     <>
       <div className={classNames('text-2xl', className)} onClick={openPanel} {...rest}>
-        <FaCog />
+        <FcEngineering />
       </div>
       <Drawer
         title={translate('::SidePanel.Title')}