diff --git a/platypush/backend/http/webapp/src/components/elements/ExtensionIcon.vue b/platypush/backend/http/webapp/src/components/elements/ExtensionIcon.vue
index a5bc6f719..bb11e8959 100644
--- a/platypush/backend/http/webapp/src/components/elements/ExtensionIcon.vue
+++ b/platypush/backend/http/webapp/src/components/elements/ExtensionIcon.vue
@@ -1,8 +1,9 @@
 <template>
   <div class="extension-icon" :style="{ width: `${size}`, height: `${size}` }">
-    <a :href="docsUrl" target="_blank">
+    <a :href="docsUrl" target="_blank" v-if="withDocsLink">
       <img :src="iconUrl" :alt="extensionName" :title="extensionName" />
     </a>
+    <img :src="iconUrl" :alt="extensionName" :title="extensionName" v-else />
   </div>
 </template>
 
@@ -18,6 +19,11 @@ export default {
       type: String,
       default: '1.75em',
     },
+
+    withDocsLink: {
+      type: Boolean,
+      default: false,
+    },
   },
 
   computed: {
diff --git a/platypush/backend/http/webapp/src/components/panels/Extensions/Doc.vue b/platypush/backend/http/webapp/src/components/panels/Extensions/Doc.vue
index e8bce5e24..3488302d0 100644
--- a/platypush/backend/http/webapp/src/components/panels/Extensions/Doc.vue
+++ b/platypush/backend/http/webapp/src/components/panels/Extensions/Doc.vue
@@ -3,7 +3,7 @@
     <header>
       <h2>
         <a class="title" :href="extension.doc_url" target="_blank">
-          <ExtensionIcon :name="extension.name" size="2em" />
+          <ExtensionIcon :name="extension.name" size="2em" with-docs-link />
           <span class="name" v-text="extension.name" />
         </a>
       </h2>