diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/NostrAccountDataSource.kt b/app/src/main/java/com/vitorpamplona/amethyst/service/NostrAccountDataSource.kt
index df3e1f2cb..309a16ba3 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/service/NostrAccountDataSource.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/service/NostrAccountDataSource.kt
@@ -145,6 +145,8 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
     }
 
     override fun consume(event: Event, relay: Relay) {
+        checkNotInMainThread()
+
         if (LocalCache.justVerify(event)) {
             if (event is GiftWrapEvent) {
                 val privateKey = account.keyPair.privKey
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/UpdateZapAmountDialog.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/UpdateZapAmountDialog.kt
index e82dfc6af..526ab3417 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/UpdateZapAmountDialog.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/UpdateZapAmountDialog.kt
@@ -386,6 +386,19 @@ fun UpdateZapAmountDialog(
                                 Modifier.weight(1f)
                             )
 
+                            /* TODO: Find a way to open this in the PWA
+                            IconButton(onClick = {
+                                onClose()
+                                runCatching { uri.openUri("https://app.mutinywallet.com/settings/connections?callbackUri=nostr+walletconnect&name=Amethyst") }
+                            }) {
+                                Icon(
+                                    painter = painterResource(R.mipmap.mutiny),
+                                    null,
+                                    modifier = Modifier.size(24.dp),
+                                    tint = Color.Unspecified
+                                )
+                            }*/
+
                             IconButton(onClick = {
                                 onClose()
                                 runCatching { uri.openUri("https://nwc.getalby.com/apps/new?c=Amethyst") }
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/LnZapFeedViewModel.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/LnZapFeedViewModel.kt
index e3a5af241..ee769b98c 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/LnZapFeedViewModel.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/LnZapFeedViewModel.kt
@@ -87,6 +87,8 @@ open class LnZapFeedViewModel(val dataSource: FeedFilter<ZapReqResponse>) : View
             checkNotInMainThread()
 
             LocalCache.live.newEventBundles.collect { newNotes ->
+                checkNotInMainThread()
+
                 invalidateData()
             }
         }
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/UserFeedViewModel.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/UserFeedViewModel.kt
index b076e54b5..608d86ce7 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/UserFeedViewModel.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/UserFeedViewModel.kt
@@ -118,6 +118,8 @@ open class UserFeedViewModel(val dataSource: FeedFilter<User>) : ViewModel(), In
             checkNotInMainThread()
 
             LocalCache.live.newEventBundles.collect { newNotes ->
+                checkNotInMainThread()
+
                 invalidateData()
             }
         }
diff --git a/app/src/main/res/mipmap-hdpi/mutiny.png b/app/src/main/res/mipmap-hdpi/mutiny.png
new file mode 100644
index 000000000..7f63351c7
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/mutiny.png differ
diff --git a/app/src/main/res/mipmap-mdpi/mutiny.png b/app/src/main/res/mipmap-mdpi/mutiny.png
new file mode 100644
index 000000000..8e1771a73
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/mutiny.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/mutiny.png b/app/src/main/res/mipmap-xhdpi/mutiny.png
new file mode 100644
index 000000000..795afb6bc
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/mutiny.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/mutiny.png b/app/src/main/res/mipmap-xxhdpi/mutiny.png
new file mode 100644
index 000000000..a981f6046
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/mutiny.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/mutiny.png b/app/src/main/res/mipmap-xxxhdpi/mutiny.png
new file mode 100644
index 000000000..7352042ea
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/mutiny.png differ