diff --git a/core/ui/PageControls/import.tid b/core/ui/PageControls/import.tid
index 0bb68ac81..f0be94dca 100644
--- a/core/ui/PageControls/import.tid
+++ b/core/ui/PageControls/import.tid
@@ -3,7 +3,7 @@ tags: $:/tags/PageControls
 caption: {{$:/core/images/import-button}} {{$:/language/Buttons/Import/Caption}}
 description: {{$:/language/Buttons/Import/Hint}}
 
-<span class="tw-file-input-wrapper">
+<div class="tw-file-input-wrapper">
 <$button title={{$:/language/Buttons/Import/Hint}} aria-label={{$:/language/Buttons/Import/Caption}} class=<<tw-config-toolbar-class>>>
 <$list filter="[<tw-config-toolbar-icons>prefix[yes]]">
 {{$:/core/images/import-button}}
@@ -13,4 +13,4 @@ description: {{$:/language/Buttons/Import/Hint}}
 </$list>
 </$button>
 <$browse/>
-</span>
+</div>
diff --git a/core/ui/TiddlerInfo/Tools.tid b/core/ui/TiddlerInfo/Tools.tid
index 1d1336b47..c14d71692 100644
--- a/core/ui/TiddlerInfo/Tools.tid
+++ b/core/ui/TiddlerInfo/Tools.tid
@@ -6,7 +6,6 @@ caption: {{$:/language/TiddlerInfo/Tools/Caption}}
 \define config-title()
 $:/config/ViewToolbarButtons/Visibility/$(listItem)$
 \end
-
 <$set name="tw-config-toolbar-icons" value="yes">
 
 <$set name="tw-config-toolbar-text" value="yes">
diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid
index a8e8b3c5d..00ffb28f9 100644
--- a/themes/tiddlywiki/vanilla/base.tid
+++ b/themes/tiddlywiki/vanilla/base.tid
@@ -270,8 +270,9 @@ button svg, button img {
 	color: <<colour foreground>>;
 }
 
-.tw-sidebar-lists button.btn {
+.tw-sidebar-lists button {
 	color: <<colour sidebar-button-foreground>>;
+	fill: <<colour sidebar-button-foreground>>;
 }
 
 .tw-sidebar-lists button.btn-mini {
@@ -534,6 +535,11 @@ button svg.tw-image-button, button .tw-image-button img {
 	border-bottom: 1px solid <<colour tiddler-info-border>>;
 }
 
+.tw-tiddler-info p {
+	margin-top: 3px;
+	margin-bottom: 3px;
+}
+
 .tw-tiddler-info .tw-tab-buttons button.tw-tab-selected {
 	background-color: <<colour tiddler-info-tab-background>>;
 	border-bottom: 1px solid <<colour tiddler-info-tab-background>>;
@@ -1360,6 +1366,8 @@ body.tw-dirty span.tw-dirty-indicator, body.tw-dirty span.tw-dirty-indicator svg
 .tw-file-input-wrapper {
 	position: relative;
 	overflow: hidden;
+	display: inline-block;
+	vertical-align: middle;
 }
 
 .tw-file-input-wrapper input[type=file] {