diff --git a/apps/common/main/lib/controller/Themes.js b/apps/common/main/lib/controller/Themes.js
index 0986d3bb7..48ea99edc 100644
--- a/apps/common/main/lib/controller/Themes.js
+++ b/apps/common/main/lib/controller/Themes.js
@@ -206,7 +206,7 @@ define([
                 })
 
                 this.api = api;
-                var theme_name = Common.localStorage.getItem('ui-theme', id_default_light_theme);
+                var theme_name = Common.localStorage.getItem('ui-theme') || id_default_light_theme;
 
                 if ( !$('body').hasClass(theme_name) ) {
                     $('body').addClass(theme_name);
diff --git a/apps/common/main/resources/less/colors-table-classic.less b/apps/common/main/resources/less/colors-table-classic.less
index c92beb202..f944eb714 100644
--- a/apps/common/main/resources/less/colors-table-classic.less
+++ b/apps/common/main/resources/less/colors-table-classic.less
@@ -54,7 +54,7 @@
         // Canvas colors
         --canvas-background: #e2e2e2;
         --canvas-content-background: #fff;
-        --canvas-page-border: #555;
+        --canvas-page-border: #ccc;
 
         --canvas-ruler-background: #555;
         --canvas-ruler-margins-background: #444;