diff --git a/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/Base_viewKnowledgePadMacroLibrary.xml b/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/Base_viewKnowledgePadMacroLibrary.xml
index 0e6dc9131cf0cd854df441644b0628d29684feee..e4689811d8d4035c0b0cfb7955e9a4a49a012fa0 100644
--- a/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/Base_viewKnowledgePadMacroLibrary.xml
+++ b/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/Base_viewKnowledgePadMacroLibrary.xml
@@ -265,7 +265,20 @@
       </table>\n
 \n
 </tal:block>\n
-
+\n
+<tal:block metal:define-macro="add_new_gadget_message">\n
+  <div tal:condition="is_tab_empty">\n
+    <h3 i18n:translate="" \n
+        i18n:domain="ui"> \n
+      Your tab is empty.\n
+    </h3>\n
+    <h4 i18n:translate="" \n
+        i18n:domain="ui"> \n
+        Please  use link (<b>Add gadgets</b>) to prepare it yourself.\n
+    </h4>\n
+  </div>\n
+\n
+</tal:block>
 
 ]]></unicode> </value>
         </item>
diff --git a/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/KnowledgePad_viewDashboardWidget.xml b/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/KnowledgePad_viewDashboardWidget.xml
index dac70f6dc20b7032a974f1ceec95d0f1040f84e5..60eb542f9d97e832560fafde7025b10d841e749e 100644
--- a/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/KnowledgePad_viewDashboardWidget.xml
+++ b/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/KnowledgePad_viewDashboardWidget.xml
@@ -44,16 +44,8 @@
                                      (len(layout)==3 and len(layout[0]+layout[1]+layout[2])==0);\n
                  page_wrapper_id python:  options.get(\'page_wrapper_id\', \'page_wrapper\');"\n
      tal:attributes="id page_wrapper_id">\n
-    <div tal:condition="is_tab_empty">\n
-      <h3 i18n:translate="" \n
-          i18n:domain="ui"> \n
-        Your tab is empty.\n
-      </h3>\n
-      <h4 i18n:translate="" \n
-          i18n:domain="ui"> \n
-        Please  use link above (\'Add gadget\') to prepare it yourself.\n
-      </h4>\n
-    </div>\n
+\n
+    <span metal:use-macro="container/Base_viewKnowledgePadMacroLibrary/macros/add_new_gadget_message"/> \n
 \n
     <table id="table_column_layout">\n
     <tr>\n
diff --git a/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad_web/WebSection_viewDashboardWidget.xml b/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad_web/WebSection_viewDashboardWidget.xml
index b6303b23e13ce97be78c7439eb25225c40a0e15c..725ab50f9c6c7839ddafaa42136cb6cec8136c0b 100644
--- a/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad_web/WebSection_viewDashboardWidget.xml
+++ b/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad_web/WebSection_viewDashboardWidget.xml
@@ -48,13 +48,7 @@
                                             \'portal-column portal-column-undraggable\', \n
                                             \'portal-column\')">\n
 \n
-    <div tal:condition="python: is_tab_empty and not isAnon">\n
-      <h4 i18n:translate="" \n
-          i18n:domain="ui"> Your tab is empty.</h4>\n
-      <p  i18n:translate="" \n
-          i18n:domain="ui"> Please  use link (<b>Add gadgets</b>) to prepare it yourself.\n
-      </p>\n
-    </div>\n
+    <span metal:use-macro="container/Base_viewKnowledgePadMacroLibrary/macros/add_new_gadget_message"/> \n
 \n
     <div id="portal-column-0"\n
          tal:attributes="class column_css_class"\n
diff --git a/bt5/erp5_knowledge_pad/bt/revision b/bt5/erp5_knowledge_pad/bt/revision
index 823aeb4b44b7f09e1692e625ff87d75f224be3b5..53a274896eb3bd21ade6b46ff50630eab6dbb601 100644
--- a/bt5/erp5_knowledge_pad/bt/revision
+++ b/bt5/erp5_knowledge_pad/bt/revision
@@ -1 +1 @@
-624
\ No newline at end of file
+626
\ No newline at end of file