diff --git a/client/web/compose/src/views/Admin/Pages/Edit.vue b/client/web/compose/src/views/Admin/Pages/Edit.vue
index 92798a7a87..c6d7491741 100644
--- a/client/web/compose/src/views/Admin/Pages/Edit.vue
+++ b/client/web/compose/src/views/Admin/Pages/Edit.vue
@@ -735,32 +735,34 @@
       :title="$t('icon.configure')"
       size="lg"
       label-class="text-primary"
+      footer-class="d-flex justify-content-between"
       no-fade
     >
       <template #modal-footer>
-        <b-button
-          variant="link"
-          class="text-primary"
-          @click="closeIconModal"
-        >
-          {{ $t('general:label.cancel') }}
-        </b-button>
         <c-input-confirm
-          :disabled="attachments && !selectedAttachmentID"
-          :tooltip="$t('icon.tooltip.delete')"
+          :disabled="(attachments && !selectedAttachmentID) || processing"
           size="md"
           variant="danger"
           class="py-1"
           @confirmed="deleteIcon"
         >
-          {{ $t('general:label.delete') }}
+          {{ $t('icon.delete') }}
         </c-input-confirm>
-        <b-button
-          variant="primary"
-          @click="saveIconModal"
-        >
-          {{ $t('general:label.saveAndClose') }}
-        </b-button>
+        <div>
+          <b-button
+            variant="link"
+            class="text-primary"
+            @click="closeIconModal"
+          >
+            {{ $t('general:label.cancel') }}
+          </b-button>
+          <b-button
+            variant="primary"
+            @click="saveIconModal"
+          >
+            {{ $t('general:label.saveAndClose') }}
+          </b-button>
+        </div>
       </template>
       <b-form-group
         :label="$t('icon.upload')"
@@ -1264,6 +1266,8 @@ export default {
     },
 
     async fetchAttachments () {
+      this.processing = true
+
       return this.$ComposeAPI.iconList({ sort: 'id DESC' })
         .then(({ set: attachments = [] }) => {
           const baseURL = this.$ComposeAPI.baseURL
@@ -1279,6 +1283,9 @@ export default {
           }
         })
         .catch(this.toastErrorHandler(this.$t('notification:page.iconFetchFailed')))
+        .finally(() => {
+          this.processing = false
+        })
     },
 
     addLayoutAction () {
@@ -1384,6 +1391,10 @@ export default {
 
     setCurrentIcon () {
       this.selectedAttachmentID = (this.attachments.find(a => a.url === this.icon.src) || {}).attachmentID
+
+      if (!this.selectedAttachmentID) {
+        this.icon = {}
+      }
     },
   },
 }
diff --git a/locale/en/corteza-webapp-compose/page.yaml b/locale/en/corteza-webapp-compose/page.yaml
index 9cc53271f6..cf102fdfdd 100644
--- a/locale/en/corteza-webapp-compose/page.yaml
+++ b/locale/en/corteza-webapp-compose/page.yaml
@@ -79,8 +79,7 @@ icon:
   page: Page icon
   upload: Upload icon
   list: Uploaded icons
-  tooltip:
-    delete: Delete selected icon
+  delete: Delete selected icon
 url:
   label: Or add URL to icon
 import: 'Import page(s):'