diff --git a/assets/styles/framework/colors.less b/assets/styles/framework/colors.less
index 2a3f2e084f..60b5c0f487 100644
--- a/assets/styles/framework/colors.less
+++ b/assets/styles/framework/colors.less
@@ -13,8 +13,7 @@
 @black: #000;
 
 @primary-color: #2761fd;
-@primary-color-alt: #2761fd;
-@scrollbar-color: @primary-color;
+@scrollbar-color: var(--flair-color);
 
 @secondary-text: #dae0ff;
 @text: #ffffff;
diff --git a/assets/styles/thirdparty/multiselect.less b/assets/styles/thirdparty/multiselect.less
index 14db2dee40..71cee00554 100644
--- a/assets/styles/thirdparty/multiselect.less
+++ b/assets/styles/thirdparty/multiselect.less
@@ -156,7 +156,7 @@ fieldset[disabled] .multiselect {
 }
 .multiselect__tag-icon:focus,
 .multiselect__tag-icon:hover {
-  background: @primary-color-alt;
+  background: @primary-color;
 }
 .multiselect__tag-icon:focus:after,
 .multiselect__tag-icon:hover:after {
diff --git a/components/ui/BadgedIcon/BadgedIcon.less b/components/ui/BadgedIcon/BadgedIcon.less
index dfeaf02e70..482e89dbbd 100644
--- a/components/ui/BadgedIcon/BadgedIcon.less
+++ b/components/ui/BadgedIcon/BadgedIcon.less
@@ -20,7 +20,7 @@
   .tag {
     &:not(body).is-dark {
       .tag-number {
-        background: @primary-color-alt;
+        background: @primary-color;
       }
       background: @background;
     }
diff --git a/components/ui/Chat/Embeds/VideoPlayer/VideoPlayer.less b/components/ui/Chat/Embeds/VideoPlayer/VideoPlayer.less
index f7270d7c9a..94928d7ae2 100644
--- a/components/ui/Chat/Embeds/VideoPlayer/VideoPlayer.less
+++ b/components/ui/Chat/Embeds/VideoPlayer/VideoPlayer.less
@@ -56,7 +56,7 @@ video {
   &:extend(.glow-primary);
   &:hover {
     &:extend(.glow-primary);
-    background: @primary-color-alt !important;
+    background: @primary-color !important;
   }
   background: @primary-color !important;
 }
diff --git a/components/ui/SimpleScroll/SimpleScroll.html b/components/ui/SimpleScroll/SimpleScroll.html
index be254fbb66..45366f5fee 100644
--- a/components/ui/SimpleScroll/SimpleScroll.html
+++ b/components/ui/SimpleScroll/SimpleScroll.html
@@ -1,6 +1,10 @@
 <div
   id="simple-scrollbar"
+  v-scroll-lock="true"
   :class="{'scrollbar-always-visible': scrollShow === 'always' , 'scrollbar-vertical': scrollMode === 'vertical', 'scrollbar-horizontal': scrollMode === 'horizontal'}"
+  v-if="Object.keys(this.$slots).length !== 0"
 >
-  <slot />
+  <div class="wrapper">
+    <slot />
+  </div>
 </div>
diff --git a/components/ui/SimpleScroll/SimpleScroll.less b/components/ui/SimpleScroll/SimpleScroll.less
index 952042cfca..f3e4f40bc0 100644
--- a/components/ui/SimpleScroll/SimpleScroll.less
+++ b/components/ui/SimpleScroll/SimpleScroll.less
@@ -2,10 +2,19 @@
   width: @full;
   height: @full;
 
+  .wrapper {
+    width: @full;
+    height: @full;
+    box-sizing: border-box;
+  }
+
   &.scrollbar-vertical {
     overflow-x: hidden;
     overflow-y: scroll;
-    padding-right: @scroll-bar-size*2;
+
+    .wrapper {
+      padding-right: @scroll-bar-size;
+    }
 
     &::-webkit-scrollbar {
       width: @scroll-bar-size;
@@ -15,7 +24,10 @@
   &.scrollbar-horizontal {
     overflow-y: hidden;
     overflow-x: scroll;
-    padding-bottom: @scroll-bar-size*2;
+
+    .wrapper {
+      padding-bottom: @scroll-bar-size;
+    }
 
     &::-webkit-scrollbar {
       height: @scroll-bar-size;
@@ -23,17 +35,25 @@
   }
 
   scrollbar-width: thin;
-  scrollbar-color: var(--flair-color) transparent;
+  scrollbar-color: @scrollbar-color transparent;
 
   &:hover {
     &::-webkit-scrollbar-thumb {
-      border-radius: @scroll-bar-size*2;
-      background-color: var(--flair-color);
+      background-color: @scrollbar-color;
     }
   }
 
   &.scrollbar-always-visible::-webkit-scrollbar-thumb {
-    border-radius: @scroll-bar-size*2;
-    background-color: var(--flair-color);
+    background-color: @scrollbar-color;
+  }
+
+  &::-webkit-scrollbar-thumb {
+    &:extend(.round-corners);
+  }
+
+  @media only screen and (max-width: 1024px) {
+    &::-webkit-scrollbar-thumb {
+      background-color: @scrollbar-color;
+    }
   }
 }
diff --git a/components/views/chat/enhancers/Enhancers.html b/components/views/chat/enhancers/Enhancers.html
index 4673823d99..bd0adf93b3 100644
--- a/components/views/chat/enhancers/Enhancers.html
+++ b/components/views/chat/enhancers/Enhancers.html
@@ -30,9 +30,9 @@
     </InteractablesButtonGroup>
   </div>
   <div id="container">
-    <UiScroll
-      verticalScroll
-      scrollbarVisibility="scroll"
+    <UiSimpleScroll
+      scrollMode="vertical"
+      scrollShow="scroll"
       v-if="ui.enhancers.route === 'emotes'"
     >
       <emoji-picker @emoji="addEmoji" :search="search.toLowerCase()">
@@ -81,7 +81,7 @@
           </div>
         </div>
       </emoji-picker>
-    </UiScroll>
+    </UiSimpleScroll>
     <EnhancersGlyphs v-if="ui.enhancers.route === 'glyphs'" />
   </div>
 </div>
diff --git a/components/views/chat/enhancers/Enhancers.less b/components/views/chat/enhancers/Enhancers.less
index fabc7d0240..30bd2a81a0 100644
--- a/components/views/chat/enhancers/Enhancers.less
+++ b/components/views/chat/enhancers/Enhancers.less
@@ -3,7 +3,7 @@
     position: relative;
     flex: 1;
     &:extend(.full-width);
-    height: calc(@full - 3rem);
+    height: calc(@full - 52px);
     overflow-y: scroll;
     &::-webkit-scrollbar {
       display: none;
diff --git a/components/views/marketplace/card/Card.less b/components/views/marketplace/card/Card.less
index 8dabef5eec..8b46293696 100644
--- a/components/views/marketplace/card/Card.less
+++ b/components/views/marketplace/card/Card.less
@@ -20,7 +20,7 @@
     &:extend(.full-width);
     position: relative;
     height: 170px;
-    background: @primary-color-alt;
+    background: @primary-color;
     background-position: center;
     background-size: cover;
   }
diff --git a/components/views/marketplace/glyphs/shop/item/Item.less b/components/views/marketplace/glyphs/shop/item/Item.less
index 266800dcc9..c8de4a5148 100644
--- a/components/views/marketplace/glyphs/shop/item/Item.less
+++ b/components/views/marketplace/glyphs/shop/item/Item.less
@@ -14,7 +14,7 @@
     height: 10.5rem;
     padding: @normal-spacing;
     border-radius: 4px 4px 0px 0px;
-    background: @primary-color-alt;
+    background: @primary-color;
     background-position: center;
     background-size: cover;
     .btn-group {