diff --git a/webapp/components/user_settings/user_settings_general.jsx b/webapp/components/user_settings/user_settings_general.jsx
index b99ddd16e9..805650608a 100644
--- a/webapp/components/user_settings/user_settings_general.jsx
+++ b/webapp/components/user_settings/user_settings_general.jsx
@@ -462,7 +462,7 @@ class UserSettingsGeneralTab extends React.Component {
                 inputs.push(
                     <div
                         key='oauthEmailInfo'
-                        className='form-group'
+                        className='padding-bottom'
                     >
                         <div className='setting-list__hint'>
                             <FormattedMessage
@@ -480,7 +480,7 @@ class UserSettingsGeneralTab extends React.Component {
                 inputs.push(
                     <div
                         key='oauthEmailInfo'
-                        className='form-group'
+                        className='padding-bottom'
                     >
                         <div className='setting-list__hint'>
                             <FormattedMessage
diff --git a/webapp/sass/components/_inputs.scss b/webapp/sass/components/_inputs.scss
index c34d0d2d40..75e5ff9e68 100644
--- a/webapp/sass/components/_inputs.scss
+++ b/webapp/sass/components/_inputs.scss
@@ -37,3 +37,10 @@ fieldset {
 .admin-textarea {
     resize: none;
 }
+
+input {
+    &[type='radio'],
+    &[type='checkbox'] {
+        margin-top: 1px;
+    }
+}
diff --git a/webapp/sass/responsive/_mobile.scss b/webapp/sass/responsive/_mobile.scss
index 0f7ac0eb40..25d95df46c 100644
--- a/webapp/sass/responsive/_mobile.scss
+++ b/webapp/sass/responsive/_mobile.scss
@@ -1,6 +1,10 @@
 @charset 'UTF-8';
 
 @media screen and (max-width: 768px) {
+    .suggestion-list__content {
+        max-height: 145px;
+    }
+
     .modal {
         .modal-dialog {
             &.new-channel__modal {
@@ -206,6 +210,11 @@
             }
         }
 
+        .post__remove {
+            margin-right: 10px;
+            visibility: visible;
+        }
+
         &.post--compact {
             .status-wrapper {
                 &:after {
@@ -338,6 +347,24 @@
             }
 
             &.same--user {
+                &.post--compact {
+                    .status-wrapper {
+                        &:after {
+                            bottom: -2px;
+                        }
+                    }
+                }
+
+                .post__img {
+                    .status-wrapper {
+                        display: inline-block;
+                    }
+
+                    img {
+                        display: block;
+                    }
+                }
+
                 .post__header {
                     height: auto;
                     margin-top: 5px;
diff --git a/webapp/sass/responsive/_tablet.scss b/webapp/sass/responsive/_tablet.scss
index 52d7a6a779..f9cd0869d0 100644
--- a/webapp/sass/responsive/_tablet.scss
+++ b/webapp/sass/responsive/_tablet.scss
@@ -9,7 +9,7 @@
         }
 
         .heading {
-            width: 130px;
+            max-width: 150px;
         }
     }
 
@@ -73,7 +73,7 @@
     }
 
     .sidebar--right {
-        @include single-transition(all, .5s, ease);
+        @include single-transition(all, .35s, ease);
         @include translateX(100%);
 
         &.move--left,
diff --git a/webapp/sass/routes/_admin-console.scss b/webapp/sass/routes/_admin-console.scss
index 5cec54e6b8..5107cff3d2 100644
--- a/webapp/sass/routes/_admin-console.scss
+++ b/webapp/sass/routes/_admin-console.scss
@@ -56,6 +56,10 @@
         &.btn-spacing--right {
             margin-right: 10px;
         }
+
+        .fa {
+            margin-right: 5px;
+        }
     }
 
     .log__panel {
diff --git a/webapp/sass/routes/_settings.scss b/webapp/sass/routes/_settings.scss
index 6fa8c26a7d..6b7f8a5f1a 100644
--- a/webapp/sass/routes/_settings.scss
+++ b/webapp/sass/routes/_settings.scss
@@ -236,12 +236,12 @@
                     }
 
                     .theme-elements__header {
-                        border-bottom: 1px solid #ccc;
+                        border-bottom: 1px solid;
                         cursor: pointer;
                         font-size: em(13.5px);
                         font-weight: 600;
                         margin: 10px 20px 0 0;
-                        padding: 5px 0 10px;
+                        padding: 1px 0 10px;
 
                         .fa-minus {
                             display: none;