diff --git a/core/language/en-GB/Buttons.multids b/core/language/en-GB/Buttons.multids
index e5e683db0..01feb8410 100644
--- a/core/language/en-GB/Buttons.multids
+++ b/core/language/en-GB/Buttons.multids
@@ -30,8 +30,10 @@ ExportTiddler/Caption: export tiddler
 ExportTiddler/Hint: Export tiddler
 ExportTiddlers/Caption: export tiddlers
 ExportTiddlers/Hint: Export tiddlers
-Fold/Caption: fold/unfold tiddler
-Fold/Hint: Fold/unfold the body of this tiddler
+Fold/Caption: fold tiddler
+Fold/Hint: Fold the body of this tiddler
+Unfold/Caption: unfold tiddler
+Unfold/Hint: Unfold the body of this tiddler
 FoldOthers/Caption: fold other tiddlers
 FoldOthers/Hint: Fold the bodies of other opened tiddlers
 FullScreen/Caption: full-screen
diff --git a/core/ui/ViewToolbar/fold.tid b/core/ui/ViewToolbar/fold.tid
index a68e520a2..f86bb0dd1 100644
--- a/core/ui/ViewToolbar/fold.tid
+++ b/core/ui/ViewToolbar/fold.tid
@@ -7,17 +7,30 @@ description: {{$:/language/Buttons/Fold/Hint}}
 $:/state/folded/$(currentTiddler)$
 \end
 
+<$reveal type="nomatch" state=<<folded-state>> text="hide" default="show">
 <$button tooltip={{$:/language/Buttons/Fold/Hint}} aria-label={{$:/language/Buttons/Fold/Caption}} class=<<tv-config-toolbar-class>>>
 <$action-sendmessage $message="tm-fold-tiddler" $param=<<currentTiddler>> foldedState=<<folded-state>>/>
 <$list filter="[<tv-config-toolbar-icons>prefix[yes]]" variable="listItem">
-<$reveal type="nomatch" state=<<folded-state>> text="hide" default="show">
 {{$:/core/images/fold-button}}
-</$reveal>
-<$reveal type="match" state=<<folded-state>> text="hide" default="show">
-{{$:/core/images/unfold-button}}
-</$reveal>
 </$list>
 <$list filter="[<tv-config-toolbar-text>prefix[yes]]">
-<span class="tc-btn-text"><$text text={{$:/language/Buttons/Fold/Caption}}/></span>
+<span class="tc-btn-text">
+<$text text={{$:/language/Buttons/Fold/Caption}}/>
+</span>
 </$list>
-</$button>
\ No newline at end of file
+</$button>
+</$reveal>
+
+<$reveal type="match" state=<<folded-state>> text="hide" default="show">
+<$button tooltip={{$:/language/Buttons/Unfold/Hint}} aria-label={{$:/language/Buttons/Unfold/Caption}} class=<<tv-config-toolbar-class>>>
+<$action-sendmessage $message="tm-fold-tiddler" $param=<<currentTiddler>> foldedState=<<folded-state>>/>
+<$list filter="[<tv-config-toolbar-icons>prefix[yes]]" variable="listItem">
+{{$:/core/images/unfold-button}}
+</$list>
+<$list filter="[<tv-config-toolbar-text>prefix[yes]]">
+<span class="tc-btn-text">
+<$text text={{$:/language/Buttons/Unfold/Caption}}/>
+</span>
+</$list>
+</$button>
+</$reveal>
diff --git a/core/wiki/config/ViewToolbarButtons.multids b/core/wiki/config/ViewToolbarButtons.multids
index 46ae96ba1..dfa3f027e 100644
--- a/core/wiki/config/ViewToolbarButtons.multids
+++ b/core/wiki/config/ViewToolbarButtons.multids
@@ -11,3 +11,5 @@ core/ui/Buttons/open-window: hide
 core/ui/Buttons/permalink: hide
 core/ui/Buttons/permaview: hide
 core/ui/Buttons/delete: hide
+core/ui/Buttons/fold: hide
+core/ui/Buttons/fold-others: hide