diff --git a/form-builder/jvm/src/main/assets/forms/orbeon/builder/resources/form-builder.less b/form-builder/jvm/src/main/assets/forms/orbeon/builder/resources/form-builder.less
index cd0afc800c5..c746351b8a5 100644
--- a/form-builder/jvm/src/main/assets/forms/orbeon/builder/resources/form-builder.less
+++ b/form-builder/jvm/src/main/assets/forms/orbeon/builder/resources/form-builder.less
@@ -803,6 +803,14 @@ body.orbeon {
overflow: hidden;
box-sizing: border-box;
+ &.fb-builtin-template {
+ img {
+ opacity: 0.8;
+ box-sizing: border-box;
+ padding: 5%;
+ }
+ }
+
&.xforms-repeat-selected-item-1 {
border-color: @focusBorderColor;
.focusDecorations();
diff --git a/form-builder/jvm/src/main/resources/forms/orbeon/builder/form/template-wizard.jpg b/form-builder/jvm/src/main/resources/forms/orbeon/builder/form/template-wizard.jpg
new file mode 100644
index 00000000000..59dbbe63005
Binary files /dev/null and b/form-builder/jvm/src/main/resources/forms/orbeon/builder/form/template-wizard.jpg differ
diff --git a/form-builder/jvm/src/main/resources/xbl/fb/dialog-form-settings/dialog-form-settings.xbl b/form-builder/jvm/src/main/resources/xbl/fb/dialog-form-settings/dialog-form-settings.xbl
index aabf9dbe9f1..5a73ca24051 100644
--- a/form-builder/jvm/src/main/resources/xbl/fb/dialog-form-settings/dialog-form-settings.xbl
+++ b/form-builder/jvm/src/main/resources/xbl/fb/dialog-form-settings/dialog-form-settings.xbl
@@ -714,7 +714,7 @@