5 files changed, 38 insertions, 11 deletions
diff --git a/webapp/sass/components/_emoticons.scss b/webapp/sass/components/_emoticons.scss
index 80a800863..0e6ce6041 100644
--- a/webapp/sass/components/_emoticons.scss
+++ b/webapp/sass/components/_emoticons.scss
@@ -1,11 +1,14 @@
 @charset 'UTF-8';
 
 .emoticon {
+    background-repeat: no-repeat;
+    background-position: 50% 50%;
     background-size: contain;
     display: inline-block;
-    height: 1.5em;
-    margin-bottom: .25em;
-    width: 1.5em;
+    font-size: 19px;
+    height: 1em;
+    vertical-align: text-top;
+    width: 1em;
 }
 
 .emoticon-suggestion {
diff --git a/webapp/sass/components/_inputs.scss b/webapp/sass/components/_inputs.scss
index c34d0d2d4..75e5ff9e6 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/components/_scrollbar.scss b/webapp/sass/components/_scrollbar.scss
index a4df8230d..66b476166 100644
--- a/webapp/sass/components/_scrollbar.scss
+++ b/webapp/sass/components/_scrollbar.scss
@@ -15,13 +15,15 @@
 }
 
 body {
-    scrollbar-3dlight-color: #7D7E94;
-    scrollbar-arrow-color: #C1C1D1;
-    scrollbar-darkshadow-color: #2D2C4D;
-    scrollbar-face-color: rgba(0, 0, 0, .1);
-    scrollbar-highlight-color: #7D7E94;
-    scrollbar-shadow-color: #2D2C4D;
-    scrollbar-track-color: rgba(0, 0, 0, .1);
+    &.app__body {
+        scrollbar-3dlight-color: #7D7E94;
+        scrollbar-arrow-color: #C1C1D1;
+        scrollbar-darkshadow-color: #2D2C4D;
+        scrollbar-face-color: rgba(0, 0, 0, .1);
+        scrollbar-highlight-color: #7D7E94;
+        scrollbar-shadow-color: #2D2C4D;
+        scrollbar-track-color: rgba(0, 0, 0, .1);
+    }
 }
 
 .scrollbar--horizontal,
diff --git a/webapp/sass/components/_tooltip.scss b/webapp/sass/components/_tooltip.scss
index 5e71e3a7b..0049fe1b8 100644
--- a/webapp/sass/components/_tooltip.scss
+++ b/webapp/sass/components/_tooltip.scss
@@ -8,3 +8,9 @@
         word-break: break-word;
     }
 }
+
+#webrtcTooltip {
+    .tooltip-inner {
+        word-break: normal;
+    }
+}
diff --git a/webapp/sass/components/_webrtc.scss b/webapp/sass/components/_webrtc.scss
index b025ab00c..c9deada26 100644
--- a/webapp/sass/components/_webrtc.scss
+++ b/webapp/sass/components/_webrtc.scss
@@ -2,10 +2,14 @@
 
 .webrtc__user-profile {
     @include webrtc-button;
+    position: absolute;
+    right: 7px;
     text-align: center;
+    top: 5px;
 
     #webrtc-btn {
-        display: inherit;
+        height: 23px;
+        width: 23px;
     }
 }
 
@@ -15,6 +19,11 @@
     margin-right: 10px;
     position: relative;
     top: 13px;
+
+    svg {
+        position: relative;
+        width: 20px;
+    }
 }
 
 .webrtc__notification--rhs {