diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less
index 02e601529..8a66b865e 100644
--- a/apps/common/main/resources/less/toolbar.less
+++ b/apps/common/main/resources/less/toolbar.less
@@ -569,7 +569,7 @@
             background-color: @highlight-button-pressed;
             color: @dropdown-link-active-color;
             span.color {
-                border-color: rgba(255,255,255,0.7);
+                border-color: @icon-normal;
             }
         }
     }
diff --git a/apps/presentationeditor/main/app_dev.reporter.js b/apps/presentationeditor/main/app_dev.reporter.js
index 04b34270e..b5da5bf70 100644
--- a/apps/presentationeditor/main/app_dev.reporter.js
+++ b/apps/presentationeditor/main/app_dev.reporter.js
@@ -96,6 +96,9 @@ require([
         using      : 'reporter'
     });
 
+    var value = localStorage.getItem("uitheme");
+    api.asc_setSkin(value == "theme-dark" ? 'flatDark' : "flat");
+
     var setDocumentTitle = function(title) {
         (title) && (window.document.title += (' - ' + title));
     };