diff --git a/lnbits/templates/components/lnbits-wallet-icon.vue b/lnbits/templates/components/lnbits-wallet-icon.vue
index ca4a70554..ab0cfcc11 100644
--- a/lnbits/templates/components/lnbits-wallet-icon.vue
+++ b/lnbits/templates/components/lnbits-wallet-icon.vue
@@ -8,49 +8,48 @@
     icon="edit"
     style="position: relative; left: -15px; bottom: -10px"
   ></q-btn>
-  <q-dialog v-model="icon.show" position="top">
-    <q-card class="q-pa-lg q-pt-xl lnbits__dialog-card">
-      <q-form @submit="setIcon" class="q-gutter-md">
-        <div class="q-gutter-sm q-pa-sm flex flex-wrap justify-center">
+  <lnbits-dialog
+    :show="icon.show"
+    :action="{
+      handler: setIcon,
+      label: 'Save Icon',
+      disable: !icon.data.icon
+    }"
+    @update:show="icon.show = $event"
+    @hide="icon.data = {}"
+  >
+    <q-form class="q-gutter-md">
+      <div class="q-gutter-sm q-pa-sm flex flex-wrap justify-center">
+        <q-btn
+          v-for="(thisIcon, index) in icon.options"
+          :key="index"
+          @click="setSelectedIcon(thisIcon)"
+          round
+          text-color="black"
+          :color="
+            icon.data.icon === thisIcon
+              ? icon.data.color || 'primary'
+              : 'grey-5'
+          "
+          size="md"
+          :icon="thisIcon"
+          class="q-mb-sm"
+        ></q-btn>
+      </div>
+      <div class="q-pa-sm flex justify-between items-center">
+        <div class="flex q-pl-lg">
           <q-btn
-            v-for="(thisIcon, index) in icon.options"
-            :key="index"
-            @click="setSelectedIcon(thisIcon)"
+            v-for="(color, index) in icon.colorOptions"
+            :key="'color-' + index"
+            @click="setSelectedColor(color)"
             round
-            text-color="black"
-            :color="
-              icon.data.icon === thisIcon
-                ? icon.data.color || 'primary'
-                : 'grey-5'
-            "
-            size="md"
-            :icon="thisIcon"
-            class="q-mb-sm"
+            :color="color"
+            size="xs"
+            style="width: 24px; height: 24px; min-width: 24px; padding: 0"
+            class="q-mr-xs"
           ></q-btn>
         </div>
-        <div class="q-pa-sm flex justify-between items-center">
-          <div class="flex q-pl-lg">
-            <q-btn
-              v-for="(color, index) in icon.colorOptions"
-              :key="'color-' + index"
-              @click="setSelectedColor(color)"
-              round
-              :color="color"
-              size="xs"
-              style="width: 24px; height: 24px; min-width: 24px; padding: 0"
-              class="q-mr-xs"
-            ></q-btn>
-          </div>
-          <q-btn
-            unelevated
-            color="primary"
-            :disable="!icon.data.icon"
-            type="submit"
-          >
-            Save Icon
-          </q-btn>
-        </div>
-      </q-form>
-    </q-card>
-  </q-dialog>
+      </div>
+    </q-form>
+  </lnbits-dialog>
 </template>