diff --git a/src/components/Helpers/Icons.jsx b/src/components/Helpers/Icons.jsx
index e397780..3fb0227 100755
--- a/src/components/Helpers/Icons.jsx
+++ b/src/components/Helpers/Icons.jsx
@@ -1,11 +1,11 @@
 import React from "react";
-import Tracking from "../../assets/images/icons/myFit_tracking.png"
-import Settings from "../../assets/images/icons/myFit_settings.png"
-import Resources from "../../assets/images/icons/myFit_resources.png"
-import Reminder from "../../assets/images/icons/myFit_reminder.png"
-import Profile from "../../assets/images/icons/myFit_profile.png"
-import History from "../../assets/images/icons/myFit_history.png"
-import Calendar from "../../assets/images/icons/myFit_calendar.png"
+import Calendar from "../../assets/images/icons/myFit_calendar.png";
+import History from "../../assets/images/icons/myFit_history.png";
+import Profile from "../../assets/images/icons/myFit_profile.png";
+import Reminder from "../../assets/images/icons/myFit_reminder.png";
+import Resources from "../../assets/images/icons/myFit_resources.png";
+import Settings from "../../assets/images/icons/myFit_settings.png";
+import Tracking from "../../assets/images/icons/myFit_tracking.png";
 
 export default function Icons({ name }) {
   return (
diff --git a/src/components/Partials/Sidebar.jsx b/src/components/Partials/Sidebar.jsx
index 3d0a4d7..87832fc 100755
--- a/src/components/Partials/Sidebar.jsx
+++ b/src/components/Partials/Sidebar.jsx
@@ -145,7 +145,7 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) {
                     }`}
                   >
                    Reminders
-                    <span className={`absolute left-24 -top-1 text-sm flex primary-gradient justify-center items-center w-5 h-5 rounded-full text-white dark:text-purple ${'dark' ? 'dark-primary-gradient' : ''}`}>
+                    <span className={`absolute left-24 -top-1 text-sm flex primary-gradient justify-center items-center w-5 h-5 rounded-full text-white ${'dark' ? 'dark-primary-gradient text-purple' : ''} ${userReminders.length == 0 ? 'hidden' : ''}`}>
                       {userReminders.length > 0 && userReminders.length}
                     </span>
                   </span>
@@ -270,7 +270,7 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) {
                   }`}
                 >
                   <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple rounded-full">
-                    <Icons name="setting" />
+                    <Icons name="settings" />
                   </span>
                   <span
                     className={`item-content group-hover:text-purple text-[18px] dark:hover:text-white transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${