diff --git a/core/images/new-button.svg b/core/images/new-button.svg
new file mode 100644
index 000000000..aa7bbf53c
--- /dev/null
+++ b/core/images/new-button.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xl="http://www.w3.org/1999/xlink" version="1.1" viewBox="83 81 50 50" width="22pt" height="22pt"><g stroke="none" stroke-opacity="1" stroke-dasharray="none" fill="none" fill-opacity="1"><g><path d="M 101.25 112.5 L 101.25 127.5 C 101.25 127.5 101.25 127.5 101.25 127.5 L 101.25 127.5 C 101.25 129.156855 102.593146 130.5 104.25 130.5 L 111.75 130.5 C 113.406854 130.5 114.75 129.156854 114.75 127.5 L 114.75 112.5 L 129.75 112.5 C 131.406854 112.5 132.75 111.156854 132.75 109.5 L 132.75 102 C 132.75 100.343146 131.406854 99 129.75 99 L 114.75 99 L 114.75 84 C 114.75 82.343146 113.406854 81 111.75 81 L 104.25 81 C 104.25 81 104.25 81 104.25 81 C 102.593146 81 101.25 82.343146 101.25 84 L 101.25 99 L 86.25 99 C 86.25 99 86.25 99 86.25 99 C 84.593146 99 83.25 100.343146 83.25 102 L 83.25 109.5 C 83.25 109.5 83.25 109.5 83.25 109.5 L 83.25 109.5 C 83.25 111.156855 84.593146 112.5 86.25 112.5 Z" fill="#fff"/></g></g></svg>
diff --git a/core/images/new-button.svg.meta b/core/images/new-button.svg.meta
new file mode 100644
index 000000000..bff0f102b
--- /dev/null
+++ b/core/images/new-button.svg.meta
@@ -0,0 +1,2 @@
+title: $:/core/images/new-button.svg
+type: image/svg+xml
diff --git a/core/images/options-button.svg b/core/images/options-button.svg
new file mode 100644
index 000000000..b5029d3d4
--- /dev/null
+++ b/core/images/options-button.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xl="http://www.w3.org/1999/xlink" version="1.1" viewBox="434 218 68 68" width="22pt" height="22pt"><g stroke="none" stroke-opacity="1" stroke-dasharray="none" fill="none" fill-opacity="1"><g><path d="M 478.39696 232.53705 L 478.39696 232.53705 C 477.11453 231.85132 475.77877 231.30146 474.4106 230.88735 L 474.4106 218.24993 L 461.58944 218.24993 L 461.58944 230.88735 C 460.22126 231.30146 458.8855 231.85132 457.60308 232.53705 L 448.66825 223.60214 L 439.6022 232.66814 L 448.53716 241.60304 C 447.8515 242.88541 447.30158 244.22116 446.88747 245.58935 L 434.25 245.58935 L 434.25 258.41052 L 446.88747 258.41052 C 447.30158 259.7787 447.8515 261.11446 448.53716 262.39689 L 439.6022 271.33173 L 448.66825 280.39779 L 457.60308 271.46281 C 458.8855 272.14862 460.22126 272.69847 461.58944 273.11251 L 461.58944 285.74986 L 474.4106 285.74986 L 474.4106 273.11251 C 475.77877 272.69847 477.11453 272.14862 478.39696 271.46281 L 487.3318 280.39779 L 496.3977 271.33173 L 487.46287 262.39689 C 488.14854 261.11446 488.6984 259.7787 489.11257 258.41052 L 501.7499 258.41052 L 501.7499 245.58935 L 489.11257 245.58935 C 488.6984 244.22116 488.14854 242.88541 487.46287 241.60304 L 496.3977 232.66814 L 487.3318 223.60214 Z M 475.3328 244.66714 C 479.38253 248.71698 479.38253 255.2829 475.3328 259.33273 C 471.28297 263.3826 464.71706 263.3826 460.66723 259.33273 C 456.61737 255.2829 456.61737 248.71698 460.66723 244.66714 C 464.71706 240.61734 471.28297 240.61734 475.3328 244.66714" fill="#fff"/></g></g></svg>
diff --git a/core/images/options-button.svg.meta b/core/images/options-button.svg.meta
new file mode 100644
index 000000000..2f9ec7f97
--- /dev/null
+++ b/core/images/options-button.svg.meta
@@ -0,0 +1,2 @@
+title: $:/core/images/options-button.svg
+type: image/svg+xml
diff --git a/core/templates/ControlPanel.tid b/core/templates/ControlPanel.tid
deleted file mode 100644
index 1aae81cac..000000000
--- a/core/templates/ControlPanel.tid
+++ /dev/null
@@ -1,23 +0,0 @@
-title: $:/templates/ControlPanel
-
-<$button message="tw-new-tiddler" class="btn btn-success">New Tiddler</$button>
-
----
-
-Import: <$import class="tw-drop-zone">
-
-Drop files here
-
-</$import>
-
----
-
-<$button message="tw-save-wiki" class="btn btn-primary">Save Changes</$button>
-
----
-
-{{$:/snippets/encryptionstatus}}
-
----
-
-{{$:/snippets/themeswitcher}}
diff --git a/core/templates/SideBar.tid b/core/templates/SideBar.tid
index 0f6d7dffa..ed4dacfaa 100644
--- a/core/templates/SideBar.tid
+++ b/core/templates/SideBar.tid
@@ -22,6 +22,11 @@ title: $:/templates/SideBar
 
 <$reveal state="$:/temp/search" type="match" text="">
 
+<div class="tw-page-controls">
+<$button message="tw-new-tiddler" class="btn-invisible">{{$:/core/images/new-button.svg}}</$button>
+<$link to="$:/ControlPanel">{{$:/core/images/options-button.svg}}</$link>
+</div>
+
 <div class="tw-tab-set">
 <div class="tw-tab-buttons"><$button type="set" set="$:/state/sideBarTabSet" setTo="openTab" qualifyTiddlerTitles="yes" selectedClass="tw-tab-selected">Open</$button><$button type="set" set="$:/state/sideBarTabSet" setTo="allTab" qualifyTiddlerTitles="yes" selectedClass="tw-tab-selected">All</$button><$button type="set" set="$:/state/sideBarTabSet" setTo="toolsTab" qualifyTiddlerTitles="yes" selectedClass="tw-tab-selected">Tools</$button><$button type="set" set="$:/state/sideBarTabSet" setTo="moreTab" qualifyTiddlerTitles="yes" selectedClass="tw-tab-selected">More</$button></div>
 <div class="tw-tab-divider tw-sidebar-tab-divider">
@@ -37,8 +42,7 @@ title: $:/templates/SideBar
 <$list filter="[!is[system]sort[title]]" itemClass="tw-menu-list-item"/>
 </$reveal>
 <$reveal type="match" state="$:/state/sideBarTabSet" text="toolsTab" qualifyTiddlerTitles="yes">
-{{$:/templates/ControlPanel}}
-{{$:/templates/ServerControlPanel}}
+{{$:/templates/ToolsPanel}}
 </$reveal>
 <$reveal type="match" state="$:/state/sideBarTabSet" text="moreTab" qualifyTiddlerTitles="yes">
 {{$:/templates/MoreSideBar}}
diff --git a/core/templates/ToolsPanel.tid b/core/templates/ToolsPanel.tid
new file mode 100644
index 000000000..f0aa336a4
--- /dev/null
+++ b/core/templates/ToolsPanel.tid
@@ -0,0 +1,15 @@
+title: $:/templates/ToolsPanel
+
+Import: <$import class="tw-drop-zone"/>
+
+---
+
+<$button message="tw-save-wiki" class="btn btn-primary">Save Changes</$button>
+
+---
+
+{{$:/snippets/encryptionstatus}}
+
+---
+
+{{$:/snippets/themeswitcher}}
diff --git a/core/wiki/ControlPanel.tid b/core/wiki/ControlPanel.tid
new file mode 100644
index 000000000..22d858e77
--- /dev/null
+++ b/core/wiki/ControlPanel.tid
@@ -0,0 +1,23 @@
+title: $:/ControlPanel
+
+! Import tiddlers
+
+Browse for files on your computer to import their contents (the individual tiddlers within TiddlyWiki HTML files are imported separately).
+
+<$import class="tw-drop-zone"/>
+
+! Save changes
+
+<$button message="tw-save-wiki" class="btn btn-primary">Save Changes</$button>
+
+! Encryption
+
+The tiddlers in TiddlyWiki documents can be securely encrypted by specifying a password before saving changes.
+
+{{$:/snippets/encryptionstatus}}
+
+! Theme
+
+{{$:/snippets/themeswitcher}}
+
+{{$:/templates/ServerControlPanel}}
diff --git a/themes/tiddlywiki/snowwhite/base.tid b/themes/tiddlywiki/snowwhite/base.tid
index 4936752a6..57800f124 100644
--- a/themes/tiddlywiki/snowwhite/base.tid
+++ b/themes/tiddlywiki/snowwhite/base.tid
@@ -252,8 +252,12 @@ a.tw-tiddlylink-missing {
 	padding-top: 1em;
 }
 
-.tw-page-controls .tw-button img {
-	height: 1em;
+.tw-page-controls {
+	margin-top: 1em;
+}
+
+.tw-page-controls img {
+	height: 1.5em;
 }
 
 .tw-menu-list-item {