diff --git a/customize.dist/src/less2/include/framework.less b/customize.dist/src/less2/include/framework.less
index c698b91b9..7876195c1 100644
--- a/customize.dist/src/less2/include/framework.less
+++ b/customize.dist/src/less2/include/framework.less
@@ -19,7 +19,11 @@
 @import (reference) "./forms.less";
 @import (reference) "./modals-ui-elements.less";
 
-.framework_main(@bg-color, @warn-color, @color) {
+.framework_main(
+    @bg-color: @colortheme_default-bg, // color of the toolbar background
+    @warn-color: @colortheme_default-warn, // color of the warning text in the toolbar
+    @color: @colortheme_default-color, // Color of the text for the toolbar
+) {
     --LessLoader_require: LessLoader_currentFile();
     // Set the HTML style for the apps which shouldn't have a body scrollbar
     .app-noscroll_main();
diff --git a/www/debug/app-debug.less b/www/debug/app-debug.less
index 697a46612..52a19387c 100644
--- a/www/debug/app-debug.less
+++ b/www/debug/app-debug.less
@@ -4,7 +4,7 @@
 // body
 &.cp-app-debug {
     .tokenfield_main();
-    .framework_min_main();
+    .framework_main();
 
     display: flex;
     flex-flow: column;
diff --git a/www/debug/inner.js b/www/debug/inner.js
index f73e9120a..00d97c839 100644
--- a/www/debug/inner.js
+++ b/www/debug/inner.js
@@ -605,7 +605,7 @@ define([
             Title = common.createTitle({});
 
             var configTb = {
-                displayed: ['title', 'useradmin', 'spinner', 'share', 'userlist', 'newpad', 'limit'],
+                displayed: ['pad'],
                 title: Title.getTitleConfig(),
                 metadataMgr: metadataMgr,
                 readOnly: 1,
@@ -633,7 +633,7 @@ define([
             };
             var $hist = common.createButton('history', true, {histConfig: histConfig});
             $hist.addClass('cp-hidden-if-readonly');
-            toolbar.$rightside.append($hist);
+            toolbar.$drawer.append($hist);
 
             var $content = common.createButton(null, true, {
                 icon: 'fa-question',
@@ -642,7 +642,7 @@ define([
                 id: 'cp-app-debug-get-content'
             });
             $content.click(getContent);
-            toolbar.$rightside.append($content);
+            toolbar.$drawer.append($content);
         };
 
         config.onReady = function (info) {