--- a/src/pyams_portal/zmi/templates/layout.pt	Mon Jun 11 15:29:20 2018 +0200
+++ b/src/pyams_portal/zmi/templates/layout.pt	Mon Jun 11 15:30:26 2018 +0200
@@ -20,12 +20,14 @@
 			<div class="btn-toolbar" role="toolbar"
 				 tal:condition="can_change">
 				<div class="btn-group" role="group">
-					<div class="btn btn-default btn-row hint" title="Add row" i18n:attributes="title"
-						 data-ams-hint-gravity="n">
+					<div class="btn btn-default btn-row hint"
+						 title="Add row<br />Drag and drop button to page template to position new row" i18n:attributes="title"
+						 data-ams-hint-gravity="n" data-ams-hint-html="true">
 						<i class="fa fa-fw fa-2x fa-indent"></i>
 					</div>
-					<div class="btn btn-default btn-slot hint" title="Add slot" i18n:attributes="title"
-						 data-ams-hint-gravity="n">
+					<div class="btn btn-default btn-slot hint"
+						 title="Add slot<br />Drag and drop button to page template to position new slot" i18n:attributes="title"
+						 data-ams-hint-gravity="n" data-ams-hint-html="true">
 						<i class="fa fa-fw fa-2x fa-columns"></i>
 					</div>
 				</div>
@@ -91,8 +93,10 @@
 								 tal:repeat="slot_name template_config.get_slots(row)"
 								 tal:attributes="class string:slot context-menu col ${template_config.get_slot_configuration(slot_name).get_css_class()};
 												 data-ams-slot-name slot_name;">
-								<div class="header padding-x-5"
-									 tal:content="slot_name"></div>
+								<div class="header padding-x-5">
+									<i class="fa fa-fw fa-minus-square pull-right padding-top-2" data-ams-click-handler="PyAMS_portal.template.switchSlot"></i>
+									<tal:var content="slot_name" />
+								</div>
 								<div class="portlets"
 									 data-ams-sortable-placeholder="portlet-highlight"
 									 data-ams-sortable-connectwith=".portlets"
@@ -105,6 +109,7 @@
 										<div class="header padding-x-5"
 											 tal:define="current_config portlet_config.get_portlet_configuration(portlet_id);
 														 portlet_name current_config.portlet_name;">
+											<i class="fa fa-fw fa-minus-square pull-right padding-top-2" data-ams-click-handler="PyAMS_portal.template.switchPortlet"></i>
 											<tal:var content="view.get_portlet_label(portlet_name)" />
 											<tal:if condition="current_config.can_inherit">
 												<i title="Override parent or template settings" i18n:attributes="title"