diff --git a/frontend/src/components/Navigation/Navbar.tsx b/frontend/src/components/Navigation/Navbar.tsx
index 219b3ed..a19debf 100644
--- a/frontend/src/components/Navigation/Navbar.tsx
+++ b/frontend/src/components/Navigation/Navbar.tsx
@@ -40,7 +40,7 @@ const Navbar: React.FC<NavbarProps> = ({ variant = "default" }) => {
   const handleQuickSettings = () => {
     setShowQuickSettings(!showQuickSettings);
     setJustToggled(true);
-    setTimeout(() => setJustToggled(false), 750);
+    setTimeout(() => setJustToggled(false), 200);
   };
 
   // Keyboard shortcut to toggle sidebar
@@ -99,7 +99,7 @@ const Navbar: React.FC<NavbarProps> = ({ variant = "default" }) => {
       >
         <SettingsIcon className="h-[2vw] w-[2vw]" />
         {!showQuickSettings && !justToggled && (
-          <small className="absolute flex items-center top-0 mr-4 right-0 h-full w-full my-auto group-hover:right-full opacity-0 group-hover:opacity-100 text-white transition-all delay-200">
+          <small className="absolute flex items-center top-0 mr-2 right-0 h-full w-fit text-nowrap font-bold my-auto group-hover:right-full opacity-0 group-hover:opacity-100 group-hover:bg-black/30 p-1 rounded-md text-white transition-all">
             Press Q
           </small>
         )}
diff --git a/frontend/src/components/Navigation/Sidebar.tsx b/frontend/src/components/Navigation/Sidebar.tsx
index 8ae95bd..de444ae 100644
--- a/frontend/src/components/Navigation/Sidebar.tsx
+++ b/frontend/src/components/Navigation/Sidebar.tsx
@@ -48,7 +48,7 @@ const Sidebar: React.FC<SideBarProps> = ({ extraClasses = "" }) => {
   const handleSideBar = () => {
     setShowSideBar(!showSideBar);
     setJustToggled(true);
-    setTimeout(() => setJustToggled(false), 750);
+    setTimeout(() => setJustToggled(false), 200);
   };
 
   // Keyboard shortcut to toggle sidebar
@@ -102,7 +102,7 @@ const Sidebar: React.FC<SideBarProps> = ({ extraClasses = "" }) => {
         <SidebarIcon className="h-[2vw] w-[2vw]" />
 
         {!showSideBar && !justToggled && (
-          <small className="absolute flex items-center top-0 ml-4 left-0 h-full w-full my-auto group-hover:left-full opacity-0 group-hover:opacity-100 text-white transition-all delay-200">
+          <small className="absolute flex items-center top-0 ml-2 left-0 h-full my-auto w-fit text-nowrap font-bold my-auto group-hover:left-full opacity-0 group-hover:opacity-100 group-hover:bg-black/30 p-1 rounded-md text-white transition-all">
             Press S
           </small>
         )}
diff --git a/frontend/src/components/Stream/ChatPanel.tsx b/frontend/src/components/Stream/ChatPanel.tsx
index 5a2a9bb..5697591 100644
--- a/frontend/src/components/Stream/ChatPanel.tsx
+++ b/frontend/src/components/Stream/ChatPanel.tsx
@@ -116,7 +116,7 @@ const ChatPanel: React.FC<ChatPanelProps> = ({
   const toggleChat = () => {
     setShowChat(!showChat);
     setJustToggled(true);
-    setTimeout(() => setJustToggled(false), 750);
+    setTimeout(() => setJustToggled(false), 200);
   };
 
   const sendChat = () => {
@@ -154,7 +154,7 @@ const ChatPanel: React.FC<ChatPanelProps> = ({
       >
         {showChat ? <ArrowRightFromLineIcon /> : <ArrowLeftFromLineIcon />}
 
-        <small className={`absolute ${showChat ? justToggled ? "left-0 group-hover:-left-[4vw] group-hover:bg-white/10" : "right-0 group-hover:-right-[5vw] group-hover:bg-red-500/80" : justToggled ? "right-0 group-hover:-right-[5vw] group-hover:bg-red-500/80" : "left-0 group-hover:-left-[4vw] group-hover:bg-white/10"} p-1 rounded-md w-fit opacity-0 group-hover:opacity-100 text-white transition-all`}>
+        <small className={`absolute ${showChat ? justToggled ? "left-0 group-hover:-left-[5vw] group-hover:bg-white/10" : "right-0 group-hover:-right-[5vw] group-hover:bg-red-500/80" : justToggled ? "right-0 group-hover:-right-[5vw] group-hover:bg-red-500/80" : "left-0 group-hover:-left-[5vw] group-hover:bg-white/10"} p-1 rounded-md w-fit text-nowrap font-bold opacity-0 group-hover:opacity-100 text-white transition-all`}>
           Press C
         </small>
       </button>