diff --git a/customize.dist/src/less2/include/sidebar-layout.less b/customize.dist/src/less2/include/sidebar-layout.less
index ae2904407..35d22f197 100644
--- a/customize.dist/src/less2/include/sidebar-layout.less
+++ b/customize.dist/src/less2/include/sidebar-layout.less
@@ -73,6 +73,9 @@
 
             // Following rules are only in settings
             .cp-sidebarlayout-element {
+                pre {
+                    color: @cryptpad_text_col; // XXX
+                }
                 label:not(.noTitle), .label {
                     display: block;
                     font-weight: bold;
diff --git a/www/admin/app-admin.less b/www/admin/app-admin.less
index eac6f53b3..2ecf99bed 100644
--- a/www/admin/app-admin.less
+++ b/www/admin/app-admin.less
@@ -170,7 +170,8 @@
     table#cp-performance-table {
         td, th {
             padding: 5px;
-            border: 1px solid #222;
+            color: @cryptpad_text_col;
+            border: 1px solid @cryptpad_text_col;
         }
     }
 
diff --git a/www/settings/inner.js b/www/settings/inner.js
index 94f913e6e..aa005cd7f 100644
--- a/www/settings/inner.js
+++ b/www/settings/inner.js
@@ -1555,6 +1555,18 @@ define([
         });
     };
 
+    var SIDEBAR_ICONS = {
+        account: 'fa fa-user-o',
+        drive: 'fa fa-hdd-o',
+        cursor: 'fa fa-i-cursor',
+        code: 'fa fa-file-code-o',
+        pad: 'fa fa-file-word-o',
+        security: 'fa fa-lock',
+        subscription: 'fa fa-star-o',
+        kanban: 'cptools cptools-kanban',
+        style: 'cptools cptools-palette',
+    };
+
     var createLeftside = function() {
         var $categories = $('<div>', { 'class': 'cp-sidebarlayout-categories' })
             .appendTo(APP.$leftside);
@@ -1565,14 +1577,11 @@ define([
                 'class': 'cp-sidebarlayout-category',
                 'data-category': key
             }).appendTo($categories);
-            if (key === 'account') { $category.append($('<span>', { 'class': 'fa fa-user-o' })); }
-            if (key === 'drive') { $category.append($('<span>', { 'class': 'fa fa-hdd-o' })); }
-            if (key === 'cursor') { $category.append($('<span>', { 'class': 'fa fa-i-cursor' })); }
-            if (key === 'code') { $category.append($('<span>', { 'class': 'fa fa-file-code-o' })); }
-            if (key === 'pad') { $category.append($('<span>', { 'class': 'fa fa-file-word-o' })); }
-            if (key === 'security') { $category.append($('<span>', { 'class': 'fa fa-lock' })); }
-            if (key === 'subscription') { $category.append($('<span>', { 'class': 'fa fa-star-o' })); }
-            if (key === 'kanban') { $category.append($('<span>', { 'class': 'cptools cptools-kanban' })); }
+
+            var iconClass = SIDEBAR_ICONS[key];
+            if (iconClass) {
+                $category.append($('<span>', { 'class': iconClass }));
+            }
 
             if (key === active) {
                 $category.addClass('cp-leftside-active');