diff --git a/client/web/compose/src/components/Admin/Page/Tree.vue b/client/web/compose/src/components/Admin/Page/Tree.vue
index 6e429ce72..d43870714 100644
--- a/client/web/compose/src/components/Admin/Page/Tree.vue
+++ b/client/web/compose/src/components/Admin/Page/Tree.vue
@@ -79,7 +79,7 @@
                 style="margin-left:2px;"
               >
                 <font-awesome-icon
-                  :icon="['fas', 'pen']"
+                  :icon="['far', 'edit']"
                 />
               </b-button>
             </b-button-group>
diff --git a/client/web/compose/src/views/Admin/Pages/Edit.vue b/client/web/compose/src/views/Admin/Pages/Edit.vue
index 41e23761a..54f74324c 100644
--- a/client/web/compose/src/views/Admin/Pages/Edit.vue
+++ b/client/web/compose/src/views/Admin/Pages/Edit.vue
@@ -482,6 +482,16 @@
             v-model="layoutEditor.layout.config.visibility.expression"
             :placeholder="$t('page-layout.condition.placeholder')"
           />
+          <b-input-group-append>
+            <b-button
+              variant="outline-secondary"
+              :href="documentationURL"
+              class="d-flex justify-content-center align-items-center"
+              target="_blank"
+            >
+              ?
+            </b-button>
+          </b-input-group-append>
         </b-input-group>
 
         <b-form-text>
@@ -1000,6 +1010,12 @@ export default {
       return this.icon.type === 'link' ? this.icon.src : this.makeAttachmentUrl(this.icon.src)
     },
 
+    documentationURL () {
+      // eslint-disable-next-line no-undef
+      const [year, month] = VERSION.split('.')
+      return `https://docs.cortezaproject.org/corteza-docs/${year}.${month}/integrator-guide/compose-configuration/page-layouts.html#visibility-condition`
+    },
+
     currentLayoutRoles: {
       get () {
         if (!this.layoutEditor.layout) {