diff --git a/packages/bruno-app/src/components/ApiSpecPanel/FileEditor/CodeEditor/StyledWrapper.js b/packages/bruno-app/src/components/ApiSpecPanel/FileEditor/CodeEditor/StyledWrapper.js
index 320a8f6c1..57be41098 100644
--- a/packages/bruno-app/src/components/ApiSpecPanel/FileEditor/CodeEditor/StyledWrapper.js
+++ b/packages/bruno-app/src/components/ApiSpecPanel/FileEditor/CodeEditor/StyledWrapper.js
@@ -55,10 +55,10 @@ const StyledWrapper = styled.div`
   }
 
   .cm-variable-valid {
-    color: green;
+    color: ${(props) => props.theme.codemirror.variable.valid};
   }
   .cm-variable-invalid {
-    color: red;
+    color: ${(props) => props.theme.codemirror.variable.invalid};
   }
 `;
 
diff --git a/packages/bruno-app/src/components/CodeEditor/StyledWrapper.js b/packages/bruno-app/src/components/CodeEditor/StyledWrapper.js
index c587661a7..314eaf371 100644
--- a/packages/bruno-app/src/components/CodeEditor/StyledWrapper.js
+++ b/packages/bruno-app/src/components/CodeEditor/StyledWrapper.js
@@ -36,12 +36,12 @@ const StyledWrapper = styled.div`
 
   /* Style line numbers when there's a lint issue */
   .CodeMirror-lint-line-error .CodeMirror-linenumber {
-    color: #d32f2f !important;
+    color: ${(props) => props.theme.colors.text.danger} !important;
     text-decoration: underline;
   }
 
   .CodeMirror-lint-line-warning .CodeMirror-linenumber {
-    color: #f57c00 !important;
+    color: ${(props) => props.theme.colors.text.warning} !important;
     text-decoration: underline;
   }
 
@@ -138,10 +138,10 @@ const StyledWrapper = styled.div`
 
   /* Variable validation colors */
   .cm-variable-valid {
-    color: #5fad89 !important; /* Soft sage */
+    color: ${(props) => props.theme.codemirror.variable.valid} !important;
   }
   .cm-variable-invalid {
-    color: #d17b7b !important; /* Soft coral */
+    color: ${(props) => props.theme.codemirror.variable.invalid} !important;
   }
 
   .CodeMirror-search-hint {
diff --git a/packages/bruno-app/src/components/EditableTable/StyledWrapper.js b/packages/bruno-app/src/components/EditableTable/StyledWrapper.js
index 98b307d97..f980560ed 100644
--- a/packages/bruno-app/src/components/EditableTable/StyledWrapper.js
+++ b/packages/bruno-app/src/components/EditableTable/StyledWrapper.js
@@ -83,7 +83,6 @@ const StyledWrapper = styled.div`
   }
 
   .tooltip-mod {
-    font-size: 11px !important;
     max-width: 200px !important;
   }
 
diff --git a/packages/bruno-app/src/components/Environments/EnvironmentSettings/EnvironmentList/EnvironmentDetails/EnvironmentVariables/StyledWrapper.js b/packages/bruno-app/src/components/Environments/EnvironmentSettings/EnvironmentList/EnvironmentDetails/EnvironmentVariables/StyledWrapper.js
index b356ab017..4b062d3d3 100644
--- a/packages/bruno-app/src/components/Environments/EnvironmentSettings/EnvironmentList/EnvironmentDetails/EnvironmentVariables/StyledWrapper.js
+++ b/packages/bruno-app/src/components/Environments/EnvironmentSettings/EnvironmentList/EnvironmentDetails/EnvironmentVariables/StyledWrapper.js
@@ -76,7 +76,6 @@ const Wrapper = styled.div`
   }
 
   .tooltip-mod {
-    font-size: 11px !important;
     max-width: 200px !important;
   }
 
diff --git a/packages/bruno-app/src/components/FilePickerEditor/StyledWrapper.js b/packages/bruno-app/src/components/FilePickerEditor/StyledWrapper.js
index 418b3ca9c..959f06f32 100644
--- a/packages/bruno-app/src/components/FilePickerEditor/StyledWrapper.js
+++ b/packages/bruno-app/src/components/FilePickerEditor/StyledWrapper.js
@@ -4,6 +4,8 @@ const StyledWrapper = styled.div`
   display: flex;
   align-items: center;
   width: 100%;
+  overflow: hidden;
+  min-width: 0;
 
   .file-picker-btn {
     display: flex;
@@ -18,6 +20,9 @@ const StyledWrapper = styled.div`
     transition: color 0.15s ease;
     font-size: 12px;
     white-space: nowrap;
+    overflow: hidden;
+    min-width: 0;
+    max-width: 100%;
 
     &:hover {
       color: ${(props) => props.theme.text} !important;
@@ -30,6 +35,7 @@ const StyledWrapper = styled.div`
 
     &.icon-only {
       padding: 4px;
+      flex-shrink: 0;
     }
 
     &.icon-right {
@@ -39,6 +45,9 @@ const StyledWrapper = styled.div`
 
     span {
       line-height: 1;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      min-width: 0;
     }
 
     .label {
diff --git a/packages/bruno-app/src/components/ManageWorkspace/index.js b/packages/bruno-app/src/components/ManageWorkspace/index.js
index f0cd0cd4c..277df57d0 100644
--- a/packages/bruno-app/src/components/ManageWorkspace/index.js
+++ b/packages/bruno-app/src/components/ManageWorkspace/index.js
@@ -14,6 +14,7 @@ import DeleteWorkspace from './DeleteWorkspace';
 import StyledWrapper from './StyledWrapper';
 import MenuDropdown from 'ui/MenuDropdown/index';
 import Button from 'ui/Button';
+import { getRevealInFolderLabel } from 'utils/common/platform';
 
 const ManageWorkspace = () => {
   const dispatch = useDispatch();
@@ -133,7 +134,7 @@ const ManageWorkspace = () => {
                       onClick={() => handleShowInFolder(workspace)}
                     >
                       <IconFolder size={14} strokeWidth={1.5} />
-                      <span>Show in folder</span>
+                      <span>{getRevealInFolderLabel()}</span>
                     </button>
                   )}
                   {!isDefault && (
diff --git a/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/AdditionalParams/StyledWrapper.js b/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/AdditionalParams/StyledWrapper.js
index a9173ed0d..6b6ef3620 100644
--- a/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/AdditionalParams/StyledWrapper.js
+++ b/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/AdditionalParams/StyledWrapper.js
@@ -19,18 +19,18 @@ const StyledWrapper = styled.div`
       border: none !important;
       border-bottom: none !important;
       margin-right: 0;
-      
+
       &:hover {
         background-color: ${(props) => rgba(props.theme.primary.solid, 0.1)};
       }
-      
+
       &.active {
         background-color: ${(props) => {
           return props.theme.mode === 'dark'
             ? rgba(props.theme.primary.solid, 0.2)
             : rgba(props.theme.primary.solid, 0.1);
         }};
-        color: ${(props) => props.theme.primary.solid} !important;
+        color: ${(props) => props.theme.primary.text} !important;
         border-bottom: none !important;
         font-weight: normal !important;
       }
@@ -57,7 +57,7 @@ const StyledWrapper = styled.div`
       padding: 6px 10px;
     }
   }
-  
+
   .additional-parameter-sends-in-selector {
     select {
       height: 32px;
@@ -65,14 +65,14 @@ const StyledWrapper = styled.div`
       border: 1px solid ${(props) => props.theme.input.border};
       border-radius: 4px;
       padding: 0 8px;
-      
+
       &:focus {
         outline: none;
         border-color: ${(props) => props.theme.primary.solid};
       }
     }
   }
-  
+
   .add-additional-param-actions {
     &:hover {
       color: ${(props) => props.theme.primary.solid};
diff --git a/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/AuthorizationCode/StyledWrapper.js b/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/AuthorizationCode/StyledWrapper.js
index 02560b8d1..b2f9adbb2 100644
--- a/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/AuthorizationCode/StyledWrapper.js
+++ b/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/AuthorizationCode/StyledWrapper.js
@@ -7,7 +7,7 @@ const Wrapper = styled.div`
   }
 
   .oauth2-icon {
-    color: ${(props) => props.theme.primary.solid};
+    color: ${(props) => props.theme.primary.text};
   }
 
   label {
diff --git a/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/ClientCredentials/StyledWrapper.js b/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/ClientCredentials/StyledWrapper.js
index fb40602d5..4ed2520f5 100644
--- a/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/ClientCredentials/StyledWrapper.js
+++ b/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/ClientCredentials/StyledWrapper.js
@@ -7,7 +7,7 @@ const Wrapper = styled.div`
   }
 
   .oauth2-icon {
-    color: ${(props) => props.theme.primary.solid};
+    color: ${(props) => props.theme.primary.text};
   }
 
   label {
diff --git a/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/GrantTypeSelector/StyledWrapper.js b/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/GrantTypeSelector/StyledWrapper.js
index dea907702..b53987535 100644
--- a/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/GrantTypeSelector/StyledWrapper.js
+++ b/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/GrantTypeSelector/StyledWrapper.js
@@ -7,7 +7,7 @@ const Wrapper = styled.div`
   }
 
   .oauth2-icon {
-    color: ${(props) => props.theme.primary.solid};
+    color: ${(props) => props.theme.primary.text};
   }
 
   font-size: ${(props) => props.theme.font.size.base};
diff --git a/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/Implicit/StyledWrapper.js b/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/Implicit/StyledWrapper.js
index be76824c8..851594cac 100644
--- a/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/Implicit/StyledWrapper.js
+++ b/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/Implicit/StyledWrapper.js
@@ -7,7 +7,7 @@ const Wrapper = styled.div`
   }
 
   .oauth2-icon {
-    color: ${(props) => props.theme.primary.solid};
+    color: ${(props) => props.theme.primary.text};
   }
 
   label {
@@ -62,7 +62,7 @@ const Wrapper = styled.div`
       padding: 0.2rem 0.6rem !important;
     }
   }
-  
+
   .checkbox-label {
     color: ${(props) => props.theme.colors.text.primary};
     user-select: none;
diff --git a/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/Oauth2ActionButtons/index.js b/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/Oauth2ActionButtons/index.js
index 033c74e8b..1591a5be6 100644
--- a/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/Oauth2ActionButtons/index.js
+++ b/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/Oauth2ActionButtons/index.js
@@ -133,7 +133,7 @@ const Oauth2ActionButtons = ({ item, request, collection, url: accessTokenUrl, c
   };
 
   return (
-    <div className="flex flex-row gap-4 mt-4">
+    <div className="flex flex-row gap-2 mt-4">
       <Button
         size="sm"
         color="secondary"
@@ -171,6 +171,7 @@ const Oauth2ActionButtons = ({ item, request, collection, url: accessTokenUrl, c
       <Button
         size="sm"
         color="secondary"
+        variant="ghost"
         onClick={handleClearCache}
       >
         Clear Cache
diff --git a/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/PasswordCredentials/StyledWrapper.js b/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/PasswordCredentials/StyledWrapper.js
index 02560b8d1..b2f9adbb2 100644
--- a/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/PasswordCredentials/StyledWrapper.js
+++ b/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/PasswordCredentials/StyledWrapper.js
@@ -7,7 +7,7 @@ const Wrapper = styled.div`
   }
 
   .oauth2-icon {
-    color: ${(props) => props.theme.primary.solid};
+    color: ${(props) => props.theme.primary.text};
   }
 
   label {
diff --git a/packages/bruno-app/src/components/RequestPane/GraphQLRequestPane/index.js b/packages/bruno-app/src/components/RequestPane/GraphQLRequestPane/index.js
index 6bc8781e5..c1da54337 100644
--- a/packages/bruno-app/src/components/RequestPane/GraphQLRequestPane/index.js
+++ b/packages/bruno-app/src/components/RequestPane/GraphQLRequestPane/index.js
@@ -20,6 +20,7 @@ import GraphQLSchemaActions from '../GraphQLSchemaActions/index';
 import HeightBoundContainer from 'ui/HeightBoundContainer';
 import Settings from 'components/RequestPane/Settings';
 import ResponsiveTabs from 'ui/ResponsiveTabs';
+import AuthMode from '../Auth/AuthMode/index';
 
 const TAB_CONFIG = [
   { key: 'query', label: 'Query' },
@@ -134,11 +135,15 @@ const GraphQLRequestPane = ({ item, collection, onSchemaLoad, toggleDocs, handle
     return <div className="pb-4 px-4">An error occurred!</div>;
   }
 
-  const rightContent = (
+  const rightContent = requestPaneTab === 'auth' ? (
+    <div ref={schemaActionsRef} className="flex flex-grow justify-start items-center">
+      <AuthMode item={item} collection={collection} />
+    </div>
+  ) : requestPaneTab === 'query' ? (
     <div ref={schemaActionsRef}>
       <GraphQLSchemaActions item={item} collection={collection} onSchemaLoad={setSchema} toggleDocs={toggleDocs} />
     </div>
-  );
+  ) : null;
 
   return (
     <div className="flex flex-col h-full relative">
@@ -147,7 +152,7 @@ const GraphQLRequestPane = ({ item, collection, onSchemaLoad, toggleDocs, handle
         activeTab={requestPaneTab}
         onTabSelect={selectTab}
         rightContent={rightContent}
-        rightContentRef={schemaActionsRef}
+        rightContentRef={rightContent ? schemaActionsRef : null}
       />
 
       <section className={classnames('flex w-full flex-1 mt-4')}>
diff --git a/packages/bruno-app/src/components/RequestPane/GrpcQueryUrl/ProtoFileDropdown/index.js b/packages/bruno-app/src/components/RequestPane/GrpcQueryUrl/ProtoFileDropdown/index.js
index d507d238e..f70bc8f02 100644
--- a/packages/bruno-app/src/components/RequestPane/GrpcQueryUrl/ProtoFileDropdown/index.js
+++ b/packages/bruno-app/src/components/RequestPane/GrpcQueryUrl/ProtoFileDropdown/index.js
@@ -150,7 +150,7 @@ const ProtoFileDropdown = ({
               <div className="proto-file-dropdown-mode-controls">
                 <span>Mode</span>
                 <div className="proto-file-dropdown-mode-options">
-                  <span className={`proto-file-dropdown-mode-option ${!isReflectionMode ? 'proto-file-dropdown-mode-option--active' : ''}`} style={{ color: !isReflectionMode ? theme.primary.solid : undefined }}>
+                  <span className={`proto-file-dropdown-mode-option ${!isReflectionMode ? 'proto-file-dropdown-mode-option--active' : ''}`} style={{ color: !isReflectionMode ? theme.primary.text : undefined }}>
                     Proto File
                   </span>
                   <ToggleSwitch
@@ -159,7 +159,7 @@ const ProtoFileDropdown = ({
                     size="2xs"
                     activeColor={theme.primary.solid}
                   />
-                  <span className={`proto-file-dropdown-mode-option ${isReflectionMode ? 'proto-file-dropdown-mode-option--active' : ''}`} style={{ color: isReflectionMode ? theme.primary.solid : undefined }}>
+                  <span className={`proto-file-dropdown-mode-option ${isReflectionMode ? 'proto-file-dropdown-mode-option--active' : ''}`} style={{ color: isReflectionMode ? theme.primary.text : undefined }}>
                     Reflection
                   </span>
                 </div>
diff --git a/packages/bruno-app/src/components/RequestPane/QueryEditor/StyledWrapper.js b/packages/bruno-app/src/components/RequestPane/QueryEditor/StyledWrapper.js
index 5224331bb..df8c80407 100644
--- a/packages/bruno-app/src/components/RequestPane/QueryEditor/StyledWrapper.js
+++ b/packages/bruno-app/src/components/RequestPane/QueryEditor/StyledWrapper.js
@@ -60,10 +60,10 @@ const StyledWrapper = styled.div`
 
   /* Variable validation colors */
   .cm-variable-valid {
-    color: #5fad89 !important; /* Soft sage */
+    color: ${(props) => props.theme.codemirror.variable.valid};
   }
   .cm-variable-invalid {
-    color: #d17b7b !important; /* Soft coral */
+    color: ${(props) => props.theme.codemirror.variable.invalid};
   }
 
 
diff --git a/packages/bruno-app/src/components/RequestPane/WSSettingsPane/StyledWrapper.js b/packages/bruno-app/src/components/RequestPane/WSSettingsPane/StyledWrapper.js
index c1cd7afd1..985575708 100644
--- a/packages/bruno-app/src/components/RequestPane/WSSettingsPane/StyledWrapper.js
+++ b/packages/bruno-app/src/components/RequestPane/WSSettingsPane/StyledWrapper.js
@@ -13,7 +13,6 @@ const StyledWrapper = styled.div`
   }
 
   .tooltip-mod {
-    font-size: ${(props) => props.theme.font.size.xs} !important;
     width: 150px !important;
 
     & ul {
diff --git a/packages/bruno-app/src/components/ResponsePane/QueryResponse/index.js b/packages/bruno-app/src/components/ResponsePane/QueryResponse/index.js
index f0e82e507..bb6c2ae39 100644
--- a/packages/bruno-app/src/components/ResponsePane/QueryResponse/index.js
+++ b/packages/bruno-app/src/components/ResponsePane/QueryResponse/index.js
@@ -41,6 +41,7 @@ const QueryResponse = ({
               setSelectedTab((prev) => prev === 'editor' ? 'preview' : 'editor');
             }}
             selectedTab={selectedTab}
+            isActiveTab={true}
           />
         </div>
       )}
diff --git a/packages/bruno-app/src/components/ResponsePane/QueryResult/QueryResultTypeSelector/StyledWrapper.js b/packages/bruno-app/src/components/ResponsePane/QueryResult/QueryResultTypeSelector/StyledWrapper.js
index 5a3bbe437..cc3d07006 100644
--- a/packages/bruno-app/src/components/ResponsePane/QueryResult/QueryResultTypeSelector/StyledWrapper.js
+++ b/packages/bruno-app/src/components/ResponsePane/QueryResult/QueryResultTypeSelector/StyledWrapper.js
@@ -19,7 +19,7 @@ const StyledWrapper = styled.div`
   }
 
   .active {
-    color: ${(props) => props.theme.colors.text.yellow};
+    color: ${(props) => props.theme.primary.text};
   }
 
   .icon-muted {
diff --git a/packages/bruno-app/src/components/ResponsePane/Timeline/TimelineItem/StyledWrapper.js b/packages/bruno-app/src/components/ResponsePane/Timeline/TimelineItem/StyledWrapper.js
index 3bb9ff71e..e570bded2 100644
--- a/packages/bruno-app/src/components/ResponsePane/Timeline/TimelineItem/StyledWrapper.js
+++ b/packages/bruno-app/src/components/ResponsePane/Timeline/TimelineItem/StyledWrapper.js
@@ -77,7 +77,7 @@ const StyledWrapper = styled.div`
 
     &--active {
       color: ${(props) => props.theme.tabs.active.color};
-      
+
       &:after {
         content: '';
         position: absolute;
@@ -104,7 +104,7 @@ const StyledWrapper = styled.div`
     .section-header {
       cursor: pointer;
       pre {
-        color: ${(props) => rgba(props.theme.primary.solid, 0.8)};
+        color: ${(props) => rgba(props.theme.primary.text, 0.8)};
       }
     }
   }
diff --git a/packages/bruno-app/src/components/RunnerResults/RunConfigurationPanel/StyledWrapper.jsx b/packages/bruno-app/src/components/RunnerResults/RunConfigurationPanel/StyledWrapper.jsx
index 04f8b1101..1fded6cb9 100644
--- a/packages/bruno-app/src/components/RunnerResults/RunConfigurationPanel/StyledWrapper.jsx
+++ b/packages/bruno-app/src/components/RunnerResults/RunConfigurationPanel/StyledWrapper.jsx
@@ -87,7 +87,7 @@ const StyledWrapper = styled.div`
       background-color: ${(props) => props.theme.sidebar.bg};
       border: 1px dashed ${(props) => props.theme.sidebar.dragbar};
       transform: scale(0.98);
-      box-shadow: 0 3px 8px rgba(0, 0, 0, 0.12);
+      box-shadow: ${(props) => props.theme.shadow.md};
       z-index: 5;
     }
 
diff --git a/packages/bruno-app/src/components/RunnerResults/StyledWrapper.js b/packages/bruno-app/src/components/RunnerResults/StyledWrapper.js
index 5d6829291..b9750b23b 100644
--- a/packages/bruno-app/src/components/RunnerResults/StyledWrapper.js
+++ b/packages/bruno-app/src/components/RunnerResults/StyledWrapper.js
@@ -2,7 +2,6 @@ import styled from 'styled-components';
 
 const Wrapper = styled.div`
   .textbox {
-    border: 1px solid #ccc;
     padding: 0.2rem 0.5rem;
     box-shadow: none;
     border-radius: 0px;
@@ -49,6 +48,28 @@ const Wrapper = styled.div`
     color: ${(props) => props.theme.colors.text.muted};
   }
 
+  .text-muted {
+    color: ${(props) => props.theme.colors.text.muted};
+  }
+
+  .text-green {
+    color: ${(props) => props.theme.colors.text.green};
+  }
+
+  .text-subtext0 {
+    color: ${(props) => props.theme.colors.text.subtext0};
+  }
+
+  .text-subtext1 {
+    color: ${(props) => props.theme.colors.text.subtext1};
+  }
+
+  .hover-bg-surface {
+    &:hover {
+      background-color: ${(props) => props.theme.background.surface1};
+    }
+  }
+
   .button-sm {
     font-size: ${(props) => props.theme.font.size.sm};
   }
@@ -60,7 +81,7 @@ const Wrapper = styled.div`
   .filter-bar {
     display: flex;
     align-items: stretch;
-    border-radius: ${(props) => props.theme.border.radius.lg};
+    border-radius: ${(props) => props.theme.border.radius.base};
     border: 1px solid ${(props) => props.theme.border.border0};
     max-height: 35px;
     flex-shrink: 0;
@@ -70,15 +91,15 @@ const Wrapper = styled.div`
       display: flex;
       align-items: center;
       padding: 0.5rem 0.75rem;
-      border-top-left-radius: ${(props) => props.theme.border.radius.lg};
-      border-bottom-left-radius: ${(props) => props.theme.border.radius.lg};
-      background-color: ${(props) => props.theme.background.surface0};
+      border-top-left-radius: ${(props) => props.theme.border.radius.base};
+      border-bottom-left-radius: ${(props) => props.theme.border.radius.base};
+      background-color: ${(props) => props.theme.background.mantle};
 
       span {
         font-family: Inter, sans-serif;
         font-weight: 400;
         font-size: ${(props) => props.theme.font.size.sm};
-        color: ${(props) => props.theme.colors.text.subtext1};
+        color: ${(props) => props.theme.colors.text.text};
       }
     }
 
@@ -87,8 +108,8 @@ const Wrapper = styled.div`
       align-items: center;
       gap: 1.25rem;
       padding: 0.5rem 0.75rem 0 0.75rem;
-      border-top-right-radius: ${(props) => props.theme.border.radius.lg};
-      border-bottom-right-radius: ${(props) => props.theme.border.radius.lg};
+      border-top-right-radius: ${(props) => props.theme.border.radius.base};
+      border-bottom-right-radius: ${(props) => props.theme.border.radius.base};
       background: transparent;
     }
   }
diff --git a/packages/bruno-app/src/components/RunnerResults/index.jsx b/packages/bruno-app/src/components/RunnerResults/index.jsx
index bdd64a6c1..622555145 100644
--- a/packages/bruno-app/src/components/RunnerResults/index.jsx
+++ b/packages/bruno-app/src/components/RunnerResults/index.jsx
@@ -269,7 +269,7 @@ export default function RunnerResults({ collection }) {
             <div className="mt-6">
               You have <span className="font-medium">{totalRequestsInCollection}</span> requests in this collection.
               {isCollectionLoading && (
-                <span className="ml-2 text-gray-500">
+                <span className="ml-2 text-muted">
                   (Loading...)
                 </span>
               )}
@@ -403,10 +403,10 @@ export default function RunnerResults({ collection }) {
             <div className="pb-2 text-xs flex flex-row gap-1">
               Tags:
               <div className="flex flex-row items-center gap-x-2">
-                <div className="text-green-500">
+                <div className="text-green">
                   {tags.include.join(', ')}
                 </div>
-                <div className="text-gray-500">
+                <div className="text-muted">
                   {tags.exclude.join(', ')}
                 </div>
               </div>
@@ -458,7 +458,7 @@ export default function RunnerResults({ collection }) {
                       )}
                     </div>
                     {tagsEnabled && areTagsAdded && item?.tags?.length > 0 && (
-                      <div className="pl-7 text-xs text-gray-500">
+                      <div className="pl-7 text-xs text-muted">
                         Tags: {item.tags.filter((t) => tags.include.includes(t)).join(', ')}
                       </div>
                     )}
@@ -571,7 +571,7 @@ export default function RunnerResults({ collection }) {
                 </div>
                 <button
                   onClick={() => setSelectedItem(null)}
-                  className="p-1 rounded hover:bg-gray-100 dark:hover:bg-gray-800 transition-colors cursor-pointer flex items-center justify-center"
+                  className="p-1 rounded hover-bg-surface transition-colors cursor-pointer flex items-center justify-center"
                   title="Close"
                   aria-label="Close response view"
                 >
@@ -584,10 +584,10 @@ export default function RunnerResults({ collection }) {
         ) : (
           <div className="flex flex-1 w-[50%] overflow-y-auto">
             <div className="flex flex-col w-full h-full items-center justify-center text-center">
-              <div className="mb-4 text-gray-400 dark:text-gray-500">
+              <div className="mb-4 text-subtext0">
                 <IconExternalLink size={64} strokeWidth={1.5} />
               </div>
-              <p className="text-gray-600 dark:text-gray-400">
+              <p className="text-subtext1">
                 Click on the status code to view the response
               </p>
             </div>
diff --git a/packages/bruno-app/src/components/SensitiveFieldWarning/StyledWrapper.js b/packages/bruno-app/src/components/SensitiveFieldWarning/StyledWrapper.js
index f1df82fd7..29129f1bb 100644
--- a/packages/bruno-app/src/components/SensitiveFieldWarning/StyledWrapper.js
+++ b/packages/bruno-app/src/components/SensitiveFieldWarning/StyledWrapper.js
@@ -2,7 +2,6 @@ import styled from 'styled-components';
 
 const Wrapper = styled.div`
   .tooltip-mod {
-    font-size: ${(props) => props.theme.font.size.xs} !important;
     width: 150px !important;
   }
 
diff --git a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/index.js b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/index.js
index 8ba2861ff..e3f4e78c8 100644
--- a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/index.js
+++ b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/index.js
@@ -49,6 +49,7 @@ import { isTabForItemActive as isTabForItemActiveSelector, isTabForItemPresent a
 import { isEqual } from 'lodash';
 import { calculateDraggedItemNewPathname, getInitialExampleName, findParentItemInCollection } from 'utils/collections/index';
 import { sortByNameThenSequence } from 'utils/common/index';
+import { getRevealInFolderLabel } from 'utils/common/platform';
 import CreateExampleModal from 'components/ResponseExample/CreateExampleModal';
 import { openDevtoolsAndSwitchToTerminal } from 'utils/terminal';
 import ActionIcon from 'ui/ActionIcon';
@@ -345,12 +346,6 @@ const CollectionItem = ({ item, collectionUid, collectionPathname, searchText })
         leftSection: IconEdit,
         label: 'Rename',
         onClick: () => setRenameItemModalOpen(true)
-      },
-      {
-        id: 'show-in-folder',
-        leftSection: IconFolder,
-        label: 'Show in Folder',
-        onClick: handleShowInFolder
       }
     );
     if (!isFolder && isItemARequest(item) && !(item.type === 'http-request' || item.type === 'graphql-request')) {
@@ -382,6 +377,15 @@ const CollectionItem = ({ item, collectionUid, collectionPathname, searchText })
       });
     }
 
+    items.push(
+      {
+        id: 'show-in-folder',
+        leftSection: IconFolder,
+        label: getRevealInFolderLabel(),
+        onClick: handleShowInFolder
+      }
+    );
+
     items.push({ id: 'separator-1', type: 'divider' });
 
     items.push({
diff --git a/packages/bruno-app/src/components/Sidebar/Collections/Collection/index.js b/packages/bruno-app/src/components/Sidebar/Collections/Collection/index.js
index e5438fc1a..049de9eca 100644
--- a/packages/bruno-app/src/components/Sidebar/Collections/Collection/index.js
+++ b/packages/bruno-app/src/components/Sidebar/Collections/Collection/index.js
@@ -44,6 +44,7 @@ import ShareCollection from 'components/ShareCollection/index';
 import GenerateDocumentation from './GenerateDocumentation';
 import { CollectionItemDragPreview } from './CollectionItem/CollectionItemDragPreview/index';
 import { sortByNameThenSequence } from 'utils/common/index';
+import { getRevealInFolderLabel } from 'utils/common/platform';
 import { openDevtoolsAndSwitchToTerminal } from 'utils/terminal';
 import ActionIcon from 'ui/ActionIcon';
 import MenuDropdown from 'ui/MenuDropdown';
@@ -360,7 +361,7 @@ const Collection = ({ collection, searchText }) => {
     {
       id: 'show-in-folder',
       leftSection: IconFolder,
-      label: 'Show in File Explorer',
+      label: getRevealInFolderLabel(),
       onClick: handleShowInFolder
     },
     {
diff --git a/packages/bruno-app/src/components/Sidebar/ImportCollection/index.js b/packages/bruno-app/src/components/Sidebar/ImportCollection/index.js
index c98131bfb..9ad1d139f 100644
--- a/packages/bruno-app/src/components/Sidebar/ImportCollection/index.js
+++ b/packages/bruno-app/src/components/Sidebar/ImportCollection/index.js
@@ -10,6 +10,7 @@ import { isWSDLCollection } from 'utils/importers/wsdl-collection';
 import { isBrunoCollection } from 'utils/importers/bruno-collection';
 import { isOpenCollection } from 'utils/importers/opencollection';
 import FullscreenLoader from './FullscreenLoader/index';
+import { useTheme } from 'providers/Theme';
 
 const convertFileToObject = async (file) => {
   const text = await file.text();
@@ -35,6 +36,7 @@ const convertFileToObject = async (file) => {
 };
 
 const ImportCollection = ({ onClose, handleSubmit }) => {
+  const { theme } = useTheme();
   const [isLoading, setIsLoading] = useState(false);
   const [dragActive, setDragActive] = useState(false);
   const fileInputRef = useRef(null);
@@ -155,8 +157,9 @@ const ImportCollection = ({ onClose, handleSubmit }) => {
               <p className="text-gray-600 dark:text-gray-300 mb-2">
                 Drop file to import or{' '}
                 <button
-                  className="text-blue-500 underline cursor-pointer"
+                  className="underline cursor-pointer"
                   onClick={handleBrowseFiles}
+                  style={{ color: theme.textLink }}
                 >
                   choose a file
                 </button>
diff --git a/packages/bruno-app/src/components/Sidebar/ImportCollectionLocation/index.js b/packages/bruno-app/src/components/Sidebar/ImportCollectionLocation/index.js
index 0e295e055..77648f6c6 100644
--- a/packages/bruno-app/src/components/Sidebar/ImportCollectionLocation/index.js
+++ b/packages/bruno-app/src/components/Sidebar/ImportCollectionLocation/index.js
@@ -163,7 +163,7 @@ const ImportCollectionLocation = ({ onClose, handleSubmit, rawData, format }) =>
   return (
     <StyledWrapper>
       <Modal
-        size="sm"
+        size="md"
         title="Import Collection"
         confirmText="Import"
         handleConfirm={onSubmit}
diff --git a/packages/bruno-app/src/components/Tabs/StyledWrapper.js b/packages/bruno-app/src/components/Tabs/StyledWrapper.js
new file mode 100644
index 000000000..6a870319c
--- /dev/null
+++ b/packages/bruno-app/src/components/Tabs/StyledWrapper.js
@@ -0,0 +1,37 @@
+import styled from 'styled-components';
+
+const StyledWrapper = styled.div`
+  .tabs-list {
+    display: inline-flex;
+    height: 2rem;
+    width: fit-content;
+    justify-content: center;
+    gap: 0.25rem;
+  }
+
+  .tab-trigger {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    border-radius: 4px;
+    padding: 8px;
+    font-size: 0.75rem;
+    white-space: nowrap;
+    cursor: pointer;
+    border: 1px solid transparent;
+    background: transparent;
+    color: ${(props) => props.theme.tabs.secondary.inactive.color};
+    transition: all 0.15s ease;
+
+    &:hover {
+      background: ${(props) => props.theme.tabs.secondary.inactive.bg};
+    }
+
+    &.active {
+      background: ${(props) => props.theme.tabs.secondary.active.bg};
+      color: ${(props) => props.theme.tabs.secondary.active.color};
+    }
+  }
+`;
+
+export default StyledWrapper;
diff --git a/packages/bruno-app/src/components/Tabs/index.js b/packages/bruno-app/src/components/Tabs/index.js
index 97d5219b0..15f4890be 100644
--- a/packages/bruno-app/src/components/Tabs/index.js
+++ b/packages/bruno-app/src/components/Tabs/index.js
@@ -1,42 +1,29 @@
 import React, { createContext, useContext } from 'react';
-import { useTheme } from 'providers/Theme';
+import classnames from 'classnames';
+import StyledWrapper from './StyledWrapper';
 
 const TabsContext = createContext();
 
 export const Tabs = ({ value, onValueChange, children, className = '' }) => {
   return (
     <TabsContext.Provider value={{ value, onValueChange }}>
-      <div className={`flex flex-col h-full flex-1 ${className}`}>{children}</div>
+      <StyledWrapper className={`flex flex-col h-full flex-1 ${className}`}>{children}</StyledWrapper>
     </TabsContext.Provider>
   );
 };
 
 export const TabsList = ({ children, className = '' }) => {
-  const { theme } = useTheme();
-
-  return (
-    <div
-      className={`inline-flex h-8 w-fit justify-center rounded-md p-0.5 gap-[2px] ${className}`}
-      style={{ background: theme.tabs.secondary.inactive.bg }}
-    >
-      {children}
-    </div>
-  );
+  return <div className={`tabs-list ${className}`}>{children}</div>;
 };
 
 export const TabsTrigger = ({ value: triggerValue, children, className = '' }) => {
   const { value, onValueChange } = useContext(TabsContext);
-  const { theme } = useTheme();
   const isActive = value === triggerValue;
 
   return (
     <button
       onClick={() => onValueChange(triggerValue)}
-      className={`inline-flex items-center justify-center rounded-[4px] p-[8px] text-xs whitespace-nowrap transition-all cursor-pointer border border-transparent hover:opacity-90 ${className}`}
-      style={{
-        background: isActive ? theme.tabs.secondary.active.bg : 'transparent',
-        color: isActive ? theme.tabs.secondary.active.color : theme.tabs.secondary.inactive.color
-      }}
+      className={classnames('tab-trigger', className, { active: isActive })}
     >
       {children}
     </button>
diff --git a/packages/bruno-app/src/components/WorkspaceHome/WorkspaceEnvironments/EnvironmentList/EnvironmentDetails/EnvironmentVariables/StyledWrapper.js b/packages/bruno-app/src/components/WorkspaceHome/WorkspaceEnvironments/EnvironmentList/EnvironmentDetails/EnvironmentVariables/StyledWrapper.js
index c726b83b7..fb9a1d2e7 100644
--- a/packages/bruno-app/src/components/WorkspaceHome/WorkspaceEnvironments/EnvironmentList/EnvironmentDetails/EnvironmentVariables/StyledWrapper.js
+++ b/packages/bruno-app/src/components/WorkspaceHome/WorkspaceEnvironments/EnvironmentList/EnvironmentDetails/EnvironmentVariables/StyledWrapper.js
@@ -75,7 +75,6 @@ const Wrapper = styled.div`
   }
 
   .tooltip-mod {
-    font-size: 11px !important;
     max-width: 200px !important;
   }
 
diff --git a/packages/bruno-app/src/components/WorkspaceHome/index.js b/packages/bruno-app/src/components/WorkspaceHome/index.js
index 690f376a5..db27824b0 100644
--- a/packages/bruno-app/src/components/WorkspaceHome/index.js
+++ b/packages/bruno-app/src/components/WorkspaceHome/index.js
@@ -10,6 +10,7 @@ import WorkspaceEnvironments from './WorkspaceEnvironments';
 import WorkspaceTabs from 'components/WorkspaceTabs';
 import StyledWrapper from './StyledWrapper';
 import Dropdown from 'components/Dropdown';
+import { getRevealInFolderLabel } from 'utils/common/platform';
 
 const WorkspaceHome = () => {
   const dispatch = useDispatch();
@@ -225,7 +226,7 @@ const WorkspaceHome = () => {
                   </div>
                   <div className="dropdown-item" onClick={handleShowInFolder}>
                     <IconFolder size={16} strokeWidth={1.5} />
-                    <span>Show in Folder</span>
+                    <span>{getRevealInFolderLabel()}</span>
                   </div>
                   <div className="dropdown-item" onClick={handleExportWorkspace}>
                     <IconUpload size={16} strokeWidth={1.5} />
diff --git a/packages/bruno-app/src/globalStyles.js b/packages/bruno-app/src/globalStyles.js
index 31421964e..ac675304d 100644
--- a/packages/bruno-app/src/globalStyles.js
+++ b/packages/bruno-app/src/globalStyles.js
@@ -19,6 +19,18 @@ const GlobalStyle = createGlobalStyle`
     color: ${(props) => props.theme.colors.text.muted};
   }
 
+  .tooltip-mod {
+    background-color: ${(props) => props.theme.infoTip.bg} !important;
+    color: ${(props) => props.theme.text} !important;
+    border: 1px solid ${(props) => props.theme.infoTip.border} !important;
+    box-shadow: ${(props) => props.theme.infoTip.boxShadow} !important;
+    font-size: ${(props) => props.theme.font.size.xs} !important;
+    padding: 4px 8px !important;
+    border-radius: 4px !important;
+    opacity: 1 !important;
+    z-index: 9999 !important;
+  }
+
   .btn {
     text-align: center;
     white-space: nowrap;
diff --git a/packages/bruno-app/src/themes/dark/catppuccin-frappe.js b/packages/bruno-app/src/themes/dark/catppuccin-frappe.js
index f7c45c024..e78be36e9 100644
--- a/packages/bruno-app/src/themes/dark/catppuccin-frappe.js
+++ b/packages/bruno-app/src/themes/dark/catppuccin-frappe.js
@@ -370,7 +370,7 @@ const catppuccinFrappeTheme = {
         color: colors.TEXT
       },
       inactive: {
-        bg: colors.SURFACE1,
+        bg: colors.SURFACE0,
         color: colors.SUBTEXT0
       }
     }
diff --git a/packages/bruno-app/src/themes/dark/catppuccin-macchiato.js b/packages/bruno-app/src/themes/dark/catppuccin-macchiato.js
index 05167715a..3afad323e 100644
--- a/packages/bruno-app/src/themes/dark/catppuccin-macchiato.js
+++ b/packages/bruno-app/src/themes/dark/catppuccin-macchiato.js
@@ -370,7 +370,7 @@ const catppuccinMacchiatoTheme = {
         color: colors.TEXT
       },
       inactive: {
-        bg: colors.SURFACE1,
+        bg: colors.SURFACE0,
         color: colors.SUBTEXT0
       }
     }
diff --git a/packages/bruno-app/src/themes/dark/catppuccin-mocha.js b/packages/bruno-app/src/themes/dark/catppuccin-mocha.js
index 43779aba1..2a9cfc837 100644
--- a/packages/bruno-app/src/themes/dark/catppuccin-mocha.js
+++ b/packages/bruno-app/src/themes/dark/catppuccin-mocha.js
@@ -370,7 +370,7 @@ const catppuccinMochaTheme = {
         color: colors.TEXT
       },
       inactive: {
-        bg: colors.SURFACE1,
+        bg: colors.SURFACE0,
         color: colors.SUBTEXT0
       }
     }
diff --git a/packages/bruno-app/src/themes/dark/dark-monochrome.js b/packages/bruno-app/src/themes/dark/dark-monochrome.js
index 0b7b61a98..6a5d40756 100644
--- a/packages/bruno-app/src/themes/dark/dark-monochrome.js
+++ b/packages/bruno-app/src/themes/dark/dark-monochrome.js
@@ -353,12 +353,12 @@ const darkMonochromeTheme = {
     },
     secondary: {
       active: {
-        bg: '#2D2D2D',
+        bg: '#3F3F3F',
         color: '#CCCCCC'
       },
       inactive: {
         bg: '#3F3F3F',
-        color: '#CCCCCC'
+        color: '#999999'
       }
     }
   },
diff --git a/packages/bruno-app/src/themes/dark/dark-pastel.js b/packages/bruno-app/src/themes/dark/dark-pastel.js
index 5b131e74f..8b4e9c77b 100644
--- a/packages/bruno-app/src/themes/dark/dark-pastel.js
+++ b/packages/bruno-app/src/themes/dark/dark-pastel.js
@@ -374,7 +374,7 @@ const darkPastelTheme = {
         color: colors.TEXT
       },
       inactive: {
-        bg: colors.GRAY_4,
+        bg: colors.GRAY_3,
         color: colors.TEXT_MUTED
       }
     }
diff --git a/packages/bruno-app/src/themes/dark/dark.js b/packages/bruno-app/src/themes/dark/dark.js
index bd5415716..858ac1ca3 100644
--- a/packages/bruno-app/src/themes/dark/dark.js
+++ b/packages/bruno-app/src/themes/dark/dark.js
@@ -398,12 +398,12 @@ const darkTheme = {
     },
     secondary: {
       active: {
-        bg: '#2D2D2D',
-        color: '#CCCCCC'
+        bg: palette.background.SURFACE0,
+        color: palette.text.BASE
       },
       inactive: {
-        bg: '#3F3F3F',
-        color: '#CCCCCC'
+        bg: palette.background.SURFACE0,
+        color: palette.text.SUBTEXT1
       }
     }
   },
diff --git a/packages/bruno-app/src/themes/dark/nord.js b/packages/bruno-app/src/themes/dark/nord.js
index b094afa0e..60221478a 100644
--- a/packages/bruno-app/src/themes/dark/nord.js
+++ b/packages/bruno-app/src/themes/dark/nord.js
@@ -373,7 +373,7 @@ const nordTheme = {
         color: colors.NORD4
       },
       inactive: {
-        bg: colors.NORD3,
+        bg: colors.NORD2,
         color: colors.NORD4
       }
     }
diff --git a/packages/bruno-app/src/themes/dark/vscode.js b/packages/bruno-app/src/themes/dark/vscode.js
index 214f4fa6c..eecf21c4f 100644
--- a/packages/bruno-app/src/themes/dark/vscode.js
+++ b/packages/bruno-app/src/themes/dark/vscode.js
@@ -79,7 +79,7 @@ const vscodeDarkTheme = {
 
   primary: {
     solid: colors.BRAND,
-    text: colors.TEXT_LINK,
+    text: colors.BRAND_TEXT,
     strong: '#0098ff',
     subtle: '#005a9e'
   },
@@ -376,7 +376,7 @@ const vscodeDarkTheme = {
         color: colors.TEXT
       },
       inactive: {
-        bg: colors.GRAY_4,
+        bg: colors.GRAY_3,
         color: colors.TEXT_MUTED
       }
     }
diff --git a/packages/bruno-app/src/themes/light/catppuccin-latte.js b/packages/bruno-app/src/themes/light/catppuccin-latte.js
index 5e1bea75f..19c47f591 100644
--- a/packages/bruno-app/src/themes/light/catppuccin-latte.js
+++ b/packages/bruno-app/src/themes/light/catppuccin-latte.js
@@ -363,7 +363,7 @@ const catppuccinLatteTheme = {
     },
     secondary: {
       active: {
-        bg: colors.BASE,
+        bg: colors.SURFACE0,
         color: colors.TEXT
       },
       inactive: {
diff --git a/packages/bruno-app/src/themes/light/light-monochrome.js b/packages/bruno-app/src/themes/light/light-monochrome.js
index d51b8fde4..da19c5d57 100644
--- a/packages/bruno-app/src/themes/light/light-monochrome.js
+++ b/packages/bruno-app/src/themes/light/light-monochrome.js
@@ -351,7 +351,7 @@ const lightMonochromeTheme = {
     },
     secondary: {
       active: {
-        bg: '#FFFFFF',
+        bg: '#ECECEE',
         color: '#343434'
       },
       inactive: {
diff --git a/packages/bruno-app/src/themes/light/light-pastel.js b/packages/bruno-app/src/themes/light/light-pastel.js
index 1583bbe94..52bc933a7 100644
--- a/packages/bruno-app/src/themes/light/light-pastel.js
+++ b/packages/bruno-app/src/themes/light/light-pastel.js
@@ -367,7 +367,7 @@ const lightPastelTheme = {
     },
     secondary: {
       active: {
-        bg: colors.WHITE,
+        bg: colors.GRAY_2,
         color: colors.TEXT
       },
       inactive: {
diff --git a/packages/bruno-app/src/themes/light/light.js b/packages/bruno-app/src/themes/light/light.js
index 713059278..283d8df4c 100644
--- a/packages/bruno-app/src/themes/light/light.js
+++ b/packages/bruno-app/src/themes/light/light.js
@@ -387,12 +387,12 @@ const lightTheme = {
     },
     secondary: {
       active: {
-        bg: palette.background.BASE,
+        bg: palette.background.SURFACE1,
         color: palette.text.BASE
       },
       inactive: {
-        bg: palette.background.SURFACE1,
-        color: palette.text.BASE
+        bg: palette.background.SURFACE0,
+        color: palette.text.SUBTEXT1
       }
     }
   },
diff --git a/packages/bruno-app/src/themes/light/vscode.js b/packages/bruno-app/src/themes/light/vscode.js
index 03b60a392..b7687c7a4 100644
--- a/packages/bruno-app/src/themes/light/vscode.js
+++ b/packages/bruno-app/src/themes/light/vscode.js
@@ -371,7 +371,7 @@ const vscodeLightTheme = {
     },
     secondary: {
       active: {
-        bg: colors.WHITE,
+        bg: colors.GRAY_2,
         color: colors.TEXT
       },
       inactive: {
diff --git a/packages/bruno-app/src/utils/common/platform.js b/packages/bruno-app/src/utils/common/platform.js
index ee48e8a17..687b19c3d 100644
--- a/packages/bruno-app/src/utils/common/platform.js
+++ b/packages/bruno-app/src/utils/common/platform.js
@@ -40,6 +40,12 @@ export const isLinuxOS = () => {
   return osFamily.includes('linux') || osFamily.includes('ubuntu') || osFamily.includes('debian') || osFamily.includes('fedora') || osFamily.includes('centos') || osFamily.includes('arch');
 };
 
+export const getRevealInFolderLabel = () => {
+  if (isMacOS()) return 'Reveal in Finder';
+  if (isWindowsOS()) return 'Reveal in File Explorer';
+  return 'Reveal in File Manager';
+};
+
 export const getAppInstallDate = () => {
   let dateString = localStorage.getItem('bruno.installedOn');