diff --git a/app/src/main/java/com/vitorpamplona/amethyst/model/HashtagIcon.kt b/app/src/main/java/com/vitorpamplona/amethyst/model/HashtagIcon.kt
index b04ac61c2..8aed40563 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/model/HashtagIcon.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/model/HashtagIcon.kt
@@ -4,9 +4,13 @@ import androidx.compose.ui.graphics.Color
 import com.vitorpamplona.amethyst.R
 fun checkForHashtagWithIcon(tag: String): HashtagIcon? {
     if (tag.lowercase() == "bitcoin" || tag.lowercase() == "btc") {
-        return HashtagIcon(R.drawable.ht_btc, "Bitcoin", Color(0xFFF2A900))
+        return HashtagIcon(R.drawable.ht_btc, "Bitcoin", Color.Unspecified)
     } else if (tag.lowercase() == "nostr") {
-        return HashtagIcon(R.drawable.ht_nostr, "Nostr", Color(0xFF9C59FF))
+        return HashtagIcon(R.drawable.ht_nostr, "Nostr", Color.Unspecified)
+    } else if (tag.lowercase() == "zap" || tag.lowercase() == "zaps" || tag.lowercase() == "zapathon" || tag.lowercase() == "zapraiser" || tag.lowercase() == "zaplife" || tag.lowercase() == "lightning") {
+        return HashtagIcon(R.drawable.lightning, "Zap", Color.Unspecified)
+    } else if (tag.lowercase() == "amethyst") {
+        return HashtagIcon(R.drawable.amethyst, "Amethyst", Color.Unspecified)
     }
     return null
 }
diff --git a/app/src/main/res/drawable-xhdpi/ht_btc.png b/app/src/main/res/drawable-xhdpi/ht_btc.png
index 3c9b974d8..94994fc8e 100644
Binary files a/app/src/main/res/drawable-xhdpi/ht_btc.png and b/app/src/main/res/drawable-xhdpi/ht_btc.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ht_btc.png b/app/src/main/res/drawable-xxhdpi/ht_btc.png
index 3c9b974d8..f4d319f70 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ht_btc.png and b/app/src/main/res/drawable-xxhdpi/ht_btc.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ht_btc.png b/app/src/main/res/drawable-xxxhdpi/ht_btc.png
index 3c9b974d8..8f7caa95b 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/ht_btc.png and b/app/src/main/res/drawable-xxxhdpi/ht_btc.png differ