diff --git a/core/ui/ViewTemplate/title.tid b/core/ui/ViewTemplate/title.tid
index adfb752f5..0f280d637 100644
--- a/core/ui/ViewTemplate/title.tid
+++ b/core/ui/ViewTemplate/title.tid
@@ -13,7 +13,7 @@ $:/config/ViewToolbarButtons/Visibility/$(listItem)$
 <$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewToolbar]!has[draft.of]]" variable="listItem"><$reveal type="nomatch" state=<<config-title>> text="hide"><$transclude tiddler=<<listItem>>/></$reveal></$list>
 </span>
 <$set name="foregroundColor" value={{!!color}}>
-<span style=<<title-styles>>>
+<span class="tc-tiddler-title-icon" style=<<title-styles>>>
 <$transclude tiddler={{!!icon}}/>
 </span>
 </$set>
@@ -29,7 +29,7 @@ $:/config/ViewToolbarButtons/Visibility/$(listItem)$
 </$list>
 </div>
 
-<$reveal type="nomatch" text="" default="" state=<<tiddlerInfoState>> class="tc-tiddler-info tc-popup-keep" animate="yes" retain="yes">
+<$reveal type="nomatch" text="" default="" state=<<tiddlerInfoState>> class="tc-tiddler-info tc-popup-handle" animate="yes" retain="yes">
 
 <$transclude tiddler="$:/core/ui/TiddlerInfo"/>