diff --git a/webapp/channels/src/components/file_preview_modal/file_preview_modal.scss b/webapp/channels/src/components/file_preview_modal/file_preview_modal.scss
index edd26b2a11..f935da6b97 100644
--- a/webapp/channels/src/components/file_preview_modal/file_preview_modal.scss
+++ b/webapp/channels/src/components/file_preview_modal/file_preview_modal.scss
@@ -40,8 +40,15 @@
         overflow: auto;
         width: 100%;
         height: calc(100vh - 72px);
-        padding: 48px 0 72px 0;
+        padding: 48px 5px 72px 0;
         margin: 0 auto;
+        margin-right: 5px;
+        scrollbar-color: rgba(255, 255, 255, 0.24) transparent;
+        scrollbar-width: auto;
+
+        &::-webkit-scrollbar-thumb {
+            background: rgba(255, 255, 255, 0.24);
+        }
 
         @media screen and (max-width: 768px) {
             height: calc(100vh - 148px);
diff --git a/webapp/channels/src/utils/utils.tsx b/webapp/channels/src/utils/utils.tsx
index 469ca90ddc..6740377d9e 100644
--- a/webapp/channels/src/utils/utils.tsx
+++ b/webapp/channels/src/utils/utils.tsx
@@ -400,9 +400,6 @@ export function applyTheme(theme: Theme) {
         changeCss('.app__body .form-control[disabled], .app__body .form-control[readonly], .app__body fieldset[disabled] .form-control', 'background:' + changeOpacity(theme.centerChannelColor, 0.1));
         changeCss('.app__body .sidebar--right', 'color:' + theme.centerChannelColor);
         changeCss('.app__body .modal .settings-modal .settings-table .settings-content .appearance-section .theme-elements__body', 'background:' + changeOpacity(theme.centerChannelColor, 0.05));
-        if (!UserAgent.isFirefox() && !UserAgent.isInternetExplorer() && !UserAgent.isEdge()) {
-            changeCss('body.app__body ::-webkit-scrollbar-thumb', 'background:' + changeOpacity(theme.centerChannelColor, 0.4));
-        }
         changeCss('body', 'scrollbar-arrow-color:' + theme.centerChannelColor);
         changeCss('.app__body .post-create__container .post-create-body .btn-file svg, .app__body .post.post--compact .post-image__column .post-image__details svg, .app__body .modal .about-modal .about-modal__logo svg, .app__body .status svg, .app__body .edit-post__actions .icon svg', 'fill:' + theme.centerChannelColor);
         changeCss('.app__body .post-list__new-messages-below', 'background:' + changeColor(theme.centerChannelColor, 0.5));