diff --git a/client/src/components/layout/Sidebar/Sidebar.jsx b/client/src/components/layout/Sidebar/Sidebar.jsx
index b2920d3..1db12b9 100644
--- a/client/src/components/layout/Sidebar/Sidebar.jsx
+++ b/client/src/components/layout/Sidebar/Sidebar.jsx
@@ -1,64 +1,14 @@
-import { useSlotRecipe, Box, Button, createIcon, CloseButton, IconButton } from "@chakra-ui/react";
+import { useSlotRecipe, Box, Button, IconButton } from "@chakra-ui/react";
 import { ColorModeButton } from "@/components/ui/color-mode";
 import { Tooltip } from "@/components/ui/tooltip";
 import { FaVolcano } from "react-icons/fa6";
-import { RxHamburgerMenu } from "react-icons/rx";
 import { FaHome } from "react-icons/fa";
+import { FaGlobeAmericas } from "react-icons/fa";
+import { FaMapMarkerAlt } from "react-icons/fa";
+import { HiUsers } from "react-icons/hi2";
+import { VscThreeBars } from "react-icons/vsc";
 import { useState } from "react";
 
-// ICONS
-export const PushPin = createIcon({
-  displayName: "PushPin",
-  viewBox: "0 0 24 24",
-  fill: "none",
-  path: (
-    <>
-      <path xmlns="http://www.w3.org/2000/svg" d="M6.21967 0.21967C6.36032 0.0790176 6.55109 0 6.75 0H17.25C17.6642 0 18 0.335786 18 0.75C18 1.76907 17.4871 2.51108 17.0303 2.96783C16.8422 3.15598 16.6554 3.30457 16.5 3.41487V10.0621C16.5369 10.0844 16.5757 10.1082 16.6162 10.1335C16.9211 10.3241 17.3307 10.6053 17.7439 10.9668C18.5387 11.6623 19.5 12.7902 19.5 14.25C19.5 14.6642 19.1642 15 18.75 15H12.75V21.75C12.75 22.1642 12.4142 24 12 24C11.5858 24 11.25 22.1642 11.25 21.75V15H5.25C4.83579 15 4.5 14.6642 4.5 14.25C4.5 12.7902 5.46131 11.6623 6.25612 10.9668C6.66928 10.6053 7.07891 10.3241 7.38375 10.1335C7.42429 10.1082 7.46311 10.0844 7.5 10.0621V3.41487C7.34463 3.30457 7.15782 3.15598 6.96967 2.96783C6.51292 2.51108 6 1.76907 6 0.75C6 0.551088 6.07902 0.360322 6.21967 0.21967Z" stroke="currentColor" strokeWidth="1.5"/>
-    </>
-  ),
-});
-
-export const Globe = createIcon({
-  displayName: "Globe",
-  viewBox: "0 0 24 24",
-  fill: "currentColor",
-  path: (
-    <>
-      <circle cx="12" cy="12" r="10" stroke="currentColor" strokeWidth="1.5"/>
-      <path opacity="0.5" d="M6 4.71053C6.78024 5.42105 8.38755 7.36316 8.57481 9.44737C8.74984 11.3955 10.0357 12.9786 12 13C12.7549 13.0082 13.5183 12.4629 13.5164 11.708C13.5158 11.4745 13.4773 11.2358 13.417 11.0163C13.3331 10.7108 13.3257 10.3595 13.5 10C14.1099 8.74254 15.3094 8.40477 16.2599 7.72186C16.6814 7.41898 17.0659 7.09947 17.2355 6.84211C17.7037 6.13158 18.1718 4.71053 17.9377 4" stroke="currentColor" strokeWidth="1.5"/>
-      <path opacity="0.5" d="M22 13C21.6706 13.931 21.4375 16.375 17.7182 16.4138C17.7182 16.4138 14.4246 16.4138 13.4365 18.2759C12.646 19.7655 13.1071 21.3793 13.4365 22" stroke="currentColor" strokeWidth="1.5"/>
-    </>
-  ),
-});
-
-export const MapMarker = createIcon({
-  displayName: "MapMarker",
-  viewBox: "0 0 24 24",
-  fill: "none",
-  path: (
-    <>
-      <path d="M21.2188 9.80011C21.2188 16.8001 12.2188 22.8001 12.2188 22.8001C12.2188 22.8001 3.21875 16.8001 3.21875 9.80011C3.21875 7.41316 4.16696 5.12398 5.85479 3.43615C7.54262 1.74832 9.8318 0.80011 12.2188 0.80011C14.6057 0.80011 16.8949 1.74832 18.5827 3.43615C20.2705 5.12398 21.2187 7.41316 21.2188 9.80011Z" stroke="currentColor" strokeWidth="1.5" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M12.2188 12.8001C13.8756 12.8001 15.2188 11.457 15.2188 9.80011C15.2188 8.14326 13.8756 6.80011 12.2188 6.80011C10.5619 6.80011 9.21875 8.14326 9.21875 9.80011C9.21875 11.457 10.5619 12.8001 12.2188 12.8001Z" stroke="currentColor" strokeWidth="1.5" strokeLinecap="round" strokeLinejoin="round"/>
-    </>
-  ),
-});
-
-export const Users = createIcon({
-  displayName: "Users",
-  viewBox: "0 0 24 24",
-  fill: "currentColor",
-  path: (
-    <>
-      <path d="M17.888 10.8967C19.283 10.7007 20.357 9.50466 20.36 8.05566C20.36 6.62767 19.319 5.44367 17.954 5.21967" stroke="currentColor" strokeWidth="1.375" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M19.7278 14.2502C21.0788 14.4522 22.0218 14.9252 22.0218 15.9002C22.0218 16.5712 21.5778 17.0072 20.8598 17.2812" stroke="currentColor" strokeWidth="1.375" strokeLinecap="round" strokeLinejoin="round"/>
-      <path fillRule="evenodd" clipRule="evenodd" d="M11.886 14.6638C8.67203 14.6638 5.92702 15.1508 5.92702 17.0958C5.92702 19.0398 8.65503 19.5408 11.886 19.5408C15.1 19.5408 17.844 19.0588 17.844 17.1128C17.844 15.1668 15.117 14.6638 11.886 14.6638Z" stroke="currentColor" strokeWidth="1.375" strokeLinecap="round" strokeLinejoin="round"/>
-      <path fillRule="evenodd" clipRule="evenodd" d="M11.8867 11.8878C13.9957 11.8878 15.7057 10.1788 15.7057 8.06882C15.7057 5.95982 13.9957 4.24982 11.8867 4.24982C9.77768 4.24982 8.06768 5.95982 8.06768 8.06882C8.05968 10.1708 9.75668 11.8808 11.8587 11.8878H11.8867Z" stroke="currentColor" strokeWidth="1.375" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M5.8834 10.8967C4.4874 10.7007 3.4144 9.50466 3.4114 8.05566C3.4114 6.62767 4.4524 5.44367 5.8174 5.21967" stroke="currentColor" strokeWidth="1.375" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M4.04329 14.2502C2.69229 14.4522 1.74929 14.9252 1.74929 15.9002C1.74929 16.5712 2.19329 17.0072 2.91129 17.2812" stroke="currentColor" strokeWidth="1.375" strokeLinecap="round" strokeLinejoin="round"/>
-    </>
-  ),
-});
-
 export default function Sidebar({ onChangeView }) {
   const [isOpen, setIsOpen] = useState(true);
   const [activeButton, setActiveButton] = useState(0)
@@ -66,10 +16,10 @@ export default function Sidebar({ onChangeView }) {
     // this list of btns will come from the db (not every usr will have access to admin)
   const buttons = [
     {icon: FaHome, name: "Home", view: "widget"},
-    {icon: Globe, name: "Global Map", view: "global"},
-    {icon: MapMarker, name: "Regional Map", view: "regional"},
+    {icon: FaGlobeAmericas, name: "Global Map", view: "global"},
+    {icon: FaMapMarkerAlt, name: "Regional Map", view: "regional"},
     {icon: FaVolcano, name: "Volcano", view: "volcano"},
-    {icon: Users, name: "Admin", view: "admin"}
+    {icon: HiUsers, name: "Admin", view: "admin"}
   ];
   
   const recipe = useSlotRecipe({ key: "sidebar" });
@@ -93,7 +43,7 @@ export default function Sidebar({ onChangeView }) {
         onClick={toggleSidebar}
         width="54px"
       >
-        <RxHamburgerMenu />
+        <VscThreeBars />
       </IconButton>
 
       {buttons.map((button, idx) => {
@@ -107,9 +57,10 @@ export default function Sidebar({ onChangeView }) {
                     onChangeView(button.view); // Trigger state change in Dashboard
                   }} 
                   bg={activeButton === idx ? "primary":undefined} 
+                  color={activeButton === idx ? "#FFFFFF":undefined} 
                   justifyContent="flex-start"
           >           
-            <Icon fill="base200" />
+            <Icon />
               <span style={{
                 opacity: isOpen ? 1 : 0,
                 transition: "opacity 0.4s ease",
diff --git a/client/src/theme.js b/client/src/theme.js
index e26676d..6bed3d6 100644
--- a/client/src/theme.js
+++ b/client/src/theme.js
@@ -42,14 +42,14 @@ const sidebarRecipe = defineSlotRecipe({
       flexDirection: "column",
       justifyContent: "start", 
       alignItems: "start",
-      gap: 4,
+      gap: 2,
       p: 2,
     },
     buttons: {
       bg: "transparent",
-      _hover: {bg: "{primaryLt}"},
+      _hover: {bg: "{primaryLt}", color: "{textInverted}"},
       fontSize: "xl",
-      color: {base: "#19332D", _dark: "#CBCBCB"},
+      color: {base: "{text}"},
       variant: "ghost",
       width: "100%",
     },
@@ -95,7 +95,7 @@ const config = defineConfig({
   theme: {
     semanticTokens: {
       colors: {
-        base100: { value: {base: "#f6f9faff", _dark: "#787b73"}},
+        base100: { value: {base: "#f6f9faff", _dark: "lightgrey"}},
         base200: { value: {base: "#e6ecf1ff", _dark: "#242424"}},
         base300: { value: {base: "#d3dae4ff", _dark: "#60645a"}},
         // primary: { value: {base: "#9cd855", _dark: "#629631"}},
@@ -104,11 +104,9 @@ const config = defineConfig({
         primaryLt: { value: {base: "#98cdffff", _dark: "#98cdffff"}},
         secondaryBG: { value: {base: "#EDF1F1", _dark: "#121212"}},
         border: {value: {base: "#000000", _dark: "#CBCBCB"}},
-        text: {value: {base: "#19332D", _dark: "#CBCBCB"}},
-        iconFillPush: { value: {base: "#19332D", _dark: "#CBCBCB"}},
-        iconFillAdmin: { value: {base: "#eef2f6", _dark: "#CBCBCB"}},
-        iconStroke: { value: {base: "#19332D", _dark: "#CBCBCB"}},
-        icon: {value: {base: "#19332D", _dark: "#CBCBCB"}},
+        text: {value: {base: "#000000", _dark: "lightgrey"}},
+        textInverted: {value: "white"},
+        icon: {value: {base: "#000000", _dark: "lightgrey"}},
       },
     },
     tokens: {