diff --git a/src/components/workspace/Tabs/Tabs.module.scss b/src/components/workspace/Tabs/Tabs.module.scss
index b2e29de..cfd73e2 100644
--- a/src/components/workspace/Tabs/Tabs.module.scss
+++ b/src/components/workspace/Tabs/Tabs.module.scss
@@ -76,6 +76,9 @@
 
       &:hover {
         background-color: #403d3d;
+        [data-theme='light'] & {
+          background-color: #f7f7f7;
+        }
       }
       &.isDirty {
         .closeIcon {
@@ -92,7 +95,7 @@
       width: 8px;
       height: 8px;
       border-radius: 50%;
-      background: #fff;
+      background: var(--text-color);
       margin-right: 5px;
       position: absolute;
       left: 0;
diff --git a/src/components/workspace/WorkspaceSidebar/WorkspaceSidebar.module.scss b/src/components/workspace/WorkspaceSidebar/WorkspaceSidebar.module.scss
index 54272ed..58deefb 100644
--- a/src/components/workspace/WorkspaceSidebar/WorkspaceSidebar.module.scss
+++ b/src/components/workspace/WorkspaceSidebar/WorkspaceSidebar.module.scss
@@ -33,8 +33,6 @@
     &:hover {
       opacity: 1;
       color: var(--primary);
-      background: var(--menu-bg);
-      // handle for light theme based on global state
       &::before {
         display: block;
       }
diff --git a/src/styles/global.scss b/src/styles/global.scss
index 6aacb98..efd64ca 100644
--- a/src/styles/global.scss
+++ b/src/styles/global.scss
@@ -76,6 +76,7 @@ body {
   min-height: 100vh;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
+  overflow-x: hidden;
   *::-webkit-scrollbar-track {
     -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
     background-color: #000000;
diff --git a/src/styles/lib/form.scss b/src/styles/lib/form.scss
index 7576e46..fe891b5 100644
--- a/src/styles/lib/form.scss
+++ b/src/styles/lib/form.scss
@@ -1,10 +1,9 @@
 .ant-select {
   .ant-select-selector {
-    background-color: rgba(0, 0, 0, 0.4) !important;
     border: 0 !important;
     box-shadow: none !important;
-    [data-theme='light'] & {
-      background-color: rgba(255, 255, 255, 0.4) !important;
+    [data-theme='dark'] & {
+      background-color: rgba(0, 0, 0, 0.4) !important;
     }
   }
 }