diff --git a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/CodeView/StyledWrapper.js b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/CodeView/StyledWrapper.js
index f54b8450a..746ee8165 100644
--- a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/CodeView/StyledWrapper.js
+++ b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/CodeView/StyledWrapper.js
@@ -10,12 +10,15 @@ const StyledWrapper = styled.div`
     .CodeMirror {
       height: 100%;
       font-size: ${(props) => props.theme.font.size.sm};
+      background: ${(props) => props.theme.modal.bg};
       line-height: 1.5;
       padding: 0;
+      background: transparent !important;
+      border: none;
 
       .CodeMirror-gutters {
-        background: ${(props) => props.theme.codemirror.gutter.bg};
-        border-right: 1px solid ${(props) => props.theme.codemirror.border};
+        background: transparent !important;
+        border-right: none;
       }
 
       .CodeMirror-linenumber {
diff --git a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/CodeView/index.js b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/CodeView/index.js
index a33d41749..fc0ccf841 100644
--- a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/CodeView/index.js
+++ b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/CodeView/index.js
@@ -47,7 +47,7 @@ const CodeView = ({ language, item }) => {
         onCopy={() => toast.success('Copied to clipboard!')}
       >
         <button className="copy-to-clipboard">
-          <IconCopy size={25} strokeWidth={1.5} />
+          <IconCopy size={20} strokeWidth={1.5} />
         </button>
       </CopyToClipboard>
       <div className="editor-content">
diff --git a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/CodeViewToolbar/StyledWrapper.js b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/CodeViewToolbar/StyledWrapper.js
index 617cb5ff2..5b60dadb0 100644
--- a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/CodeViewToolbar/StyledWrapper.js
+++ b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/CodeViewToolbar/StyledWrapper.js
@@ -5,9 +5,7 @@ const StyledWrapper = styled.div`
     display: flex;
     justify-content: space-between;
     align-items: center;
-    padding: 8px 12px;
-    background: ${(props) => props.theme.requestTabPanel.card.bg};
-    border-bottom: 1px solid ${(props) => props.theme.requestTabPanel.card.border};
+    background: ${(props) => props.theme.modal.bg};
     gap: 12px;
     flex-shrink: 0;
   }
@@ -45,6 +43,8 @@ const StyledWrapper = styled.div`
     cursor: pointer;
     transition: all 0.2s ease;
     appearance: none;
+    outline: none;
+    box-shadow: none;
 
     &:hover {
       border-color: ${(props) => props.theme.input.focusBorder};
diff --git a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/StyledWrapper.js b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/StyledWrapper.js
index 9c02ee4d2..ea77fe0fc 100644
--- a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/StyledWrapper.js
+++ b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/StyledWrapper.js
@@ -1,11 +1,10 @@
 import styled from 'styled-components';
 
 const StyledWrapper = styled.div`
-  margin: -1.5rem -1rem;
   height: 50vh;
   display: flex;
   flex-direction: column;
-  background-color: ${(props) => props.theme.background.base};
+  background-color: ${(props) => props.theme.modal.bg};
 
   .code-generator {
     display: flex;
@@ -15,9 +14,11 @@ const StyledWrapper = styled.div`
 
   .editor-container {
     flex: 1;
+    min-height: 0;
     overflow: hidden;
     position: relative;
-    background: ${(props) => props.theme.bg};
+    background: ${(props) => props.theme.modal.bg};
+    margin-top: 0.5rem;
   }
 
   .error-message {