diff --git a/css/_inlay.scss b/css/_inlay.scss
index cc0a8d770..5c06e928b 100644
--- a/css/_inlay.scss
+++ b/css/_inlay.scss
@@ -3,7 +3,7 @@
     @include border-radius(3px);
     padding: 40px 38px 44px;
     color: #fff;
-    background: lighten(desaturate($defaultBackground, 70%), 20%);
+    background: $inlayColorBg;
     text-align: center;
 
     &__title {
@@ -12,7 +12,7 @@
         color: $popoverFontColor;
         font-size: 21px;
         letter-spacing: 0.3px;
-        border-bottom: 1px solid $auiBorderColor;
+        border-bottom: 1px solid $inlayBorderColor;
     }
 
     &__text {
diff --git a/css/_jitsi_popover.scss b/css/_jitsi_popover.scss
index b638de646..7037b274c 100644
--- a/css/_jitsi_popover.scss
+++ b/css/_jitsi_popover.scss
@@ -14,13 +14,13 @@
     /*-webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);*/
     /*box-shadow: 0 5px 10px rgba(0, 0, 0, 0.4);*/
     white-space: normal;
-    margin-top: -10px;
+    margin-top: -13px;
 
     &__menu-padding {
         height: 10px;
         width: 100px;
         position: absolute;
-        bottom: -10px;
+        bottom: -13px;
     }
 
     &__showmore {
diff --git a/css/_side_toolbar_container.scss b/css/_side_toolbar_container.scss
index 93fcbd9a2..afd64f897 100644
--- a/css/_side_toolbar_container.scss
+++ b/css/_side_toolbar_container.scss
@@ -60,6 +60,10 @@
         box-sizing: border-box;
         color: #FFF;
 
+        .input-control {
+            border: 0;
+        }
+
         /**
          * Titles and subtitles of inner containers.
          */
diff --git a/css/_variables.scss b/css/_variables.scss
index c4ecdc37e..3b36bf1ba 100644
--- a/css/_variables.scss
+++ b/css/_variables.scss
@@ -77,7 +77,6 @@ $rateStarLabelColor: #333;
 $rateStarDefault: #ccc;
 $rateStarActivity: #165ecc;
 $rateStarSize: 34px;
-$feedbackCancelFontColor: #333;
 
 /**
  * Notifications
diff --git a/css/modals/_dialog.scss b/css/modals/_dialog.scss
index c25b15615..4aa346a9f 100644
--- a/css/modals/_dialog.scss
+++ b/css/modals/_dialog.scss
@@ -2,7 +2,7 @@
     visibility: visible;
     height: auto;
 
-    h3 {
+    h1, h2, h3, h4, h5, h6 {
         color: $auiDialogColor;
     }
 
diff --git a/css/modals/feedback/_feedback.scss b/css/modals/feedback/_feedback.scss
index 5086377ba..7ce14fb4e 100644
--- a/css/modals/feedback/_feedback.scss
+++ b/css/modals/feedback/_feedback.scss
@@ -62,20 +62,18 @@
             text-align: center;
             padding: 10px 40px 20px 40px;
 
-            .form-control{
-                &__input {
-                    background-color: $feedbackInputBg;
-                    color: $feedbackInputTextColor;
+            .input-control {
+                background-color: $feedbackInputBg;
+                color: $feedbackInputTextColor;
 
-                    &::-webkit-input-placeholder {
-                        color: $feedbackInputPlaceholderColor;
-                    }
-                    &::-moz-placeholder {  /* Firefox 19+ */
-                        color: $feedbackInputPlaceholderColor;
-                    }
-                    &:-ms-input-placeholder {
-                        color: $feedbackInputPlaceholderColor;
-                    }
+                &::-webkit-input-placeholder {
+                    color: $feedbackInputPlaceholderColor;
+                }
+                &::-moz-placeholder {  /* Firefox 19+ */
+                    color: $feedbackInputPlaceholderColor;
+                }
+                &:-ms-input-placeholder {
+                    color: $feedbackInputPlaceholderColor;
                 }
             }
 
diff --git a/css/themes/_light.scss b/css/themes/_light.scss
index a903b7bf6..d49e5d0b8 100644
--- a/css/themes/_light.scss
+++ b/css/themes/_light.scss
@@ -53,6 +53,12 @@ $auiDialogContentBg: $baseLight;
 $auiBorderColor: #ccc;
 $dialogTitleFontWeight: 400;
 
+/**
+* Inlay colors
+**/
+$inlayColorBg: lighten($defaultBackground, 20%);
+$inlayBorderColor: lighten($auiDialogContentBg, 10%);
+
 // Main controls
 $inputBackground: $controlBackground;
 $inputBorderColor: #ccc;
@@ -68,6 +74,9 @@ $linkHoverFontColor: darken(#3572b0, 10%);
 $dropdownColor: #333;
 $errorColor: #c61600;
 
+// Feedback colors
+$feedbackCancelFontColor: #333;
+
 // Popover colors
 $popoverBg: #000;
 $popoverFontColor: #ffffff;