diff --git a/core/ui/LayoutSwitcher.tid b/core/ui/LayoutSwitcher.tid
index 2c5243553..0f7e3f15e 100644
--- a/core/ui/LayoutSwitcher.tid
+++ b/core/ui/LayoutSwitcher.tid
@@ -13,13 +13,13 @@ caption: {{$:/language/ControlPanel/LayoutSwitcher/Caption}}
<$set name="cls" filter="[all[current]field:title{$:/layout}]" value="tc-chooser-item tc-chosen" emptyValue="tc-chooser-item">
>>
<$link to={{!!title}}>
- ''<$transclude field="name"/>'' - <$transclude field="description"/>
+ ''<$transclude tiddler={{{ [get[icon]] }}}/><$transclude field="name"/>'' - <$transclude field="description"/>
$link>
$set>
""">
<$set name="cls" filter="[all[current]field:title[$:/core/ui/PageTemplate]]" value="tc-chooser-item tc-chosen" emptyValue="tc-chooser-item">
>>
<$link to={{!!title}}>
-''<$transclude field="name"/>'' - <$transclude field="description"/>
+''<$transclude tiddler={{{ [get[icon]] }}}/><$transclude field="name"/>'' - <$transclude field="description"/>
$link>
$set>
diff --git a/core/ui/PageTemplate.tid b/core/ui/PageTemplate.tid
index c9e929551..892e1b166 100644
--- a/core/ui/PageTemplate.tid
+++ b/core/ui/PageTemplate.tid
@@ -1,6 +1,7 @@
title: $:/core/ui/PageTemplate
name: {{$:/language/PageTemplate/Name}}
description: {{$:/language/PageTemplate/Description}}
+icon: $:/core/images/layout-button
\whitespace trim
\import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]