diff --git a/webapp/components/admin_console/admin_sidebar.jsx b/webapp/components/admin_console/admin_sidebar.jsx
index f417cfe562..97b63e9c62 100644
--- a/webapp/components/admin_console/admin_sidebar.jsx
+++ b/webapp/components/admin_console/admin_sidebar.jsx
@@ -29,13 +29,17 @@ export default class AdminSidebar extends React.Component {
         this.updateTitle();
 
         if (!Utils.isMobile()) {
-            $('.admin-sidebar .nav-pills__container').perfectScrollbar();
+            $('.admin-sidebar .nav-pills__container').perfectScrollbar({
+                suppressScrollX: true
+            });
         }
     }
 
     componentDidUpdate() {
         if (!Utils.isMobile()) {
-            $('.admin-sidebar .nav-pills__container').perfectScrollbar();
+            $('.admin-sidebar .nav-pills__container').perfectScrollbar({
+                suppressScrollX: true
+            });
         }
     }
 
diff --git a/webapp/components/user_settings/user_settings_security/user_settings_security.jsx b/webapp/components/user_settings/user_settings_security/user_settings_security.jsx
index cbf3814bd9..ff4eb7ecb0 100644
--- a/webapp/components/user_settings/user_settings_security/user_settings_security.jsx
+++ b/webapp/components/user_settings/user_settings_security/user_settings_security.jsx
@@ -1066,7 +1066,7 @@ export default class SecurityTab extends React.Component {
                 />
             ),
             confirmMessage: (
-                <div className='alert alert-danger'>
+                <div className='alert alert-danger word-break--all'>
                     <FormattedHTMLMessage
                         id='user.settings.tokens.confirmDeleteMessage'
                         defaultMessage='Any integrations using this token will no longer be able to access the Mattermost API. You cannot undo this action. <br /><br />Are you sure want to delete the {description} token?'
diff --git a/webapp/sass/layout/_navigation.scss b/webapp/sass/layout/_navigation.scss
index f1bce335c1..c04a7a570b 100644
--- a/webapp/sass/layout/_navigation.scss
+++ b/webapp/sass/layout/_navigation.scss
@@ -139,6 +139,10 @@
                     vertical-align: top;
                     width: 32px;
 
+                    &:hover {
+                        background: transparent;
+                    }
+
                     svg {
                         position: relative;
                         top: 5px;
diff --git a/webapp/sass/layout/_post.scss b/webapp/sass/layout/_post.scss
index cb24315554..e3970b0e6c 100644
--- a/webapp/sass/layout/_post.scss
+++ b/webapp/sass/layout/_post.scss
@@ -733,6 +733,24 @@
             padding-top: 0;
         }
 
+        .attachment {
+            .attachment__body__wrap {
+                .btn-close {
+                    left: -2px;
+                }
+            }
+        }
+
+        &.post--comment {
+            .attachment {
+                .attachment__body__wrap {
+                    .btn-close {
+                        left: -13px;
+                    }
+                }
+            }
+        }
+
         .status-wrapper {
             cursor: auto;
             height: 14px;
@@ -942,6 +960,14 @@
                 border-color: $yellow;
             }
         }
+
+        .attachment {
+            .attachment__body__wrap {
+                .btn-close {
+                    left: -11px;
+                }
+            }
+        }
     }
 
     &.same--root {
diff --git a/webapp/sass/responsive/_tablet.scss b/webapp/sass/responsive/_tablet.scss
index 55dd59a4ce..71b95c9971 100644
--- a/webapp/sass/responsive/_tablet.scss
+++ b/webapp/sass/responsive/_tablet.scss
@@ -358,7 +358,7 @@
                     padding-top: 0;
 
                     .flag-icon__container {
-                        left: -19px;
+                        left: -21px;
                         position: absolute;
                         top: 4px;
                     }
diff --git a/webapp/sass/routes/_admin-console.scss b/webapp/sass/routes/_admin-console.scss
index 4ce4c00f1e..ff02ca17e0 100644
--- a/webapp/sass/routes/_admin-console.scss
+++ b/webapp/sass/routes/_admin-console.scss
@@ -123,8 +123,10 @@
 
             input {
                 @include opacity(0);
+                cursor: pointer;
                 height: 100%;
                 left: 0;
+                padding-left: 100%;
                 position: absolute;
                 top: 0;
                 width: 100%;
@@ -355,7 +357,7 @@
     .nav-pills__container {
         @include font-smoothing(initial);
         background: #111;
-        height: calc(100% - 50px);
+        height: calc(100% - 68px);
         margin-top: 1px;
         padding-bottom: 20px;
         position: relative;