diff --git a/editions/tw5.com/tiddlers/concepts/ColourPalettes.tid b/editions/tw5.com/tiddlers/concepts/ColourPalettes.tid
index 75faa41e2..ad1ab780f 100644
--- a/editions/tw5.com/tiddlers/concepts/ColourPalettes.tid
+++ b/editions/tw5.com/tiddlers/concepts/ColourPalettes.tid
@@ -12,7 +12,7 @@ table-border: #ccc
 ...
 ```
 
-Several palettes form part of the core. The system tiddler [[$:/palette]] always contains the title of the currently selected palette tiddler. You can change a palette using the {{$:/core/images/palette}} ''palette'' button, found on the "Tools" tab in the sidebar.
+Several palettes form part of the core. The system tiddler [[$:/palette]] always contains the title of the currently selected palette tiddler. You can change a palette using the <<.icon $:/core/images/palette>> ''palette'' button, found on the "Tools" tab in the sidebar.
 
 To retrieve the value of a named colour from the current palette, e.g. for use in a stylesheet tiddler, use the <<.mlink colour>> macro:
 
diff --git a/editions/tw5.com/tiddlers/concepts/InfoPanel.tid b/editions/tw5.com/tiddlers/concepts/InfoPanel.tid
index 21b21ae74..8c422a5c5 100644
--- a/editions/tw5.com/tiddlers/concepts/InfoPanel.tid
+++ b/editions/tw5.com/tiddlers/concepts/InfoPanel.tid
@@ -4,7 +4,7 @@ tags: Features
 title: InfoPanel
 type: text/vnd.tiddlywiki
 
-Each tiddler has a panel of additional information. To reveal it, click the {{$:/core/images/down-arrow}} button in the tiddler's toolbar and then choose {{$:/core/images/info-button}} ''info'' from the dropdown list.
+Each tiddler has a panel of additional information. To reveal it, click the <<.icon $:/core/images/down-arrow>> button in the tiddler's toolbar and then choose <<.icon $:/core/images/info-button>> ''info'' from the dropdown list.
 
 The info panel has the following tabs:
 
diff --git a/editions/tw5.com/tiddlers/concepts/Modules.tid b/editions/tw5.com/tiddlers/concepts/Modules.tid
index 30630b66f..189d2ae24 100644
--- a/editions/tw5.com/tiddlers/concepts/Modules.tid
+++ b/editions/tw5.com/tiddlers/concepts/Modules.tid
@@ -6,4 +6,4 @@ type: text/vnd.tiddlywiki
 
 A //module// in TiddlyWiki5 is a tiddler containing executable JavaScript, of the type `application/javascript` and with the field `module-type` set to the ModuleType of the module.
 
-See [[control panel|$:/ControlPanel]] {{$:/core/images/options-button}} > ''Info'' > ''Advanced'' > ''Loaded Modules'' for a list of currently loaded modules.
+See [[control panel|$:/ControlPanel]] <<.icon $:/core/images/options-button>> > ''Info'' > ''Advanced'' > ''Loaded Modules'' for a list of currently loaded modules.
diff --git a/editions/tw5.com/tiddlers/concepts/PermaLinks.tid b/editions/tw5.com/tiddlers/concepts/PermaLinks.tid
index 3aeca187e..5127228d6 100644
--- a/editions/tw5.com/tiddlers/concepts/PermaLinks.tid
+++ b/editions/tw5.com/tiddlers/concepts/PermaLinks.tid
@@ -8,7 +8,7 @@ Permalinks allow direct links to individual tiddlers within a TiddlyWiki.
 
 ! Simple Permalinks
 
-The simplest form of permalink ({{$:/core/images/permalink-button}}) is a single target tiddler title appended to the base URL with `#`:
+The simplest form of permalink (<<.icon $:/core/images/permalink-button>>) is a single target tiddler title appended to the base URL with `#`:
 
 https://tiddlywiki.com/#HelloThere
 
@@ -42,7 +42,7 @@ Both the target tiddler title and the story filter should be URL encoded (but no
 
 ! Permalink Behaviour
 
-Two important aspects of TiddlyWiki's behaviour with permalinks can be controlled via options in the [[control panel|$:/ControlPanel]] {{$:/core/images/options-button}} ''Settings'' tab:
+Two important aspects of TiddlyWiki's behaviour with permalinks can be controlled via options in the [[control panel|$:/ControlPanel]] <<.icon $:/core/images/options-button>> ''Settings'' tab:
 
 * Whether to automatically update the address bar at each navigation, and if so whether to include the story sequence as well as the target tiddler
 * Whether the updates to the address bar should affect browser history. The default is ''no''; when switched to ''yes'' you can rewind navigation between tiddlers using the browser back and forward buttons
diff --git a/editions/tw5.com/tiddlers/features/AutoSave.tid b/editions/tw5.com/tiddlers/features/AutoSave.tid
index c8e766098..17a0ef59c 100644
--- a/editions/tw5.com/tiddlers/features/AutoSave.tid
+++ b/editions/tw5.com/tiddlers/features/AutoSave.tid
@@ -4,8 +4,8 @@ tags: Features
 title: AutoSave
 type: text/vnd.tiddlywiki
 
-If there is a SaverModule available that supports it, TiddlyWiki will automatically trigger a save of the current document on clicking {{$:/core/images/done-button}} ''ok'' or {{$:/core/images/delete-button}} ''delete'' when editing a tiddler.
+If there is a SaverModule available that supports it, TiddlyWiki will automatically trigger a save of the current document on clicking <<.icon $:/core/images/done-button>> ''ok'' or <<.icon $:/core/images/delete-button>> ''delete'' when editing a tiddler.
 
 You should see a yellow notification at the top right of the window to confirm that an automatic save has taken place.
 
-Automatic saving can be enabled or disabled through the ''Settings'' tab of the [[control panel|$:/ControlPanel]] {{$:/core/images/options-button}}. Behind the scenes, it is controlled through the configuration tiddler [[$:/config/AutoSave]], which must have the value ''yes'' to enable automatic saving.
+Automatic saving can be enabled or disabled through the ''Settings'' tab of the [[control panel|$:/ControlPanel]] <<.icon $:/core/images/options-button>>. Behind the scenes, it is controlled through the configuration tiddler [[$:/config/AutoSave]], which must have the value ''yes'' to enable automatic saving.
diff --git a/editions/tw5.com/tiddlers/features/Importing Tiddlers.tid b/editions/tw5.com/tiddlers/features/Importing Tiddlers.tid
index a03082a9f..2e03b4cd1 100644
--- a/editions/tw5.com/tiddlers/features/Importing Tiddlers.tid	
+++ b/editions/tw5.com/tiddlers/features/Importing Tiddlers.tid	
@@ -10,7 +10,7 @@ You can import tiddlers into a ~TiddlyWiki from external files or directly from
 
 There are several ways to import content from external files:
 
-* Use the {{$:/core/images/import-button}} ''import'' button (under the ''Tools'' tab in the sidebar) to select a local file
+* Use the <<.icon $:/core/images/import-button>> ''import'' button (under the ''Tools'' tab in the sidebar) to select a local file
 * Drag and drop files from Windows Explorer or OS X Finder etc. into the TiddlyWiki browser window
 * Paste content directly from the clipboard using the menu or keyboard shortcut (<kbd>ctrl-V</kbd> or <kbd>cmd-V</kbd>)
 ** Currently supported in Chrome, Firefox and Edge (but not Internet Explorer)
diff --git a/editions/tw5.com/tiddlers/features/SafeMode.tid b/editions/tw5.com/tiddlers/features/SafeMode.tid
index 03fa8f00d..66f55da11 100644
--- a/editions/tw5.com/tiddlers/features/SafeMode.tid
+++ b/editions/tw5.com/tiddlers/features/SafeMode.tid
@@ -18,7 +18,7 @@ https://tiddlywiki.com/#:safe
 
 Safe mode triggers two changes:
 
-* All plugins are temporarily disabled. You can use the [[control panel|$:/ControlPanel]] {{$:/core/images/options-button}} to disable individual plugins
+* All plugins are temporarily disabled. You can use the [[control panel|$:/ControlPanel]] <<.icon $:/core/images/options-button>> to disable individual plugins
 * Any tiddlers that override shadow tiddlers are renamed to give them the prefix `SAFE: `, thus restoring the underlying shadow tiddler
 * Certain configuration options are ignored, and the default settings used instead:
 ** WikiParserRuleConfiguration
diff --git a/editions/tw5.com/tiddlers/features/Searching in TiddlyWiki.tid b/editions/tw5.com/tiddlers/features/Searching in TiddlyWiki.tid
index 98cbf2eb1..2cd7a8bc6 100644
--- a/editions/tw5.com/tiddlers/features/Searching in TiddlyWiki.tid	
+++ b/editions/tw5.com/tiddlers/features/Searching in TiddlyWiki.tid	
@@ -14,7 +14,7 @@ Typing text into the search box in the sidebar will turn up a list of all the ti
 
 ! Advanced searching
 
-Clicking on the magnifying glass icon {{$:/core/images/advanced-search-button}} to the right of the search box will open [[$:/AdvancedSearch]]. This tiddler contains four tabs:
+Clicking on the magnifying glass icon <<.icon $:/core/images/advanced-search-button>> to the right of the search box will open [[$:/AdvancedSearch]]. This tiddler contains four tabs:
 
 * The ''standard'' tab contains another instance of the search box found in the sidebar
 * The ''system'' tab allows you to limit your search to system tiddlers
diff --git a/editions/tw5.com/tiddlers/howtos/Adding_a_table_of_contents_to_the_sidebar.tid b/editions/tw5.com/tiddlers/howtos/Adding_a_table_of_contents_to_the_sidebar.tid
index 5587a8854..4c43d22ce 100644
--- a/editions/tw5.com/tiddlers/howtos/Adding_a_table_of_contents_to_the_sidebar.tid
+++ b/editions/tw5.com/tiddlers/howtos/Adding_a_table_of_contents_to_the_sidebar.tid
@@ -19,7 +19,7 @@ A customisable [[table of contents|Table-of-Contents Macros]] can be added to th
 # Add a ''caption'' field with the text ''Contents''
 # Add a ''list-after'' field with the text ''~$:/core/ui/SideBar/Open''
 
-Add entries to the table of contents by creating tiddlers tagged ''~TableOfContents''. An easy way is to choose {{$:/core/images/new-here-button}} ''new here'' from the tiddler toolbar of the ''~TableOfContents'' tiddler. 
-(if you don't see the "new here" button, click on the down arrow {{$:/core/images/down-arrow}} to see more menu options.)
+Add entries to the table of contents by creating tiddlers tagged ''~TableOfContents''. An easy way is to choose <<.icon $:/core/images/new-here-button>> ''new here'' from the tiddler toolbar of the ''~TableOfContents'' tiddler. 
+(if you don't see the "new here" button, click on the down arrow <<.icon $:/core/images/down-arrow>> to see more menu options.)
 
 To create child tiddlers (tiddlers that come below other tiddlers), tag them with the name of the parent tiddler.
diff --git a/editions/tw5.com/tiddlers/howtos/How to create keyboard shortcuts.tid b/editions/tw5.com/tiddlers/howtos/How to create keyboard shortcuts.tid
index cbcbd3ba8..3b82a0a6a 100644
--- a/editions/tw5.com/tiddlers/howtos/How to create keyboard shortcuts.tid	
+++ b/editions/tw5.com/tiddlers/howtos/How to create keyboard shortcuts.tid	
@@ -14,7 +14,7 @@ A tiddler with the <<.def prefix>> `$:/config/ShortcutInfo/` and a ''unique suff
 
 In the [[Keyboard Shortcuts Tab|$:/core/ui/ControlPanel/KeyboardShortcuts]] the ''key combination'' that should trigger the shortcut can be configured:
 
-> Look for the ''unique suffix'' defined for the new shortcut and click the <$button class="tc-btn-invisible">{{$:/core/images/edit-button}}<$action-sendmessage $message="tm-notify" $param="$:/core/images/edit-button"/></$button> button to open a popup that detects ''key combinations'' and shows the detected combination in its input field
+> Look for the ''unique suffix'' defined for the new shortcut and click the <$button class="tc-btn-invisible"><<.icon $:/core/images/edit-button>><$action-sendmessage $message="tm-notify" $param="$:/core/images/edit-button"/></$button> button to open a popup that detects ''key combinations'' and shows the detected combination in its input field
 
 >The ''add shortcut'' assigns the key-combination to the shortcut
 
diff --git a/editions/tw5.com/tiddlers/howtos/How to export tiddlers.tid b/editions/tw5.com/tiddlers/howtos/How to export tiddlers.tid
index de66f05e9..c1c30b880 100644
--- a/editions/tw5.com/tiddlers/howtos/How to export tiddlers.tid	
+++ b/editions/tw5.com/tiddlers/howtos/How to export tiddlers.tid	
@@ -6,17 +6,17 @@ type: text/vnd.tiddlywiki
 
 ! Selecting All tiddlers for export
 
-To export ''all'' tiddlers click on the "Tools" tab of the Sidebar. Find and click the {{$:/core/images/export-button}} ''export all'' button. A pop-up menu will offer you the chance to export tiddlers in multiple formats.
+To export ''all'' tiddlers click on the "Tools" tab of the Sidebar. Find and click the <<.icon $:/core/images/export-button>> ''export all'' button. A pop-up menu will offer you the chance to export tiddlers in multiple formats.
 
 ! Exporting a tiddler
 
-If you want to export a particular tiddler, first navigate to that tiddler. Then click on the {{$:/core/images/down-arrow}} ''more'' button that appears above the tiddler. From the list that appears select {{$:/core/images/export-button}} ''export tiddler''. A pop-up menu will offer you the chance to export the tiddler in multiple formats.
+If you want to export a particular tiddler, first navigate to that tiddler. Then click on the <<.icon $:/core/images/down-arrow>> ''more'' button that appears above the tiddler. From the list that appears select <<.icon $:/core/images/export-button>> ''export tiddler''. A pop-up menu will offer you the chance to export the tiddler in multiple formats.
 
 ! Exporting tiddlers matching a criteria (filter)
 
-To export a selection of tiddlers, click the little magnifying glass {{$:/core/images/advanced-search-button}} next to the search area on the sidebar. This will open the [[Advanced Search|$:/AdvancedSearch]] tiddler. Click on the "Filter" tab of the Advanced Search tiddler. Only the [[Filter|Filters]] tab will allow you to export a selection of tiddlers. [[Filters]] follow a particular syntax. Click on this [[Filters|Filters]] link to learn about how to make filters.
+To export a selection of tiddlers, click the little magnifying glass <<.icon $:/core/images/advanced-search-button>> next to the search area on the sidebar. This will open the [[Advanced Search|$:/AdvancedSearch]] tiddler. Click on the "Filter" tab of the Advanced Search tiddler. Only the [[Filter|Filters]] tab will allow you to export a selection of tiddlers. [[Filters]] follow a particular syntax. Click on this [[Filters|Filters]] link to learn about how to make filters.
 
-Once you have written a filter, a list of tiddlers matching the filter will appear. Now you can click on the {{$:/core/images/export-button}} ''export tiddler'' button to the right of the filter input field. A pop-up menu will offer you the chance to export tiddlers in multiple formats.
+Once you have written a filter, a list of tiddlers matching the filter will appear. Now you can click on the <<.icon $:/core/images/export-button>> ''export tiddler'' button to the right of the filter input field. A pop-up menu will offer you the chance to export tiddlers in multiple formats.
 
 ! Export formats
 
diff --git a/editions/tw5.com/tiddlers/howtos/How to put the last modification date in a banner.tid b/editions/tw5.com/tiddlers/howtos/How to put the last modification date in a banner.tid
index ba1d780be..25a5a3128 100644
--- a/editions/tw5.com/tiddlers/howtos/How to put the last modification date in a banner.tid	
+++ b/editions/tw5.com/tiddlers/howtos/How to put the last modification date in a banner.tid	
@@ -7,7 +7,7 @@ type: text/vnd.tiddlywiki
 Here's how to display the last modification date of a wiki in a banner in the corner of the window:
 
 # [[Install the plugin|Installing a plugin from the plugin library]] <<.def "Corner ribbon">> in your ~TiddlyWiki
-# Save ({{$:/core/images/save-button}}) and reload ({{$:/core/images/refresh-button}}) your wiki
+# Save (<<.icon $:/core/images/save-button>>) and reload (<<.icon $:/core/images/refresh-button>>) your wiki
 # Create a new tiddler called [[$:/_MyRibbon]] tagged [[$:/tags/PageControls]] and containing:<div>
 
 ```
diff --git a/editions/tw5.com/tiddlers/howtos/Insert link.tid b/editions/tw5.com/tiddlers/howtos/Insert link.tid
index 91ef2dc17..d5e8ad5be 100644
--- a/editions/tw5.com/tiddlers/howtos/Insert link.tid	
+++ b/editions/tw5.com/tiddlers/howtos/Insert link.tid	
@@ -5,6 +5,6 @@ title: Insert link
 
 This will give you a dialog to search for and pick existing tiddlers in the wiki. When you pick a tiddler it will be inserted as a WikiText link where the cursor is in the text field.
 
-Pressing {{$:/core/images/link}} will give you `[[Some link]]`
+Pressing <<.icon $:/core/images/link>> will give you `[[Some link]]`
 
 It wil ''not'' insert: external web links or [[picture|Insert picture]] links.
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/howtos/Insert picture.tid b/editions/tw5.com/tiddlers/howtos/Insert picture.tid
index a9c07f56e..7a0b46e48 100644
--- a/editions/tw5.com/tiddlers/howtos/Insert picture.tid	
+++ b/editions/tw5.com/tiddlers/howtos/Insert picture.tid	
@@ -6,4 +6,4 @@ title: Insert picture
 This will give you a dialog to search for and pick existing image tiddlers in the wiki. When you pick a tiddler it will be inserted as a WikiText  image link where the cursor is in the text field.
 
 
-Pressing {{$:/core/images/picture}} will give you `[img[$:/favicon.ico]]`
\ No newline at end of file
+Pressing <<.icon $:/core/images/picture>> will give you `[img[$:/favicon.ico]]`
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/howtos/KeyboardShortcuts.tid b/editions/tw5.com/tiddlers/howtos/KeyboardShortcuts.tid
index f8deba7f7..9ecece61d 100644
--- a/editions/tw5.com/tiddlers/howtos/KeyboardShortcuts.tid
+++ b/editions/tw5.com/tiddlers/howtos/KeyboardShortcuts.tid
@@ -24,7 +24,7 @@ Keyboard shortcuts are available for common editing operations within the Text E
 * Creating a new journal (defaults to <kbd>alt-J</kbd> )
 * Creating a new image (defaults to <kbd>alt-I</kbd> )
 
-The current shortcuts can be inspected and customised in the "Keyboard Shortcuts" tab of the [[Control Panel|$:/ControlPanel]] {{$:/core/images/options-button}}.
+The current shortcuts can be inspected and customised in the "Keyboard Shortcuts" tab of the [[Control Panel|$:/ControlPanel]] <<.icon $:/core/images/options-button>>.
 
 !! Special Keys
 
diff --git a/editions/tw5.com/tiddlers/howtos/More actions.tid b/editions/tw5.com/tiddlers/howtos/More actions.tid
index 102c87711..edb3fb7d1 100644
--- a/editions/tw5.com/tiddlers/howtos/More actions.tid	
+++ b/editions/tw5.com/tiddlers/howtos/More actions.tid	
@@ -3,4 +3,4 @@ modified: 20160817110101356
 tags: [[Editor toolbar]]
 title: More actions
 
-Pressing {{$:/core/images/down-arrow}} Gives you  a dropdown menu with more editing options.
\ No newline at end of file
+Pressing <<.icon $:/core/images/down-arrow>> Gives you  a dropdown menu with more editing options.
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/howtos/Setting a page background image.tid b/editions/tw5.com/tiddlers/howtos/Setting a page background image.tid
index 47c8c5b6e..d80e9acf4 100644
--- a/editions/tw5.com/tiddlers/howtos/Setting a page background image.tid	
+++ b/editions/tw5.com/tiddlers/howtos/Setting a page background image.tid	
@@ -6,7 +6,7 @@ type: text/vnd.tiddlywiki
 
 # Import your image as a tiddler (see [[Images in WikiText]])
 #* You can also use an [[external image|ExternalImages]]
-# Open the [[control panel|$:/ControlPanel]] {{$:/core/images/options-button}} and switch to the ''Appearance''/''Theme Tweaks'' tab
+# Open the [[control panel|$:/ControlPanel]] <<.icon $:/core/images/options-button>> and switch to the ''Appearance''/''Theme Tweaks'' tab
 # Select your image from the dropdown labelled "Page background image"
 # Set "Page background image attachment" to "Fixed to window" to have the background stay stationary and the content to scroll over the top of it, or "Scroll with tiddlers" to have it move (note that the iPhone/iPad [[doesn't support the fixed setting|http://stackoverflow.com/a/20444219]] for performance reasons)
 # Set "Page background image size" as follows:
diff --git a/editions/tw5.com/tiddlers/howtos/Tagging.tid b/editions/tw5.com/tiddlers/howtos/Tagging.tid
index 46b42e3e8..a023c3222 100644
--- a/editions/tw5.com/tiddlers/howtos/Tagging.tid
+++ b/editions/tw5.com/tiddlers/howtos/Tagging.tid
@@ -26,10 +26,10 @@ There are two more things you can do with tags:
 
 ! Set a tag's colour and icon
 
-You can use the {{$:/core/images/tag-button}} [[tag manager|$:/TagManager]], found on the ''Tags'' tab under ''More'' in the sidebar, to change the colour of a tag's pill or add an icon to the pill.
+You can use the <<.icon $:/core/images/tag-button>> [[tag manager|$:/TagManager]], found on the ''Tags'' tab under ''More'' in the sidebar, to change the colour of a tag's pill or add an icon to the pill.
 
 * To change the colour, click the button in the ''Colour'' column to select from a colour picker. Alternatively, click the icon in the ''Info'' column, then type a [[CSS]] colour value in the ''Colour'' field
-* To change the icon, click the {{$:/core/images/down-arrow}} button in the ''Icon'' column and choose from the list of available icons
+* To change the icon, click the <<.icon $:/core/images/down-arrow>> button in the ''Icon'' column and choose from the list of available icons
 
 ! Change the order in which tags are listed
 
diff --git a/editions/tw5.com/tiddlers/howtos/Upgrading.tid b/editions/tw5.com/tiddlers/howtos/Upgrading.tid
index 45ba13fee..c872ea37e 100644
--- a/editions/tw5.com/tiddlers/howtos/Upgrading.tid
+++ b/editions/tw5.com/tiddlers/howtos/Upgrading.tid
@@ -27,7 +27,7 @@ This process will work on most desktop browsers. Note that none of your personal
 #* If the file is encrypted you will be prompted for the password
 # Review the list of tiddlers that will be upgraded
 # Click ''Upgrade''
-# Save changes to save the new version ({{$:/core/images/save-button}})
+# Save changes to save the new version (<<.icon $:/core/images/save-button>>)
 
 This will download a file called ''upgrade.html'' to your computer. This file is the upgrade of your old file. You may need to open the location where ''upgrade.html'' was downloaded, rename ''upgrade.html'' with the name of the old file you are upgrading, and replace the old file by moving the new file in its place.
 
diff --git a/editions/tw5.com/tiddlers/howtos/Using Excise.tid b/editions/tw5.com/tiddlers/howtos/Using Excise.tid
index f0c13125d..ef3be9a96 100644
--- a/editions/tw5.com/tiddlers/howtos/Using Excise.tid	
+++ b/editions/tw5.com/tiddlers/howtos/Using Excise.tid	
@@ -6,11 +6,11 @@ type: text/vnd.tiddlywiki
 
 
 ! Excise text
-From the EditorToolbar you can export selected text to a new tiddler and insert a [[link|Linking in WikiText]] [[Transclusion]] or [[macro|Macros]] in its place. Click ''Excise text'' ({{$:/core/images/excise}}), input name of the new tiddler, and choose excise method.
+From the EditorToolbar you can export selected text to a new tiddler and insert a [[link|Linking in WikiText]] [[Transclusion]] or [[macro|Macros]] in its place. Click ''Excise text'' (<<.icon $:/core/images/excise>>), input name of the new tiddler, and choose excise method.
 
 !! How to excise text
 # Highlight the relevant piece of text 
-#Click ''Excise text'' ({{$:/core/images/excise}})
+#Click ''Excise text'' (<<.icon $:/core/images/excise>>)
 # Give the new tiddler a title.
 # Chosse if the new tiddler will be tagged with the title of the current tiddler''*''.
 # Choose replacing method. [[link|Linking in WikiText]] [[Transclusion]] or [[macro|Macros]].
diff --git a/editions/tw5.com/tiddlers/howtos/Using Stamp.tid b/editions/tw5.com/tiddlers/howtos/Using Stamp.tid
index 07de4d7a0..ce639e087 100644
--- a/editions/tw5.com/tiddlers/howtos/Using Stamp.tid	
+++ b/editions/tw5.com/tiddlers/howtos/Using Stamp.tid	
@@ -5,24 +5,24 @@ title: Using Stamp
 type: text/vnd.tiddlywiki
 
 ! Insert snippets
-You can insert preconfigured snippets of text to use stamp from toolbar. Click ''stamp'' ({{$:/core/images/stamp}}) and just select a snippet.
+You can insert preconfigured snippets of text to use stamp from toolbar. Click ''stamp'' (<<.icon $:/core/images/stamp>>) and just select a snippet.
 
 ! Create a snippet
-# Click ''stamp'' ({{$:/core/images/stamp}})
+# Click ''stamp'' (<<.icon $:/core/images/stamp>>)
 # Create a snippet tiddler through the "//Add your own//" menu entry
 # Type some text as snippet for the tiddler, add a caption for the name as shown in the menu
-# Click the {{$:/core/images/done-button}} ''ok'' button
+# Click the <<.icon $:/core/images/done-button>> ''ok'' button
 
-<<.tip """''Tip:'' You can also create a snippet tiddler using the ''new tiddler'' {{$:/core/images/new-button}} button in the sidebar, and add tag ''~$:/tags/TextEditor/Snippet''""">>
+<<.tip """''Tip:'' You can also create a snippet tiddler using the ''new tiddler'' <<.icon $:/core/images/new-button>> button in the sidebar, and add tag ''~$:/tags/TextEditor/Snippet''""">>
 
 
 !!<<.from-version "5.1.20">> Adding a prefix and/or suffix to a selection
 
-# Click ''stamp'' ({{$:/core/images/stamp}})
+# Click ''stamp'' (<<.icon $:/core/images/stamp>>)
 # Create a snippet tiddler through the "//Add your own//" menu entry
 # Add a caption for the name as shown in the menu
 # Create a tiddler with the same title but add the suffix `/prefix`
 # Insert the prefix in its text field
 # Create a tiddler with the same title but add the suffix `/suffix`
 # Insert the suffix in its text field
-# Click the {{$:/core/images/done-button}} ''ok'' button
+# Click the <<.icon $:/core/images/done-button>> ''ok'' button
diff --git a/editions/tw5.com/tiddlers/howtos/Using Stylesheets.tid b/editions/tw5.com/tiddlers/howtos/Using Stylesheets.tid
index d9cf73041..2a8429c2b 100644
--- a/editions/tw5.com/tiddlers/howtos/Using Stylesheets.tid	
+++ b/editions/tw5.com/tiddlers/howtos/Using Stylesheets.tid	
@@ -18,7 +18,7 @@ The first steps to changing the appearance of ~TiddlyWiki are to choose and appl
 
 * One of the available themes: <span class="tc-btn-standard"> {{$:/core/ui/Buttons/theme}} </span>
 * Modify the colour palette: <span class="tc-btn-standard"> {{$:/core/ui/Buttons/palette}} </span>
-* Experiment with the <$button actions=<<openCpTheme>> >{{$:/core/images/options-button}} ControlPanel</$button>
+* Experiment with the <$button actions=<<openCpTheme>> ><<.icon $:/core/images/options-button>> ControlPanel</$button>
 
 ! Work with Stylesheets
 
diff --git a/editions/tw5.com/tiddlers/mechanisms/AlertMechanism.tid b/editions/tw5.com/tiddlers/mechanisms/AlertMechanism.tid
index ff54d1d0d..a8c22dbbf 100644
--- a/editions/tw5.com/tiddlers/mechanisms/AlertMechanism.tid
+++ b/editions/tw5.com/tiddlers/mechanisms/AlertMechanism.tid
@@ -4,7 +4,7 @@ tags: Mechanisms Features
 title: AlertMechanism
 type: text/vnd.tiddlywiki
 
-Alerts are displayed as yellow boxes overlaying the main TiddlyWiki window. Each one corresponds to a tiddler with the tag [[$:/tags/Alert]]. Clicking the {{$:/core/images/delete-button}} delete icon on an alert deletes the corresponding tiddler.
+Alerts are displayed as yellow boxes overlaying the main TiddlyWiki window. Each one corresponds to a tiddler with the tag [[$:/tags/Alert]]. Clicking the <<.icon $:/core/images/delete-button>> delete icon on an alert deletes the corresponding tiddler.
 
 Here's a demo <$fieldmangler tiddler="SampleAlert"><$set name="currentTiddler" value="SampleAlert"><$button message="tm-add-tag" param="$:/tags/Alert">alert</$button></$set></$fieldmangler>.
 
diff --git a/editions/tw5.com/tiddlers/nodejs/Installing TiddlyWiki on Node.js.tid b/editions/tw5.com/tiddlers/nodejs/Installing TiddlyWiki on Node.js.tid
index 47eb9c603..145725966 100644
--- a/editions/tw5.com/tiddlers/nodejs/Installing TiddlyWiki on Node.js.tid	
+++ b/editions/tw5.com/tiddlers/nodejs/Installing TiddlyWiki on Node.js.tid	
@@ -24,7 +24,7 @@ type: text/vnd.tiddlywiki
 ## Visit http://127.0.0.1:8080/ in your browser
 ## Try editing and creating tiddlers
 # Optionally, make an offline copy:
-#* click the {{$:/core/images/save-button}} ''save changes'' button in the sidebar, ''OR''
+#* click the <<.icon $:/core/images/save-button>> ''save changes'' button in the sidebar, ''OR''
 #* `tiddlywiki mynewwiki --build index`
 
 The `-g` flag causes TiddlyWiki to be installed globally. Without it, TiddlyWiki will only be available in the directory where you installed it.
diff --git a/editions/tw5.com/tiddlers/plugins/Installing a plugin from the plugin library.tid b/editions/tw5.com/tiddlers/plugins/Installing a plugin from the plugin library.tid
index d4e2fef3b..18fe09d76 100644
--- a/editions/tw5.com/tiddlers/plugins/Installing a plugin from the plugin library.tid	
+++ b/editions/tw5.com/tiddlers/plugins/Installing a plugin from the plugin library.tid	
@@ -10,14 +10,14 @@ Follow these instructions when using TiddlyWiki as a standalone HTML file:
 
 # Create a backup of your current TiddlyWiki HTML file ([[just in case|The First Rule of Using TiddlyWiki]])
 # Open your TiddlyWiki in a browser
-# Open the [[control panel|$:/ControlPanel]] {{$:/core/images/options-button}}, click on the ''Plugins'' tab and then the {{$:/core/images/download-button}} ''Get more plugins'' button
-# Click {{$:/core/images/chevron-right}} ''open plugin library'' to open the official plugin library
+# Open the [[control panel|$:/ControlPanel]] <<.icon $:/core/images/options-button>>, click on the ''Plugins'' tab and then the <<.icon $:/core/images/download-button>> ''Get more plugins'' button
+# Click <<.icon $:/core/images/chevron-right>> ''open plugin library'' to open the official plugin library
 # When the library listing is loaded:
 ## Use the tab to select between ''plugins'', ''themes'' and ''languages''
 ## Use the ''search'' box to search the plugin details
 # Click the ''install'' button to install a plugin
-# Save your TiddlyWiki {{$:/core/images/save-button}}
-# If a yellow warning bar appears at the top of the window,  refresh the window so that TiddlyWiki completes installation of the plugin {{$:/core/images/refresh-button}}
+# Save your TiddlyWiki <<.icon $:/core/images/save-button>>
+# If a yellow warning bar appears at the top of the window,  refresh the window so that TiddlyWiki completes installation of the plugin <<.icon $:/core/images/refresh-button>>
 #* <<.from-version "5.1.22">> It is no longer necessary to refresh TiddlyWiki when deleting plugins that support dynamic loading. See PluginMechanism for more details
 # The plugin should now be available for use
 
diff --git a/editions/tw5.com/tiddlers/plugins/Manually installing a plugin.tid b/editions/tw5.com/tiddlers/plugins/Manually installing a plugin.tid
index 426615b3c..5d58cad3a 100644
--- a/editions/tw5.com/tiddlers/plugins/Manually installing a plugin.tid	
+++ b/editions/tw5.com/tiddlers/plugins/Manually installing a plugin.tid	
@@ -8,7 +8,7 @@ type: text/vnd.tiddlywiki
 # Open your TiddlyWiki in a browser
 # In another browser window, find a link to the plugin, e.g. [[$:/plugins/tiddlywiki/example]]. You will typically find these links on the home page of the plugin (for example, https://tiddlywiki.com/plugins/tiddlywiki/katex/)
 # Drag the link [[$:/plugins/tiddlywiki/example]] to the browser window containing your TiddlyWiki
-# Save your TiddlyWiki ({{$:/core/images/save-button}})
-# If a yellow warning bar appears at the top of the window,  refresh the window so that TiddlyWiki completes installation of the plugin {{$:/core/images/refresh-button}}
+# Save your TiddlyWiki (<<.icon $:/core/images/save-button>>)
+# If a yellow warning bar appears at the top of the window,  refresh the window so that TiddlyWiki completes installation of the plugin <<.icon $:/core/images/refresh-button>>
 #* <<.from-version "5.1.22">> It is no longer necessary to refresh TiddlyWiki when deleting plugins that support dynamic loading. See PluginMechanism for more details
 # The plugin should now be available for use
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/plugins/Uninstalling a plugin.tid b/editions/tw5.com/tiddlers/plugins/Uninstalling a plugin.tid
index 096183bfb..81bf95739 100644
--- a/editions/tw5.com/tiddlers/plugins/Uninstalling a plugin.tid	
+++ b/editions/tw5.com/tiddlers/plugins/Uninstalling a plugin.tid	
@@ -11,9 +11,9 @@ Follow these instructions when using TiddlyWiki as a standalone HTML file:
 # Create a backup of your current TiddlyWiki HTML file ([[just in case|The First Rule of Using TiddlyWiki]])
 # Open the [[control panel|$:/ControlPanel]] and go to the ''Plugins'' tab
 # Click on the plugin you want to delete to open it as a standalone tiddler
-# Click the {{$:/core/images/down-arrow}} ''more'' button and {{$:/core/images/delete-button}} ''delete'' the tiddler
-# Save your TiddlyWiki {{$:/core/images/save-button}}
-# If a yellow warning bar appears at the top of the window,  refresh the window so that TiddlyWiki completely removes the plugin {{$:/core/images/refresh-button}}
+# Click the <<.icon $:/core/images/down-arrow>> ''more'' button and <<.icon $:/core/images/delete-button>> ''delete'' the tiddler
+# Save your TiddlyWiki <<.icon $:/core/images/save-button>>
+# If a yellow warning bar appears at the top of the window,  refresh the window so that TiddlyWiki completely removes the plugin <<.icon $:/core/images/refresh-button>>
 #* <<.from-version "5.1.22">> It is no longer necessary to refresh TiddlyWiki when deleting plugins that support dynamic loading. See PluginMechanism for more details
 # The plugin should no longer be active or available
 
diff --git a/editions/tw5.com/tiddlers/saving/Emergency Tiddler Export.tid b/editions/tw5.com/tiddlers/saving/Emergency Tiddler Export.tid
index 060fa14c9..15d5478b6 100644
--- a/editions/tw5.com/tiddlers/saving/Emergency Tiddler Export.tid	
+++ b/editions/tw5.com/tiddlers/saving/Emergency Tiddler Export.tid	
@@ -21,7 +21,7 @@ This method is useful if, for any reason, you should find your current TiddlyWik
 ```
 * Check the list of tiddlers.
 * Adjust the number "25" in the filter to make sure you found  all your recently modified tiddlers
-* Press the bucket with the up arrow [<button class="tc-btn-invisible" disabled>{{$:/core/images/export-button}}</button>] which appears on the right
+* Press the bucket with the up arrow [<button class="tc-btn-invisible" disabled><<.icon $:/core/images/export-button>></button>] which appears on the right
 * A dialogue window will ask for a location to download a file called tiddler.json on your local drive, or depending on browser configuration, just alert you that such a file will be downloaded. Press save.
 * The `tiddlers.json` file can be imported (tools in sidebar) or drag and drop the file on the top line of the story river of another TW . 
 ** You can (de)select specific tiddlers. 
diff --git a/editions/tw5.com/tiddlers/saving/Encryption.tid b/editions/tw5.com/tiddlers/saving/Encryption.tid
index 65c9abcfc..9b9ba4ee6 100644
--- a/editions/tw5.com/tiddlers/saving/Encryption.tid
+++ b/editions/tw5.com/tiddlers/saving/Encryption.tid
@@ -7,12 +7,12 @@ type: text/vnd.tiddlywiki
 When used as a single HTML file, TiddlyWiki5 allows content to be encrypted using the [[Stanford JavaScript Crypto Library]].
 
 # Switch to the ''Tools'' tab in the sidebar and look for the button with a padlock icon
-# If the button is labelled {{$:/core/images/unlocked-padlock}} ''set password'' then the current wiki is not encrypted. Clicking the button will prompt for a password that will be used to encrypt subsequent saves
-# If the button is labelled {{$:/core/images/locked-padlock}} ''clear password'' then the current wiki is already encrypted. Clicking the button will remove the password so that subsequent saves will be unencrypted
+# If the button is labelled <<.icon $:/core/images/unlocked-padlock>> ''set password'' then the current wiki is not encrypted. Clicking the button will prompt for a password that will be used to encrypt subsequent saves
+# If the button is labelled <<.icon $:/core/images/locked-padlock>> ''clear password'' then the current wiki is already encrypted. Clicking the button will remove the password so that subsequent saves will be unencrypted
 # Optionally, open the saved file in a text editor and verify that your data is encrypted
 # Open the file in your browser. You will be prompted for a password before the content is displayed
 
 Note that TiddlyWiki has two other unrelated features concerned with passwords/encryption:
 
-* The ability to set a password when saving to TiddlySpot. This is done in the "Saving" tab of ''control panel'' {{$:/core/images/options-button}}.
+* The ability to set a password when saving to TiddlySpot. This is done in the "Saving" tab of ''control panel'' <<.icon $:/core/images/options-button>>.
 * The ability to use standard HTTP basic authentication with the [[Node.js|TiddlyWiki on Node.js]] server configuration. This is done on the command line with the ServerCommand. Combined with SSL, this gives the same level of transit encryption as you'd get with online services like Google or Dropbox, but there is no encryption of data on disk
diff --git a/editions/tw5.com/tiddlers/saving/Saving on Android.tid b/editions/tw5.com/tiddlers/saving/Saving on Android.tid
index 6be8d5508..8c6be8ba4 100644
--- a/editions/tw5.com/tiddlers/saving/Saving on Android.tid	
+++ b/editions/tw5.com/tiddlers/saving/Saving on Android.tid	
@@ -18,9 +18,9 @@ Instructions for use:
 # Open AndTidWiki
 #* Don't use ''Menu''/''new ~TiddlyWiki'' menu option (it only supports the older TiddlyWikiClassic)
 # Open the file by touching its filename
-# Try creating a new tiddler using the ''new tiddler'' {{$:/core/images/new-button}} button in the sidebar. Type some content for the tiddler, and click the {{$:/core/images/done-button}} ''ok'' button
+# Try creating a new tiddler using the ''new tiddler'' <<.icon $:/core/images/new-button>> button in the sidebar. Type some content for the tiddler, and click the <<.icon $:/core/images/done-button>> ''ok'' button
 #* The wiki will be saved, and a confirmation message should appear at the top right of the window
 
-''Note:'' You can save your changes by clicking the {{$:/core/images/save-button}} ''save changes'' button in the sidebar even if you have not clicked the {{$:/core/images/done-button}} ''ok'' button to complete editing a tiddler
+''Note:'' You can save your changes by clicking the <<.icon $:/core/images/save-button>> ''save changes'' button in the sidebar even if you have not clicked the <<.icon $:/core/images/done-button>> ''ok'' button to complete editing a tiddler
 
 //Note that AndTidWiki is published independently of TiddlyWiki//
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/saving/Saving on TiddlySpot.tid b/editions/tw5.com/tiddlers/saving/Saving on TiddlySpot.tid
index af1ce8957..9b4b47813 100644
--- a/editions/tw5.com/tiddlers/saving/Saving on TiddlySpot.tid	
+++ b/editions/tw5.com/tiddlers/saving/Saving on TiddlySpot.tid	
@@ -22,8 +22,8 @@ Alternatively, you can upload an existing ~TiddlyWiki5 document from your local
 
 # Sign up for a new wiki at http://tiddlyspot.com/, and remember the wiki name and password
 # Open your locally stored TiddlyWiki document in your browser
-# Fill in the TiddlySpot wikiname and password in ''Saving'' tab of the ''control panel'' {{$:/core/images/options-button}}
-# Click the {{$:/core/images/save-button}} ''save changes'' button. You should get a confirmation notification at the top right saying ''Saved wiki''. Saving can take several seconds if you're on a slow connection or working with a large wiki.
+# Fill in the TiddlySpot wikiname and password in ''Saving'' tab of the ''control panel'' <<.icon $:/core/images/options-button>>
+# Click the <<.icon $:/core/images/save-button>> ''save changes'' button. You should get a confirmation notification at the top right saying ''Saved wiki''. Saving can take several seconds if you're on a slow connection or working with a large wiki.
 # Navigate to your TiddlySpot URL at http://{wikiname}.tiddlyspot.com/
 
 Note that your password is sent unencrypted when using TiddlySpot. From http://faq.tiddlyspot.com/:
diff --git a/editions/tw5.com/tiddlers/saving/Saving on a PHP Server.tid b/editions/tw5.com/tiddlers/saving/Saving on a PHP Server.tid
index e6e78fbfb..7f0cec25d 100644
--- a/editions/tw5.com/tiddlers/saving/Saving on a PHP Server.tid	
+++ b/editions/tw5.com/tiddlers/saving/Saving on a PHP Server.tid	
@@ -20,7 +20,7 @@ The built-in `TiddlySpot `saver can also be used to save changes to a simple PHP
 # Save the file
 # Using FTP or your web interface, upload ''store.php'' to your server. Make sure that the filename is correct
 #* If you've uploaded the file correctly you should be able to view it in your browser (eg, http://example.com/store.php)
-# In TiddlyWiki, go to the ''Saving'' tab of the ''control panel'' {{$:/core/images/options-button}} and enter the following information:
+# In TiddlyWiki, go to the ''Saving'' tab of the ''control panel'' <<.icon $:/core/images/options-button>> and enter the following information:
 #* Your username as the wiki name
 #* Your password
 #* The URL of the ''store.php'' file (//''not'' the URL of the wiki, this must the full URL to the ''store.php'' file//)
diff --git a/editions/tw5.com/tiddlers/saving/Saving on iPad_iPhone.tid b/editions/tw5.com/tiddlers/saving/Saving on iPad_iPhone.tid
index 194e28eea..b04e81929 100644
--- a/editions/tw5.com/tiddlers/saving/Saving on iPad_iPhone.tid	
+++ b/editions/tw5.com/tiddlers/saving/Saving on iPad_iPhone.tid	
@@ -21,9 +21,9 @@ Instructions for use:
 # Swipe any file item from the right to see a list of additional "actions" possible for that file
 # Touch any listed file item or folder to open it - wikis will open in Quine's custom browser
 # When you have an open TiddlyWiki5:
-# Try creating a new tiddler using the ''new tiddler'' {{$:/core/images/new-button}} button in the sidebar
-# Type some content for the tiddler, and click the {{$:/core/images/done-button}} ''ok'' button
-# Save your changes by clicking the {{$:/core/images/save-button}} ''save changes'' button in the sidebar
+# Try creating a new tiddler using the ''new tiddler'' <<.icon $:/core/images/new-button>> button in the sidebar
+# Type some content for the tiddler, and click the <<.icon $:/core/images/done-button>> ''ok'' button
+# Save your changes by clicking the <<.icon $:/core/images/save-button>> ''save changes'' button in the sidebar
 #* A confirmation message should appear at the top right of the window
 # Touch "Done" when done editing a wiki
 
diff --git a/editions/tw5.com/tiddlers/saving/Saving with TiddlyFox on Android.tid b/editions/tw5.com/tiddlers/saving/Saving with TiddlyFox on Android.tid
index 6b2d3d384..1780fd2bb 100644
--- a/editions/tw5.com/tiddlers/saving/Saving with TiddlyFox on Android.tid	
+++ b/editions/tw5.com/tiddlers/saving/Saving with TiddlyFox on Android.tid	
@@ -18,7 +18,7 @@ type: text/vnd.tiddlywiki
 # When the file has downloaded, click on it within the notification tray or the download manager application
 # Choose to open the file in Firefox (rather than the default Android viewer)
 # Click ''OK'' in response to the prompt from TiddlyFox that asks whether to enable saving for this file
-# Try creating a new tiddler using the ''new tiddler'' {{$:/core/images/new-button}} button in the sidebar. Type some content for the tiddler, and click the {{$:/core/images/done-button}} ''ok'' button
-# Save your changes by clicking the {{$:/core/images/save-button}} ''save changes'' button in the sidebar
+# Try creating a new tiddler using the ''new tiddler'' <<.icon $:/core/images/new-button>> button in the sidebar. Type some content for the tiddler, and click the <<.icon $:/core/images/done-button>> ''ok'' button
+# Save your changes by clicking the <<.icon $:/core/images/save-button>> ''save changes'' button in the sidebar
 #* Look for the yellow notification ''Saved wiki'' at the top right of the window
 # Refresh the browser window to verify that your changes have been saved correctly
diff --git a/editions/tw5.com/tiddlers/saving/Saving with TiddlyFox.tid b/editions/tw5.com/tiddlers/saving/Saving with TiddlyFox.tid
index 90a627c31..092eb29fd 100644
--- a/editions/tw5.com/tiddlers/saving/Saving with TiddlyFox.tid	
+++ b/editions/tw5.com/tiddlers/saving/Saving with TiddlyFox.tid	
@@ -22,7 +22,7 @@ If you're using [[Firefox for Android]], see the instructions for [[Saving with
 #* If you are using TiddlyFox v1.x.x, you will need to click ''OK'' in response to the prompt from TiddlyFox that asks whether to enable saving for this file
 #* If you are using TiddlyFox v2.x.x you will need to click on the icon of a kitten standing on a blue globe to activate saving. There is no prompt in v2.0.1.
 #** For TiddlyFox v2.0.1, you can not be using Private Browsing mode nor can you be using "Never Remember History".
-# Try creating a new tiddler using the ''new tiddler'' {{$:/core/images/new-button}} button in the sidebar. Type some content for the tiddler, and click the {{$:/core/images/done-button}} ''ok'' button
-# Save your changes by clicking the {{$:/core/images/save-button}} ''save changes'' button in the sidebar
+# Try creating a new tiddler using the ''new tiddler'' <<.icon $:/core/images/new-button>> button in the sidebar. Type some content for the tiddler, and click the <<.icon $:/core/images/done-button>> ''ok'' button
+# Save your changes by clicking the <<.icon $:/core/images/save-button>> ''save changes'' button in the sidebar
 #* Look for the yellow notification ''Saved wiki'' at the top right of the window
 # Refresh the browser window to verify that your changes have been saved correctly
diff --git a/editions/tw5.com/tiddlers/saving/Saving with TiddlyIE.tid b/editions/tw5.com/tiddlers/saving/Saving with TiddlyIE.tid
index 3106e6daf..d4e821128 100644
--- a/editions/tw5.com/tiddlers/saving/Saving with TiddlyIE.tid	
+++ b/editions/tw5.com/tiddlers/saving/Saving with TiddlyIE.tid	
@@ -17,6 +17,6 @@ type: text/vnd.tiddlywiki
 # Locate the file you just downloaded
 #* You may rename it, but be sure to keep the `.html` or `.htm` extension
 # Open the file in Internet Explorer
-# Try creating a new tiddler using the ''new tiddler'' {{$:/core/images/new-button}} button in the sidebar. Type some content for the tiddler, and click the {{$:/core/images/done-button}} ''ok'' button
-# Save your changes by clicking the {{$:/core/images/save-button}} ''save changes'' button in the sidebar. Internet Explorer will ask for your consent to save the file locally by presenting a file ''Save As'' dialog.
+# Try creating a new tiddler using the ''new tiddler'' <<.icon $:/core/images/new-button>> button in the sidebar. Type some content for the tiddler, and click the <<.icon $:/core/images/done-button>> ''ok'' button
+# Save your changes by clicking the <<.icon $:/core/images/save-button>> ''save changes'' button in the sidebar. Internet Explorer will ask for your consent to save the file locally by presenting a file ''Save As'' dialog.
 # Refresh the browser window to verify that your changes have been saved correctly
diff --git a/editions/tw5.com/tiddlers/saving/Saving with the HTML5 fallback saver.tid b/editions/tw5.com/tiddlers/saving/Saving with the HTML5 fallback saver.tid
index dae52cdf1..92774cd68 100644
--- a/editions/tw5.com/tiddlers/saving/Saving with the HTML5 fallback saver.tid	
+++ b/editions/tw5.com/tiddlers/saving/Saving with the HTML5 fallback saver.tid	
@@ -17,8 +17,8 @@ This method of saving changes is clunky because it requires manual intervention
 # Locate the file you just downloaded
 #* You may rename it, but be sure to keep the `.html` or `.htm` extension
 # Open the file in your browser
-# Try creating a new tiddler using the ''new tiddler'' {{$:/core/images/new-button}} button in the sidebar. Type some content for the tiddler, and click the {{$:/core/images/done-button}} ''ok'' button
-# Save your changes by clicking the {{$:/core/images/save-button}} ''save changes'' button in the sidebar
+# Try creating a new tiddler using the ''new tiddler'' <<.icon $:/core/images/new-button>> button in the sidebar. Type some content for the tiddler, and click the <<.icon $:/core/images/done-button>> ''ok'' button
+# Save your changes by clicking the <<.icon $:/core/images/save-button>> ''save changes'' button in the sidebar
 # Your browser will download a new copy of the wiki incorporating your changes
 # Locate the newly downloaded file and open it in your browser
 # Verify that your changes have been saved correctly
diff --git a/editions/tw5.com/tiddlers/system/doc-macros.tid b/editions/tw5.com/tiddlers/system/doc-macros.tid
index f1c846775..26262d8f9 100644
--- a/editions/tw5.com/tiddlers/system/doc-macros.tid
+++ b/editions/tw5.com/tiddlers/system/doc-macros.tid
@@ -63,6 +63,8 @@ type: text/vnd.tiddlywiki
 
 \define .button(_) <span class="doc-button">{{$:/core/ui/Buttons/$_$!!caption}}</span>
 
+\define .icon(_) <span class="doc-icon">{{$_$}}</span>
+
 \define .tip(_) <div class="doc-icon-block"><div class="doc-block-icon">{{$:/core/images/tip}}</div> $_$</div>
 \define .warning(_) <div class="doc-icon-block"><div class="doc-block-icon">{{$:/core/images/warning}}</div> $_$</div>
 
diff --git a/editions/tw5.com/tiddlers/system/doc-styles.tid b/editions/tw5.com/tiddlers/system/doc-styles.tid
index 101fbe2f6..94e89d5f7 100644
--- a/editions/tw5.com/tiddlers/system/doc-styles.tid
+++ b/editions/tw5.com/tiddlers/system/doc-styles.tid
@@ -145,6 +145,12 @@ tr.doc-table-subheading {
 	margin-top: 2em;
 }
 
+.doc-icon svg {
+	width: 1em;
+	height: 1em;
+    vertical-align: middle;
+}
+
 .doc-icon-block {
 	border-left: 2px solid <<colour code-border>>;
 	margin-left: 3em;
diff --git a/editions/tw5.com/tiddlers/wikitext/Block Quotes in WikiText.tid b/editions/tw5.com/tiddlers/wikitext/Block Quotes in WikiText.tid
index bdc60b0ed..181779fe9 100644
--- a/editions/tw5.com/tiddlers/wikitext/Block Quotes in WikiText.tid	
+++ b/editions/tw5.com/tiddlers/wikitext/Block Quotes in WikiText.tid	
@@ -9,7 +9,7 @@ There are two ways to produce HTML block quotes in TiddlyWiki5, one for content
 
 ! Multi-line Block Quotes
 
-The syntax for multi-line block quotes ({{$:/core/images/quote}}) is:
+The syntax for multi-line block quotes (<<.icon $:/core/images/quote>>) is:
 
 <<wikitext-example src:"<<<
 This is a block quoted paragraph
diff --git a/editions/tw5.com/tiddlers/wikitext/Code Blocks in WikiText.tid b/editions/tw5.com/tiddlers/wikitext/Code Blocks in WikiText.tid
index 9bf473e13..91b1c5e1d 100644
--- a/editions/tw5.com/tiddlers/wikitext/Code Blocks in WikiText.tid	
+++ b/editions/tw5.com/tiddlers/wikitext/Code Blocks in WikiText.tid	
@@ -5,7 +5,7 @@ tags: WikiText
 title: Code Blocks in WikiText
 type: text/vnd.tiddlywiki
 
-You can use triple backticks <code>&#96;&#96;&#96;</code> to mark code blocks ({{$:/core/images/mono-block}}):
+You can use triple backticks <code>&#96;&#96;&#96;</code> to mark code blocks (<<.icon $:/core/images/mono-block>>):
 
 <pre>
 &#96;&#96;&#96;
diff --git a/editions/tw5.com/tiddlers/wikitext/Formatting in WikiText.tid b/editions/tw5.com/tiddlers/wikitext/Formatting in WikiText.tid
index b0b500dc6..293e55e95 100644
--- a/editions/tw5.com/tiddlers/wikitext/Formatting in WikiText.tid	
+++ b/editions/tw5.com/tiddlers/wikitext/Formatting in WikiText.tid	
@@ -7,13 +7,13 @@ type: text/vnd.tiddlywiki
 
 Available character formatting includes:
 
-* <code>&#96;backticks&#96;</code> for `code` ({{$:/core/images/mono-line}})
+* <code>&#96;backticks&#96;</code> for `code` (<<.icon $:/core/images/mono-line>>)
 ** Alternatively, <code>&#96;&#96;double backticks allows &#96;embedded&#96; backticks&#96;&#96;</code>
-* `''bold''` for ''bold text'' ({{$:/core/images/bold}})
-* `//italic//` for //italic text// ({{$:/core/images/italic}})
-* `__underscore__` for __underscored text__ ({{$:/core/images/underline}})
-* `^^superscript^^` for ^^superscripted^^ text ({{$:/core/images/superscript}})
-* `,,subscript,,` for ,,subscripted,, text ({{$:/core/images/subscript}})
-* `~~strikethrough~~` for ~~strikethrough~~ text ({{$:/core/images/strikethrough}})
+* `''bold''` for ''bold text'' (<<.icon $:/core/images/bold>>)
+* `//italic//` for //italic text// (<<.icon $:/core/images/italic>>)
+* `__underscore__` for __underscored text__ (<<.icon $:/core/images/underline>>)
+* `^^superscript^^` for ^^superscripted^^ text (<<.icon $:/core/images/superscript>>)
+* `,,subscript,,` for ,,subscripted,, text (<<.icon $:/core/images/subscript>>)
+* `~~strikethrough~~` for ~~strikethrough~~ text (<<.icon $:/core/images/strikethrough>>)
 
 See also: [[Code Blocks in WikiText]]
diff --git a/editions/tw5.com/tiddlers/wikitext/Images in WikiText.tid b/editions/tw5.com/tiddlers/wikitext/Images in WikiText.tid
index 1bb31e7ad..3e6272d93 100644
--- a/editions/tw5.com/tiddlers/wikitext/Images in WikiText.tid	
+++ b/editions/tw5.com/tiddlers/wikitext/Images in WikiText.tid	
@@ -14,7 +14,7 @@ Images can be included in WikiText with the following syntax:
 [img[https://tiddlywiki.com/favicon.ico]]
 ```
 
-You can also insert images from the editor toolbar. Click ''picture'' ({{$:/core/images/picture}}) and select a picture file.
+You can also insert images from the editor toolbar. Click ''picture'' (<<.icon $:/core/images/picture>>) and select a picture file.
 
 If the image source is the title of an image tiddler then that tiddler is directly displayed. Otherwise it is interpreted as a URL and an HTML `<img>` tag is generated with the `src` attribute containing the URL.
 
diff --git a/editions/tw5.com/tiddlers/wikitext/Linking in WikiText.tid b/editions/tw5.com/tiddlers/wikitext/Linking in WikiText.tid
index 88ae367a5..037daa821 100644
--- a/editions/tw5.com/tiddlers/wikitext/Linking in WikiText.tid	
+++ b/editions/tw5.com/tiddlers/wikitext/Linking in WikiText.tid	
@@ -21,7 +21,7 @@ To link to a tiddler and specify the text of the link:
 [[Displayed Link Title|Tiddler Title]]
 ```
 
-You can also create a link from the editor toolbar. Click ''link'' ({{$:/core/images/link}}), and search and select a tiddler.
+You can also create a link from the editor toolbar. Click ''link'' (<<.icon $:/core/images/link>>), and search and select a tiddler.
 
 ! ~CamelCase Links
 
diff --git a/editions/tw5.com/tiddlers/wikitext/Lists in WikiText.tid b/editions/tw5.com/tiddlers/wikitext/Lists in WikiText.tid
index 2cb46c5d5..feca125ee 100644
--- a/editions/tw5.com/tiddlers/wikitext/Lists in WikiText.tid	
+++ b/editions/tw5.com/tiddlers/wikitext/Lists in WikiText.tid	
@@ -7,7 +7,7 @@ type: text/vnd.tiddlywiki
 
 ! Bulleted Lists
 
-You can create bulleted (unordered) lists with `*` characters ({{$:/core/images/list-bullet}}):
+You can create bulleted (unordered) lists with `*` characters (<<.icon $:/core/images/list-bullet>>):
 
 <<wikitext-example src:"* First list item
 * Second list item
@@ -17,7 +17,7 @@ You can create bulleted (unordered) lists with `*` characters ({{$:/core/images/
 
 ! Numbered Lists
 
-Numbered (ordered) lists use `#` instead of `*` ({{$:/core/images/list-number}}):
+Numbered (ordered) lists use `#` instead of `*` (<<.icon $:/core/images/list-number>>):
 
 # First item
 # Second item
diff --git a/editions/tw5.com/tiddlers/workingwithtw/Creating and editing tiddlers.tid b/editions/tw5.com/tiddlers/workingwithtw/Creating and editing tiddlers.tid
index 9f2d54715..2850030c0 100644
--- a/editions/tw5.com/tiddlers/workingwithtw/Creating and editing tiddlers.tid	
+++ b/editions/tw5.com/tiddlers/workingwithtw/Creating and editing tiddlers.tid	
@@ -6,7 +6,7 @@ type: text/vnd.tiddlywiki
 
 ! Creating tiddlers
 
-You create a tiddler either by clicking the {{$:/core/images/new-button}} button in the sidebar, or by clicking on a link to a missing tiddler. Links to missing tiddlers are shown in [[blue italics]].
+You create a tiddler either by clicking the <<.icon $:/core/images/new-button>> button in the sidebar, or by clicking on a link to a missing tiddler. Links to missing tiddlers are shown in [[blue italics]].
 
 See also:
 
@@ -14,7 +14,7 @@ See also:
 
 ! Editing tiddlers
 
-To edit an existing tiddler, click the {{$:/core/images/edit-button}} button at the top right of the tiddler.
+To edit an existing tiddler, click the <<.icon $:/core/images/edit-button>> button at the top right of the tiddler.
 
 !! Draft mode
 
@@ -22,7 +22,7 @@ When you create a new tiddler or edit an existing one, the tiddler will go into
 
 *''The title field'' - Use this to change the title of the tiddler
 *''The tag selector'' - Use this to add or remove tags. As you type a tag name in the box, a dropdown list will show you any existing tags that match. You can pick from this list or create a completely new tag. Then click the ''add'' button or hit the <kbd>Enter</kbd> key to add the tag to the tiddler. Each tag is shown as a coloured pill. Click the "×" on a pill to remove that tag
-*''The text area'' - Use this to edit the main content of the tiddler. Click the ''preview'' button ({{$:/core/images/preview-closed}} / {{$:/core/images/preview-open}}) to see what your changes will look like
+*''The text area'' - Use this to edit the main content of the tiddler. Click the ''preview'' button (<<.icon $:/core/images/preview-closed>> / <<.icon $:/core/images/preview-open>>) to see what your changes will look like
 *''The type selector'' - Use this when a tiddler needs to be displayed in a special way, such as an image. See ContentType for a list of the options. The default is `text/vnd.tiddlywiki`, which means the tiddler contains WikiText
 *''The field selector'' - Use this to add or remove fields on the tiddler. For example, if you are editing a tiddler that's being used to tag other tiddlers, you can add a [[''list'' field|ListField]] to change the order in which those tiddlers will be listed
 
@@ -30,6 +30,6 @@ When you create a new tiddler or edit an existing one, the tiddler will go into
 
 When you have finished editing, click a button at the top right of the tiddler:
 
-*The ''ok'' button ({{$:/core/images/done-button}}) stores your changes to this one tiddler and leaves draft mode. If your wiki is configured to [[AutoSave]], your changes will be permanently saved. Otherwise they will only be stored temporarily in your web browser, and you will lose them if you close your ~TiddlyWiki page without first clicking the master ''save changes'' button ({{$:/core/images/save-button}}) in the sidebar.
-*The ''cancel'' button ({{$:/core/images/cancel-button}}) discards your changes (after asking you to confirm) and leaves draft mode.
-*The ''delete'' button ({{$:/core/images/delete-button}}) deletes the entire tiddler (after asking you to confirm).
+*The ''ok'' button (<<.icon $:/core/images/done-button>>) stores your changes to this one tiddler and leaves draft mode. If your wiki is configured to [[AutoSave]], your changes will be permanently saved. Otherwise they will only be stored temporarily in your web browser, and you will lose them if you close your ~TiddlyWiki page without first clicking the master ''save changes'' button (<<.icon $:/core/images/save-button>>) in the sidebar.
+*The ''cancel'' button (<<.icon $:/core/images/cancel-button>>) discards your changes (after asking you to confirm) and leaves draft mode.
+*The ''delete'' button (<<.icon $:/core/images/delete-button>>) deletes the entire tiddler (after asking you to confirm).
diff --git a/editions/tw5.com/tiddlers/workingwithtw/Creating journal tiddlers.tid b/editions/tw5.com/tiddlers/workingwithtw/Creating journal tiddlers.tid
index 44860f418..eb41edd52 100644
--- a/editions/tw5.com/tiddlers/workingwithtw/Creating journal tiddlers.tid	
+++ b/editions/tw5.com/tiddlers/workingwithtw/Creating journal tiddlers.tid	
@@ -14,19 +14,19 @@ For example, you might use a journal tiddler called ''10th October 2014'' to rec
 
 ! Creating a journal tiddler
 
-The easiest way to create a journal tiddler is to use the ''new journal'' button {{$:/core/images/new-journal-button}} in the ''Tools'' tab of the sidebar. If you find yourself often using the button, click the checkbox next to it to make the button available just above the search box.
+The easiest way to create a journal tiddler is to use the ''new journal'' button <<.icon $:/core/images/new-journal-button>> in the ''Tools'' tab of the sidebar. If you find yourself often using the button, click the checkbox next to it to make the button available just above the search box.
 
 The ''new journal'' button creates a journal entry as a blank tiddler with the tag ''Journal'' and a title derived from today's date. If a journal tiddler with that title already exists, then this is opened for editing.
 
 ! Creating a tagged journal tiddler
 
-A common sequence of actions is to create (or reopen) today's journal entry and tag it with the title of another tiddler. This can be done with the ''new journal here'' button {{$:/core/images/new-journal-button}} in the other tiddler's toolbar. You can find this button in the ''Tools'' tab of the tiddler's InfoPanel.
+A common sequence of actions is to create (or reopen) today's journal entry and tag it with the title of another tiddler. This can be done with the ''new journal here'' button <<.icon $:/core/images/new-journal-button>> in the other tiddler's toolbar. You can find this button in the ''Tools'' tab of the tiddler's InfoPanel.
 
 For example, you might be reviewing a tiddler called ''Oxford Street'' and realise that it's relevant for planning your shopping trip. Click the ''new journal here'' button on the ''Oxford Street'' tiddler to bring up a journal entry tagged with ''Oxford Street''.
 
 ! Customising journal tiddlers
 
-To configure how new journal entries are created, visit the ''Basics'' tab under ''Info'' in the [[control panel|$:/ControlPanel]] {{$:/core/images/options-button}}:
+To configure how new journal entries are created, visit the ''Basics'' tab under ''Info'' in the [[control panel|$:/ControlPanel]] <<.icon $:/core/images/options-button>>:
 
 * "Title of new journal tiddlers" specifies how these tiddlers should be named, as a [[date format string|DateFormat]]. The default setting of `DDth MMM YYYY` causes new entries to have titles of the form "10th October 2014"
 * "Tags for new journal tiddlers" [specifies|Title List] tags that will automatically appear on new journal entries. For example: `Journal [[Summer vacation]]`
diff --git a/editions/tw5.com/tiddlers/workingwithtw/Navigating between open tiddlers.tid b/editions/tw5.com/tiddlers/workingwithtw/Navigating between open tiddlers.tid
index 3f01e6c77..4473530ba 100644
--- a/editions/tw5.com/tiddlers/workingwithtw/Navigating between open tiddlers.tid	
+++ b/editions/tw5.com/tiddlers/workingwithtw/Navigating between open tiddlers.tid	
@@ -8,7 +8,7 @@ In the default "classic" storyview mode, open tiddlers are displayed in a vertic
 
 * The best approach is to ''use the Open tab'' in the sidebar to click on the open tiddler to which you wish to navigate.
 
-** The ''Open'' tab contains a list of all the open tiddlers. You can click on any tiddler in the list to jump to it, or click the "×" next to a tiddler link to close it. There is also a handy {{$:/core/images/close-all-button}} ''close all'' button at the bottom of the list of open tiddlers.
+** The ''Open'' tab contains a list of all the open tiddlers. You can click on any tiddler in the list to jump to it, or click the "×" next to a tiddler link to close it. There is also a handy <<.icon $:/core/images/close-all-button>> ''close all'' button at the bottom of the list of open tiddlers.
 
 * Another way is to simply ''scroll the page up and down'' using the story river scrollbar to the right.
 
diff --git a/editions/tw5.com/tiddlers/workingwithtw/Performance.tid b/editions/tw5.com/tiddlers/workingwithtw/Performance.tid
index d4d660132..4a98ceea8 100644
--- a/editions/tw5.com/tiddlers/workingwithtw/Performance.tid
+++ b/editions/tw5.com/tiddlers/workingwithtw/Performance.tid
@@ -9,7 +9,7 @@ TiddlyWiki ships with defaults that are designed to get the best out of modern d
 * ''Avoid the "Recent" tab''. It is computationally slow to generate and update in response to tiddler changes.
 * ''Use the "Vanilla" theme''. The default "Snow White" theme includes visual effects like shadows, transparency and blurring that can be slow to render on older devices
 * ''Avoid large tiddlers''. Large bitmaps can significantly slow TiddlyWiki's performance. For example, an image taken with a modern smartphone will often be 5MB or more. Use ExternalImages whenever possible
-* ''Don't have too many tiddlers open at once''. Every tiddler you have open will require processing to keep it up to date as the store changes (for example, while you type into a draft tiddler). It is particularly easy when using zoomin story view to end up with dozens of tiddlers listed in the ''Open'' tab in the sidebar. Get into the habit of periodically closing all open tiddlers with the {{$:/core/images/close-all-button}} ''close all'' button
+* ''Don't have too many tiddlers open at once''. Every tiddler you have open will require processing to keep it up to date as the store changes (for example, while you type into a draft tiddler). It is particularly easy when using zoomin story view to end up with dozens of tiddlers listed in the ''Open'' tab in the sidebar. Get into the habit of periodically closing all open tiddlers with the <<.icon $:/core/images/close-all-button>> ''close all'' button
 * ''Use the built-in performance instrumentation''.  Studying the [[performance instrumentation|Performance Instrumentation]] results can help highlight performance problems
 * Take advantage of indexed filter operators. The following constructions at the start of a filter run will be optimised to run many times faster than otherwise:
 ** `[all[tiddlers]tag[x]...`
diff --git a/editions/tw5.com/tiddlers/workingwithtw/Sharing your tiddlers with others.tid b/editions/tw5.com/tiddlers/workingwithtw/Sharing your tiddlers with others.tid
index 643b1cb14..a88275448 100644
--- a/editions/tw5.com/tiddlers/workingwithtw/Sharing your tiddlers with others.tid	
+++ b/editions/tw5.com/tiddlers/workingwithtw/Sharing your tiddlers with others.tid	
@@ -9,8 +9,8 @@ There are a number of ways that you can share [[tiddlers|Tiddlers]] or your whol
 *You can attach a ~TiddlyWiki to an e-mail
 *You can publish your ~TiddlyWiki online and grab a link to send or message to others:
 **A link to the web address of the whole ~TiddlyWiki file
-**A [[permalink|PermaLinks]] ({{$:/core/images/permalink-button}}) to a specific tiddler
-**A [[permaview|PermaViews]] ({{$:/core/images/permaview-button}}) link of all the currently open tiddlers
+**A [[permalink|PermaLinks]] (<<.icon $:/core/images/permalink-button>>) to a specific tiddler
+**A [[permaview|PermaViews]] (<<.icon $:/core/images/permaview-button>>) link of all the currently open tiddlers
 * You can [[share a Dropbox link to your TiddlyWiki|Sharing a TiddlyWiki on Dropbox]]
-* You can [[export tiddlers|How to export tiddlers]] ({{$:/core/images/export-button}}) in a variety of formats including text, static HTML and comma separated values (ie spreadsheet compatible)
+* You can [[export tiddlers|How to export tiddlers]] (<<.icon $:/core/images/export-button>>) in a variety of formats including text, static HTML and comma separated values (ie spreadsheet compatible)
 *You can also share tiddlers merely by making your ~TiddlyWiki accessible to others, for example by publishing it online, so that they can [[import tiddlers|Importing Tiddlers]] from it