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 b6b41160f..f2eda2fe4 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/model/HashtagIcon.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/model/HashtagIcon.kt
@@ -4,13 +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))
-    } else if (tag.lowercase() == "zap" || tag.lowercase() == "zapathon" || tag.lowercase() == "zapraiser" || tag.lowercase() == "zaplife" || tag.lowercase() == "lightning") {
-        return HashtagIcon(R.drawable.ht_zap, "Zap", Color(0xFFFFEC01))
+        return HashtagIcon(R.drawable.ht_nostr, "Nostr", Color.Unspecified)
+    } else if (tag.lowercase() == "zap" || tag.lowercase() == "zap" || 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.ht_amethyst, "Amethyst", Color(0xFFb793e6))
+        return HashtagIcon(R.drawable.amethyst, "Amethyst", Color.Unspecified)
     }
     return null
 }
diff --git a/app/src/main/res/drawable-hdpi/ht_amethyst.png b/app/src/main/res/drawable-hdpi/ht_amethyst.png
deleted file mode 100644
index 9aedf5c4c..000000000
Binary files a/app/src/main/res/drawable-hdpi/ht_amethyst.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ht_zap.png b/app/src/main/res/drawable-hdpi/ht_zap.png
deleted file mode 100644
index adaa92337..000000000
Binary files a/app/src/main/res/drawable-hdpi/ht_zap.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ht_amethyst.png b/app/src/main/res/drawable-mdpi/ht_amethyst.png
deleted file mode 100644
index e3be5d8ba..000000000
Binary files a/app/src/main/res/drawable-mdpi/ht_amethyst.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ht_zap.png b/app/src/main/res/drawable-mdpi/ht_zap.png
deleted file mode 100644
index d01152cbf..000000000
Binary files a/app/src/main/res/drawable-mdpi/ht_zap.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ht_amethyst.png b/app/src/main/res/drawable-xhdpi/ht_amethyst.png
deleted file mode 100644
index 4402276bc..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ht_amethyst.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ht_zap.png b/app/src/main/res/drawable-xhdpi/ht_zap.png
deleted file mode 100644
index 0cf9ea2a1..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ht_zap.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ht_amethyst.png b/app/src/main/res/drawable-xxhdpi/ht_amethyst.png
deleted file mode 100644
index b809a3bcc..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ht_amethyst.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ht_zap.png b/app/src/main/res/drawable-xxhdpi/ht_zap.png
deleted file mode 100644
index bc9ea4bd7..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ht_zap.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ht_amethyst.png b/app/src/main/res/drawable-xxxhdpi/ht_amethyst.png
deleted file mode 100644
index 0d5f9a77f..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ht_amethyst.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ht_zap.png b/app/src/main/res/drawable-xxxhdpi/ht_zap.png
deleted file mode 100644
index dfdfca397..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ht_zap.png and /dev/null differ