diff --git a/public/manifest.json b/public/manifest.json
index 3e1378bbd..40523e18b 100644
--- a/public/manifest.json
+++ b/public/manifest.json
@@ -11,47 +11,47 @@
   "theme_color": "#980000",
   "icons": [
     {
-      "src": "./public/android/android-chrome-36x36.png",
+      "src": "./res/android/android-chrome-36x36.png",
       "sizes": "36x36",
       "type": "image/png"
     },
     {
-      "src": "./public/android/android-chrome-48x48.png",
+      "src": "./res/android/android-chrome-48x48.png",
       "sizes": "48x48",
       "type": "image/png"
     },
     {
-      "src": "./public/android/android-chrome-72x72.png",
+      "src": "./res/android/android-chrome-72x72.png",
       "sizes": "72x72",
       "type": "image/png"
     },
     {
-      "src": "./public/android/android-chrome-96x96.png",
+      "src": "./res/android/android-chrome-96x96.png",
       "sizes": "96x96",
       "type": "image/png"
     },
     {
-      "src": "./public/android/android-chrome-144x144.png",
+      "src": "./res/android/android-chrome-144x144.png",
       "sizes": "144x144",
       "type": "image/png"
     },
     {
-      "src": "./public/android/android-chrome-192x192.png",
+      "src": "./res/android/android-chrome-192x192.png",
       "sizes": "192x192",
       "type": "image/png"
     },
     {
-      "src": "./public/android/android-chrome-256x256.png",
+      "src": "./res/android/android-chrome-256x256.png",
       "sizes": "256x256",
       "type": "image/png"
     },
     {
-      "src": "./public/android/android-chrome-384x384.png",
+      "src": "./res/android/android-chrome-384x384.png",
       "sizes": "384x384",
       "type": "image/png"
     },
     {
-      "src": "./public/android/android-chrome-512x512.png",
+      "src": "./res/android/android-chrome-512x512.png",
       "sizes": "512x512",
       "type": "image/png"
     }
diff --git a/src/app/hooks/usePresenceUpdater.ts b/src/app/hooks/usePresenceUpdater.ts
index 742649cb1..484649897 100644
--- a/src/app/hooks/usePresenceUpdater.ts
+++ b/src/app/hooks/usePresenceUpdater.ts
@@ -17,9 +17,9 @@ export function usePresenceUpdater() {
 
   useEffect(() => {
     const setOnline = () =>
-      mx.setPresence({ presence: 'online', status_msg: '' }).catch(() => undefined);
-    const setUnavailable = (statusMsg = '') =>
-      mx.setPresence({ presence: 'unavailable', status_msg: statusMsg }).catch(() => undefined);
+      mx.setPresence({ presence: 'online' }).catch(() => undefined);
+    const setUnavailable = (statusMsg?: string) =>
+      mx.setPresence({ presence: 'unavailable', ...(statusMsg ? { status_msg: statusMsg } : {}) }).catch(() => undefined);
     const setOffline = () =>
       mx.setPresence({ presence: 'offline', status_msg: '' }).catch(() => undefined);