diff --git a/core/ui/PageTemplate/topleftbar.tid b/core/ui/PageTemplate/topleftbar.tid
index 421801b3e..44698fd1c 100644
--- a/core/ui/PageTemplate/topleftbar.tid
+++ b/core/ui/PageTemplate/topleftbar.tid
@@ -3,6 +3,10 @@ tags: $:/tags/PageTemplate
 
 <span class="tw-topbar tw-topbar-left">
 
-<$list filter="[all[shadows+tiddlers]tag[$:/tags/TopLeftBar]!has[draft.of]]" variable="listItem"><$transclude tiddler=<<listItem>>/></$list>
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/TopLeftBar]!has[draft.of]]" variable="listItem">
+
+<$transclude tiddler=<<listItem>> mode="inline"/>
+
+</$list>
 
 </span>
diff --git a/core/ui/PageTemplate/toprightbar.tid b/core/ui/PageTemplate/toprightbar.tid
index eef18bf9e..c4af52698 100644
--- a/core/ui/PageTemplate/toprightbar.tid
+++ b/core/ui/PageTemplate/toprightbar.tid
@@ -3,6 +3,10 @@ tags: $:/tags/PageTemplate
 
 <span class="tw-topbar tw-topbar-right">
 
-<$list filter="[all[shadows+tiddlers]tag[$:/tags/TopRightBar]!has[draft.of]]" variable="listItem"><$transclude tiddler=<<listItem>>/></$list>
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/TopRightBar]!has[draft.of]]" variable="listItem">
+
+<$transclude tiddler=<<listItem>> mode="inline"/>
+
+</$list>
 
 </span>
diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid
index ca844a6dc..a02a05dcb 100644
--- a/themes/tiddlywiki/vanilla/base.tid
+++ b/themes/tiddlywiki/vanilla/base.tid
@@ -330,13 +330,13 @@ a.tw-tiddlylink-external:hover {
 }
 
 .tw-topbar-left {
-	left: 0;
-	top: 0;
+	left: 29px;
+	top: 5px;
 }
 
 .tw-topbar-right {
-	top: 0;
-	right: 0;
+	top: 5px;
+	right: 29px;
 }
 
 .tw-topbar button {