diff --git a/apps/app-frontend/src/components/ui/AccountsCard.vue b/apps/app-frontend/src/components/ui/AccountsCard.vue
index 5d7908a9..1eaa97af 100644
--- a/apps/app-frontend/src/components/ui/AccountsCard.vue
+++ b/apps/app-frontend/src/components/ui/AccountsCard.vue
@@ -54,9 +54,9 @@
       </div>
     </Card>
   </transition>
-  <ModalWrapper ref="loginOfflineModal" class="modal" header="Offline auth">
+  <ModalWrapper ref="loginOfflineModal" class="modal" header="Add new offline account">
     <div class="modal-body">
-      <div class="label">Offline account</div>
+      <div class="label">Enter offline username</div>
       <input type="text" v-model="playerName" placeholder="Provide offline player name" />
       <Button icon-only color="secondary" @click="offlineLoginFinally()">
         Continue
diff --git a/apps/app-frontend/src/components/ui/InstanceCreationModal.vue b/apps/app-frontend/src/components/ui/InstanceCreationModal.vue
index 9333a75a..e439c203 100644
--- a/apps/app-frontend/src/components/ui/InstanceCreationModal.vue
+++ b/apps/app-frontend/src/components/ui/InstanceCreationModal.vue
@@ -379,7 +379,7 @@ const upload_icon = async () => {
     ],
   })
 
-  icon.value = res ? res.path : null
+  icon.value = res ? res : null
 
   if (!icon.value) return
   display_icon.value = convertFileSrc(icon.value)
diff --git a/apps/app-frontend/src/pages/instance/Options.vue b/apps/app-frontend/src/pages/instance/Options.vue
index e4166eab..9ca84390 100644
--- a/apps/app-frontend/src/pages/instance/Options.vue
+++ b/apps/app-frontend/src/pages/instance/Options.vue
@@ -581,7 +581,7 @@ async function setIcon() {
 
   if (!value) return
 
-  icon.value = value.path
+  icon.value = value
   await edit_icon(props.instance.path, icon.value).catch(handleError)
 
   trackEvent('InstanceSetIcon')
diff --git a/patches/icon-selection-fix.patch b/patches/icon-selection-fix.patch
new file mode 100644
index 00000000..49986490
--- /dev/null
+++ b/patches/icon-selection-fix.patch
@@ -0,0 +1,26 @@
+diff --git a/apps/app-frontend/src/components/ui/InstanceCreationModal.vue b/apps/app-frontend/src/components/ui/InstanceCreationModal.vue
+index 9333a75a..e439c203 100644
+--- a/apps/app-frontend/src/components/ui/InstanceCreationModal.vue
++++ b/apps/app-frontend/src/components/ui/InstanceCreationModal.vue
+@@ -379,7 +379,7 @@ const upload_icon = async () => {
+     ],
+   })
+ 
+-  icon.value = res ? res.path : null
++  icon.value = res ? res : null
+ 
+   if (!icon.value) return
+   display_icon.value = convertFileSrc(icon.value)
+diff --git a/apps/app-frontend/src/pages/instance/Options.vue b/apps/app-frontend/src/pages/instance/Options.vue
+index e4166eab..9ca84390 100644
+--- a/apps/app-frontend/src/pages/instance/Options.vue
++++ b/apps/app-frontend/src/pages/instance/Options.vue
+@@ -581,7 +581,7 @@ async function setIcon() {
+ 
+   if (!value) return
+ 
+-  icon.value = value.path
++  icon.value = value
+   await edit_icon(props.instance.path, icon.value).catch(handleError)
+ 
+   trackEvent('InstanceSetIcon')