diff --git a/core/templates/SideBar.tid b/core/templates/SideBar.tid
index cf904884c..69ae6de87 100644
--- a/core/templates/SideBar.tid
+++ b/core/templates/SideBar.tid
@@ -23,8 +23,7 @@ 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> <$button message="tw-save-wiki" class="btn-invisible">{{$:/core/images/save-button.svg}}</$button>
+<$button message="tw-new-tiddler" class="btn-invisible">{{$:/core/images/new-button.svg}}</$button><$link to="$:/ControlPanel">{{$:/core/images/options-button.svg}}</$link><$button message="tw-save-wiki" class="btn-invisible">{{$:/core/images/save-button.svg}}</$button>
 </div>
 
 <div class="tw-tab-set">
diff --git a/themes/tiddlywiki/snowwhite/base.tid b/themes/tiddlywiki/snowwhite/base.tid
index 454d180fb..f686ef937 100644
--- a/themes/tiddlywiki/snowwhite/base.tid
+++ b/themes/tiddlywiki/snowwhite/base.tid
@@ -88,7 +88,7 @@ table th, table td {
 	border-left: 1px solid #ddd;
 }
 
-img, canvas, embed {
+.tw-tiddler-frame img, .tw-tiddler-frame canvas, .tw-tiddler-frame embed {
 	max-width: 100%;
 }
 
@@ -257,6 +257,7 @@ a.tw-tiddlylink-missing {
 
 .tw-page-controls img {
 	height: 1.5em;
+	min-width: 1px;
 	padding-right: 0.5em;
 }