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..118162d17 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/model/HashtagIcon.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/model/HashtagIcon.kt
@@ -7,6 +7,10 @@ fun checkForHashtagWithIcon(tag: String): HashtagIcon? {
         return HashtagIcon(R.drawable.ht_btc, "Bitcoin", Color(0xFFF2A900))
     } else if (tag.lowercase() == "nostr") {
         return HashtagIcon(R.drawable.ht_nostr, "Nostr", Color(0xFF9C59FF))
+    } else if (tag.lowercase() == "zap" || tag.lowercase() == "zapathon" || tag.lowercase() == "lightning") {
+        return HashtagIcon(R.drawable.ht_zap, "Zap", Color(0xFFFFEC01))
+    } else if (tag.lowercase() == "amethyst") {
+        return HashtagIcon(R.drawable.ht_amethyst, "Amethyst", Color(0xFFb793e6))
     }
     return null
 }
diff --git a/app/src/main/res/drawable-hdpi/ht_amethyst.png b/app/src/main/res/drawable-hdpi/ht_amethyst.png
new file mode 100644
index 000000000..9aedf5c4c
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ht_amethyst.png differ
diff --git a/app/src/main/res/drawable-hdpi/ht_zap.png b/app/src/main/res/drawable-hdpi/ht_zap.png
new file mode 100644
index 000000000..adaa92337
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ht_zap.png differ
diff --git a/app/src/main/res/drawable-mdpi/ht_amethyst.png b/app/src/main/res/drawable-mdpi/ht_amethyst.png
new file mode 100644
index 000000000..e3be5d8ba
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ht_amethyst.png differ
diff --git a/app/src/main/res/drawable-mdpi/ht_zap.png b/app/src/main/res/drawable-mdpi/ht_zap.png
new file mode 100644
index 000000000..d01152cbf
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ht_zap.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ht_amethyst.png b/app/src/main/res/drawable-xhdpi/ht_amethyst.png
new file mode 100644
index 000000000..4402276bc
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ht_amethyst.png differ
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-xhdpi/ht_zap.png b/app/src/main/res/drawable-xhdpi/ht_zap.png
new file mode 100644
index 000000000..0cf9ea2a1
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ht_zap.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ht_amethyst.png b/app/src/main/res/drawable-xxhdpi/ht_amethyst.png
new file mode 100644
index 000000000..b809a3bcc
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ht_amethyst.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-xxhdpi/ht_zap.png b/app/src/main/res/drawable-xxhdpi/ht_zap.png
new file mode 100644
index 000000000..bc9ea4bd7
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ht_zap.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ht_amethyst.png b/app/src/main/res/drawable-xxxhdpi/ht_amethyst.png
new file mode 100644
index 000000000..0d5f9a77f
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ht_amethyst.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
diff --git a/app/src/main/res/drawable-xxxhdpi/ht_zap.png b/app/src/main/res/drawable-xxxhdpi/ht_zap.png
new file mode 100644
index 000000000..dfdfca397
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ht_zap.png differ