diff --git a/packages/bruno-app/src/components/BulkEditor/index.js b/packages/bruno-app/src/components/BulkEditor/index.js
index 1739c963f..e04e53121 100644
--- a/packages/bruno-app/src/components/BulkEditor/index.js
+++ b/packages/bruno-app/src/components/BulkEditor/index.js
@@ -1,4 +1,5 @@
 import React, { useMemo } from 'react';
+import get from 'lodash/get';
 import CodeEditor from 'components/CodeEditor';
 import { useTheme } from 'providers/Theme';
 import { useSelector } from 'react-redux';
@@ -21,7 +22,8 @@ const BulkEditor = ({ params, onChange, onToggle, onSave, onRun }) => {
         <CodeEditor
           mode="text/plain"
           theme={displayedTheme}
-          font={preferences.codeFont || 'default'}
+          font={get(preferences, 'font.codeFont', 'default')}
+          fontSize={get(preferences, 'font.codeFontSize')}
           value={parsedParams}
           onEdit={handleEdit}
           onSave={onSave}
diff --git a/packages/bruno-app/src/components/ResponsePane/QueryResult/StyledWrapper.js b/packages/bruno-app/src/components/ResponsePane/QueryResult/StyledWrapper.js
index 838cd3d02..9ed72277f 100644
--- a/packages/bruno-app/src/components/ResponsePane/QueryResult/StyledWrapper.js
+++ b/packages/bruno-app/src/components/ResponsePane/QueryResult/StyledWrapper.js
@@ -40,6 +40,10 @@ const StyledWrapper = styled.div`
     color: ${(props) => props.theme.colors.text.muted};
   }
 
+  .error {
+    color: ${(props) => props.theme.colors.text.danger};
+  }
+
   .response-filter {
     position: absolute;
     bottom: 0;
diff --git a/packages/bruno-app/src/components/ResponsePane/QueryResult/index.js b/packages/bruno-app/src/components/ResponsePane/QueryResult/index.js
index 0a1b0546a..6d62f38c0 100644
--- a/packages/bruno-app/src/components/ResponsePane/QueryResult/index.js
+++ b/packages/bruno-app/src/components/ResponsePane/QueryResult/index.js
@@ -177,7 +177,7 @@ const QueryResult = ({
       {error ? (
         <div>
           {hasScriptError ? null : (
-            <div className="text-red-500" style={{ whiteSpace: 'pre-line' }}>{formatErrorMessage(error)}</div>
+            <div className="error" style={{ whiteSpace: 'pre-line' }}>{formatErrorMessage(error)}</div>
           )}
 
           {error && typeof error === 'string' && error.toLowerCase().includes('self signed certificate') ? (
diff --git a/packages/bruno-app/src/components/Sidebar/Collections/Collection/RemoveCollection/StyledWrapper.js b/packages/bruno-app/src/components/Sidebar/Collections/Collection/RemoveCollection/StyledWrapper.js
index bf0da187b..5be3b5812 100644
--- a/packages/bruno-app/src/components/Sidebar/Collections/Collection/RemoveCollection/StyledWrapper.js
+++ b/packages/bruno-app/src/components/Sidebar/Collections/Collection/RemoveCollection/StyledWrapper.js
@@ -21,6 +21,9 @@ const StyledWrapper = styled.div`
     color: ${(props) => props.theme.colors.text.muted};
     word-break: break-all;
   }
+  .warning-icon {
+    color: ${(props) => props.theme.status.warning.text};
+  }
 `;
 
 export default StyledWrapper;
diff --git a/packages/bruno-app/src/components/Sidebar/Collections/Collection/RemoveCollection/index.js b/packages/bruno-app/src/components/Sidebar/Collections/Collection/RemoveCollection/index.js
index 278b04717..15fbb4283 100644
--- a/packages/bruno-app/src/components/Sidebar/Collections/Collection/RemoveCollection/index.js
+++ b/packages/bruno-app/src/components/Sidebar/Collections/Collection/RemoveCollection/index.js
@@ -45,7 +45,7 @@ const RemoveCollection = ({ onClose, collectionUid }) => {
 
   const customHeader = (
     <div className="flex items-center gap-2" data-testid="close-collection-modal-title">
-      <IconAlertCircle size={18} strokeWidth={1.5} className="text-red-500" />
+      <IconAlertCircle size={18} strokeWidth={1.5} className="warning-icon" />
       <span>Remove Collection</span>
     </div>
   );
diff --git a/packages/bruno-app/src/components/WorkspaceHome/WorkspaceEnvironments/EnvironmentList/ConfirmSwitchEnv.js b/packages/bruno-app/src/components/WorkspaceHome/WorkspaceEnvironments/EnvironmentList/ConfirmSwitchEnv.js
index 6c66372f4..099eacc1b 100644
--- a/packages/bruno-app/src/components/WorkspaceHome/WorkspaceEnvironments/EnvironmentList/ConfirmSwitchEnv.js
+++ b/packages/bruno-app/src/components/WorkspaceHome/WorkspaceEnvironments/EnvironmentList/ConfirmSwitchEnv.js
@@ -3,8 +3,12 @@ import { IconAlertTriangle } from '@tabler/icons';
 import Modal from 'components/Modal';
 import { createPortal } from 'react-dom';
 import Button from 'ui/Button';
+import { useTheme } from 'providers/Theme';
 
 const ConfirmSwitchEnv = ({ onCancel }) => {
+  const { theme } = useTheme();
+  const warningColor = theme.status.warning.text;
+
   const modalContent = (
     <Modal
       size="md"
@@ -20,7 +24,7 @@ const ConfirmSwitchEnv = ({ onCancel }) => {
       hideFooter={true}
     >
       <div className="flex items-center font-normal">
-        <IconAlertTriangle size={32} strokeWidth={1.5} className="text-yellow-600" />
+        <IconAlertTriangle color={warningColor} size={32} strokeWidth={1.5} />
         <h1 className="ml-2 text-lg font-semibold">Hold on..</h1>
       </div>
       <div className="font-normal mt-4">You have unsaved changes in this environment.</div>