From 0f89d98513b42335b35d0aa315a8589af7422e01 Mon Sep 17 00:00:00 2001
From: William Casarin <jb55@jb55.com>
Date: Fri, 5 May 2023 08:45:55 -0700
Subject: [PATCH] Revert "Added new icons for hashtags and updated the current
 ones to use a proper ratio."

This breaks the look of some hashtags

This reverts commit c7129531c2c85ba05fbd70e1d325b5516a842116.
---
 .../altcoins-hashtag.imageset/Contents.json   | 21 -------
 .../altcoins-hashtag.svg                      | 32 ----------
 .../beerstr-hashtag.imageset/Contents.json    | 21 -------
 .../beerstr-hashtag.svg                       |  3 -
 .../bitcoin-hashtag.imageset/Contents.json    |  2 +
 .../bitcoin-hashtag.svg                       | 44 +++++++++++++-
 .../Contents.json                             | 21 -------
 .../bitcoinjungle-hashtag.svg                 |  3 -
 .../coffee-hashtag.imageset/Contents.json     |  4 +-
 .../coffee-hashtag.svg                        |  5 --
 .../coffee-hashtag.imageset/coffee.svg        | 55 +++++++++++++++++
 .../damus-hashtag.imageset/Contents.json      | 21 -------
 .../damus-hashtag.imageset/damus-hashtag.svg  | 19 ------
 .../Contents.json                             | 21 -------
 .../followfriday-hashtag.svg                  |  5 --
 .../growstr-hashtag.imageset/Contents.json    | 21 -------
 .../growstr-hashtag.svg                       |  3 -
 .../Contents.json                             | 21 -------
 .../happybirthday-hashtag.svg                 |  4 --
 .../Contents.json                             | 21 -------
 .../introductions-hashtag.svg                 |  3 -
 .../nostr-hashtag.imageset/Contents.json      |  2 +
 .../nostr-hashtag.imageset/nostr-hashtag.svg  | 52 +++++++++++++++-
 .../plebchain-hashtag.imageset/Contents.json  |  4 +-
 .../plebchain-hashtag.svg                     |  6 --
 .../plebchain-hashtag.imageset/plebchain.svg  | 51 ++++++++++++++++
 .../sats-hashtag.imageset/Contents.json       | 21 -------
 .../sats-hashtag.imageset/sats-hashtag.svg    |  7 ---
 .../zap-hashtag.imageset/Contents.json        |  4 +-
 .../zap-hashtag.imageset/zap-hashtag.svg      |  4 --
 .../zap-hashtag.imageset/zapathon.svg         | 60 +++++++++++++++++++
 .../zapan-hashtag.imageset/Contents.json      | 21 -------
 .../zapan-hashtag.imageset/zapan-hashtag.svg  | 19 ------
 33 files changed, 271 insertions(+), 330 deletions(-)
 delete mode 100644 damus/Assets.xcassets/Hashtags/altcoins-hashtag.imageset/Contents.json
 delete mode 100644 damus/Assets.xcassets/Hashtags/altcoins-hashtag.imageset/altcoins-hashtag.svg
 delete mode 100644 damus/Assets.xcassets/Hashtags/beerstr-hashtag.imageset/Contents.json
 delete mode 100644 damus/Assets.xcassets/Hashtags/beerstr-hashtag.imageset/beerstr-hashtag.svg
 delete mode 100644 damus/Assets.xcassets/Hashtags/bitcoinjungle-hashtag.imageset/Contents.json
 delete mode 100644 damus/Assets.xcassets/Hashtags/bitcoinjungle-hashtag.imageset/bitcoinjungle-hashtag.svg
 delete mode 100644 damus/Assets.xcassets/Hashtags/coffee-hashtag.imageset/coffee-hashtag.svg
 create mode 100644 damus/Assets.xcassets/Hashtags/coffee-hashtag.imageset/coffee.svg
 delete mode 100644 damus/Assets.xcassets/Hashtags/damus-hashtag.imageset/Contents.json
 delete mode 100644 damus/Assets.xcassets/Hashtags/damus-hashtag.imageset/damus-hashtag.svg
 delete mode 100644 damus/Assets.xcassets/Hashtags/followfriday-hashtag.imageset/Contents.json
 delete mode 100644 damus/Assets.xcassets/Hashtags/followfriday-hashtag.imageset/followfriday-hashtag.svg
 delete mode 100644 damus/Assets.xcassets/Hashtags/growstr-hashtag.imageset/Contents.json
 delete mode 100644 damus/Assets.xcassets/Hashtags/growstr-hashtag.imageset/growstr-hashtag.svg
 delete mode 100644 damus/Assets.xcassets/Hashtags/happybirthday-hashtag.imageset/Contents.json
 delete mode 100644 damus/Assets.xcassets/Hashtags/happybirthday-hashtag.imageset/happybirthday-hashtag.svg
 delete mode 100644 damus/Assets.xcassets/Hashtags/introductions-hashtag.imageset/Contents.json
 delete mode 100644 damus/Assets.xcassets/Hashtags/introductions-hashtag.imageset/introductions-hashtag.svg
 delete mode 100644 damus/Assets.xcassets/Hashtags/plebchain-hashtag.imageset/plebchain-hashtag.svg
 create mode 100644 damus/Assets.xcassets/Hashtags/plebchain-hashtag.imageset/plebchain.svg
 delete mode 100644 damus/Assets.xcassets/Hashtags/sats-hashtag.imageset/Contents.json
 delete mode 100644 damus/Assets.xcassets/Hashtags/sats-hashtag.imageset/sats-hashtag.svg
 delete mode 100644 damus/Assets.xcassets/Hashtags/zap-hashtag.imageset/zap-hashtag.svg
 create mode 100644 damus/Assets.xcassets/Hashtags/zap-hashtag.imageset/zapathon.svg
 delete mode 100644 damus/Assets.xcassets/Hashtags/zapan-hashtag.imageset/Contents.json
 delete mode 100644 damus/Assets.xcassets/Hashtags/zapan-hashtag.imageset/zapan-hashtag.svg

diff --git a/damus/Assets.xcassets/Hashtags/altcoins-hashtag.imageset/Contents.json b/damus/Assets.xcassets/Hashtags/altcoins-hashtag.imageset/Contents.json
deleted file mode 100644
index edcdf01c..00000000
--- a/damus/Assets.xcassets/Hashtags/altcoins-hashtag.imageset/Contents.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "altcoins-hashtag.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/damus/Assets.xcassets/Hashtags/altcoins-hashtag.imageset/altcoins-hashtag.svg b/damus/Assets.xcassets/Hashtags/altcoins-hashtag.imageset/altcoins-hashtag.svg
deleted file mode 100644
index bb80b641..00000000
--- a/damus/Assets.xcassets/Hashtags/altcoins-hashtag.imageset/altcoins-hashtag.svg
+++ /dev/null
@@ -1,32 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7.9625 2.15757C8.04453 2.05679 8.17344 2.00522 8.30234 2.02397C9.40156 2.17163 10.25 3.11382 10.25 4.25288C10.25 4.51538 10.2055 4.7685 10.1211 5.00288H10.25C11.0773 5.00288 11.75 5.67554 11.75 6.50288C11.75 6.95054 11.5531 7.35366 11.2414 7.62788H11.5625C12.4953 7.62788 13.25 8.38257 13.25 9.31538C13.25 9.85913 12.9922 10.3419 12.5938 10.6513C13.393 10.7849 14 11.4787 14 12.3154C14 13.2482 13.2453 14.0029 12.3125 14.0029H3.6875C2.75469 14.0029 2 13.2482 2 12.3154C2 11.4787 2.60703 10.7849 3.40625 10.6513C3.00781 10.3419 2.75 9.85913 2.75 9.31538C2.75 8.38257 3.50469 7.62788 4.4375 7.62788H4.75859C4.44687 7.35366 4.25 6.95054 4.25 6.50288C4.25 5.67554 4.92266 5.00288 5.75 5.00288H6.12969C7.16328 5.00054 8 4.16147 8 3.12788C8 2.91225 7.96484 2.70835 7.89922 2.51616C7.85703 2.39429 7.88047 2.256 7.96484 2.15522L7.9625 2.15757Z" fill="#804E2C"/>
-<rect x="5.5" y="8" width="1.5" height="2" rx="0.75" fill="#D9D9D9"/>
-<mask id="mask0_1550_39095" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="5" y="8" width="2" height="2">
-<rect x="5.5" y="8" width="1.5" height="2" rx="0.75" fill="#D9D9D9"/>
-</mask>
-<g mask="url(#mask0_1550_39095)">
-<rect width="0.8" height="1.2" rx="0.4" transform="matrix(1 0 0 -1 5.8501 9.57999)" fill="#130F0F"/>
-</g>
-<rect x="8.5" y="8" width="1.5" height="2" rx="0.75" fill="#D9D9D9"/>
-<mask id="mask1_1550_39095" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="8" y="8" width="2" height="2">
-<rect x="8.5" y="8" width="1.5" height="2" rx="0.75" fill="#D9D9D9"/>
-</mask>
-<g mask="url(#mask1_1550_39095)">
-<rect width="0.8" height="1.2" rx="0.4" transform="matrix(1 0 0 -1 8.8501 9.57999)" fill="#130F0F"/>
-</g>
-<g filter="url(#filter0_i_1550_39095)">
-<path d="M5 11.3639C5 11.1629 5.1629 11 5.36385 11H10.6361C10.8371 11 11 11.1629 11 11.3639C11 11.5393 10.8748 11.6895 10.7018 11.7183C10.1392 11.8119 8.8974 12 8 12C7.1026 12 5.86081 11.8119 5.29825 11.7183C5.12516 11.6895 5 11.5393 5 11.3639Z" fill="#D9D9D9"/>
-</g>
-<defs>
-<filter id="filter0_i_1550_39095" x="5" y="11" width="6" height="1.2" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="0.2"/>
-<feGaussianBlur stdDeviation="0.25"/>
-<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"/>
-<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1550_39095"/>
-</filter>
-</defs>
-</svg>
diff --git a/damus/Assets.xcassets/Hashtags/beerstr-hashtag.imageset/Contents.json b/damus/Assets.xcassets/Hashtags/beerstr-hashtag.imageset/Contents.json
deleted file mode 100644
index aa9c3077..00000000
--- a/damus/Assets.xcassets/Hashtags/beerstr-hashtag.imageset/Contents.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "beerstr-hashtag.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/damus/Assets.xcassets/Hashtags/beerstr-hashtag.imageset/beerstr-hashtag.svg b/damus/Assets.xcassets/Hashtags/beerstr-hashtag.imageset/beerstr-hashtag.svg
deleted file mode 100644
index ab723a98..00000000
--- a/damus/Assets.xcassets/Hashtags/beerstr-hashtag.imageset/beerstr-hashtag.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8.08952 5.03146C7.73387 5.42823 7.21855 5.67743 6.64516 5.67743C6.07177 5.67743 5.55645 5.42823 5.20081 5.03146C5.03387 4.84517 4.68306 4.82339 4.48468 4.97581C4.22581 5.17178 3.90161 5.29033 3.54839 5.29033C2.69435 5.29033 2 4.59597 2 3.74194C2 2.88791 2.69435 2.19355 3.54839 2.19355C3.90161 2.19355 4.22581 2.3121 4.48468 2.50807C4.68306 2.66049 5.03387 2.63872 5.20081 2.45243C5.55645 2.05565 6.07177 1.80646 6.64516 1.80646C7.21855 1.80646 7.73387 2.05565 8.08952 2.45243C8.25645 2.63872 8.60726 2.66049 8.80564 2.50807C9.06452 2.3121 9.38871 2.19355 9.74194 2.19355C10.596 2.19355 11.2903 2.88791 11.2903 3.74194C11.2903 4.59597 10.596 5.29033 9.74194 5.29033C9.38871 5.29033 9.06452 5.17178 8.80564 4.97581C8.60726 4.82339 8.25645 4.84517 8.08952 5.03146ZM2.3871 12.6452V5.75484C2.72823 5.95081 3.125 6.06452 3.54839 6.06452C4.00081 6.06452 4.42419 5.93388 4.78226 5.70888C5.26613 6.16855 5.92419 6.45162 6.64516 6.45162C7.36613 6.45162 8.02419 6.16855 8.50806 5.70888C8.86613 5.93388 9.28952 6.06452 9.74194 6.06452C10.2161 6.06452 10.6589 5.92178 11.0266 5.67743H12.1419C13.1677 5.67743 14 6.50968 14 7.53549V10.0057C14 10.7387 13.5669 11.4065 12.8968 11.704L10.9032 12.5895V12.6452C10.9032 13.4992 10.2089 14.1936 9.35484 14.1936H3.93548C3.08145 14.1936 2.3871 13.4992 2.3871 12.6452ZM10.9032 10.8936L12.2677 10.2863C12.379 10.2355 12.4516 10.1266 12.4516 10.0032V7.53549C12.4516 7.36372 12.3137 7.22581 12.1419 7.22581H10.9032V10.8936ZM5.48387 7.61291C5.48387 7.40001 5.30968 7.22581 5.09677 7.22581C4.88387 7.22581 4.70968 7.40001 4.70968 7.61291V11.4839C4.70968 11.6968 4.88387 11.871 5.09677 11.871C5.30968 11.871 5.48387 11.6968 5.48387 11.4839V7.61291ZM7.03226 7.61291C7.03226 7.40001 6.85806 7.22581 6.64516 7.22581C6.43226 7.22581 6.25806 7.40001 6.25806 7.61291V11.4839C6.25806 11.6968 6.43226 11.871 6.64516 11.871C6.85806 11.871 7.03226 11.6968 7.03226 11.4839V7.61291ZM8.58065 7.61291C8.58065 7.40001 8.40645 7.22581 8.19355 7.22581C7.98065 7.22581 7.80645 7.40001 7.80645 7.61291V11.4839C7.80645 11.6968 7.98065 11.871 8.19355 11.871C8.40645 11.871 8.58065 11.6968 8.58065 11.4839V7.61291Z" fill="#E6891D"/>
-</svg>
diff --git a/damus/Assets.xcassets/Hashtags/bitcoin-hashtag.imageset/Contents.json b/damus/Assets.xcassets/Hashtags/bitcoin-hashtag.imageset/Contents.json
index 460ee7e6..d8e939d9 100644
--- a/damus/Assets.xcassets/Hashtags/bitcoin-hashtag.imageset/Contents.json
+++ b/damus/Assets.xcassets/Hashtags/bitcoin-hashtag.imageset/Contents.json
@@ -6,10 +6,12 @@
       "scale" : "1x"
     },
     {
+      "filename" : "bitcoin-hashtag.svg",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
+      "filename" : "bitcoin-hashtag.svg",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/damus/Assets.xcassets/Hashtags/bitcoin-hashtag.imageset/bitcoin-hashtag.svg b/damus/Assets.xcassets/Hashtags/bitcoin-hashtag.imageset/bitcoin-hashtag.svg
index 972c75ca..3c92d3ff 100644
--- a/damus/Assets.xcassets/Hashtags/bitcoin-hashtag.imageset/bitcoin-hashtag.svg
+++ b/damus/Assets.xcassets/Hashtags/bitcoin-hashtag.imageset/bitcoin-hashtag.svg
@@ -1,3 +1,43 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.8493 6.75321C13.0549 5.38246 12.0067 4.64467 10.5795 4.14878L11.0431 2.2902L9.91021 2.00798L9.45866 3.81819C9.16032 3.74562 8.85392 3.67305 8.55155 3.60451L9.00712 1.78221L7.87424 1.5L7.4106 3.35858C7.16467 3.30214 6.92277 3.24973 6.68491 3.18925L6.68891 3.18522L5.12467 2.79415L4.82633 4.00364C4.82633 4.00364 5.6649 4.19716 5.64878 4.20925C6.10435 4.32214 6.18902 4.62451 6.17289 4.86641L5.64475 6.98704C5.677 6.99511 5.71731 7.0072 5.76569 7.02332L5.64475 6.99511L4.90293 9.96239C4.84648 10.1035 4.70538 10.3131 4.38688 10.2325C4.39494 10.2486 3.5604 10.0269 3.5604 10.0269L3 11.321L4.47557 11.692C4.74973 11.7605 5.01581 11.829 5.2819 11.8976L4.8102 13.7803L5.94309 14.0625L6.40672 12.1999C6.71716 12.2846 7.0155 12.3612 7.30981 12.4338L6.84617 14.2883L7.97906 14.5705L8.44673 12.6918C10.3779 13.0587 11.8333 12.9095 12.4421 11.1638C12.9339 9.75677 12.4179 8.94642 11.4019 8.41827C12.1437 8.24491 12.7001 7.76112 12.8493 6.75321ZM10.261 10.3817C9.91021 11.7887 7.54364 11.0308 6.7736 10.8372L7.3985 8.3457C8.16451 8.53519 10.6238 8.91416 10.261 10.3817ZM10.6117 6.73305C10.2932 8.01511 8.32175 7.36198 7.68072 7.20475L8.24514 4.94301C8.88617 5.10427 10.9423 5.39858 10.6117 6.73305Z" fill="#F59119"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="12.843903"
+   height="17"
+   viewBox="0 0 12.843902 16.999999"
+   version="1.1"
+   id="svg2"
+   sodipodi:docname="bitcoin-hashtag.svg"
+   inkscape:version="1.3-dev (77bc73e, 2022-05-18)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="namedview2"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="31.12"
+     inkscape:cx="4.2577121"
+     inkscape:cy="7.535347"
+     inkscape:window-width="1526"
+     inkscape:window-height="957"
+     inkscape:window-x="1637"
+     inkscape:window-y="10"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" />
+  <g
+     id="surface1"
+     transform="matrix(0.94507527,0,0,0.94507527,-4.5943665,-3.2875042)">
+    <path
+       style="fill:#f59119;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.40637"
+       d="M 18.388175,10.742602 C 18.668352,8.874761 17.240002,7.8694225 15.295251,7.193703 L 15.927019,4.6611305 14.383304,4.2765743 13.768015,6.7432244 C 13.361486,6.644338 12.943967,6.545453 12.531944,6.4520613 L 13.152726,3.9689298 11.609011,3.584375 10.977241,6.1169476 C 10.642129,6.0400371 10.312509,5.9686201 9.988384,5.886215 L 9.993834,5.880715 7.8623408,5.3478364 7.4558114,6.9959316 c 0,0 1.1426793,0.2636953 1.1207046,0.2801765 0.6207823,0.1538223 0.7361485,0.5658464 0.714174,0.8954659 l -0.7196673,2.889659 c 0.043949,0.01099 0.098885,0.02747 0.1648089,0.04944 L 8.5710227,11.072223 7.5601911,15.11555 c -0.076912,0.192277 -0.26919,0.477948 -0.7031873,0.368073 0.010984,0.02198 -1.1261994,-0.280174 -1.1261994,-0.280174 l -0.7636164,1.76346 2.0106754,0.505417 c 0.3735682,0.0934 0.7361485,0.186784 1.0987301,0.280176 l -0.6427568,2.565534 1.5437155,0.384556 0.6317701,-2.538067 c 0.4230107,0.115364 0.8295407,0.219746 1.2305777,0.318632 l -0.63177,2.527079 1.543716,0.384557 0.637263,-2.560042 c 2.631459,0.499922 4.614667,0.296656 5.444208,-2.082094 0.670226,-1.917284 -0.03296,-3.021507 -1.417363,-3.741176 1.010832,-0.236227 1.768957,-0.895465 1.972221,-2.268877 z m -3.526922,4.944286 c -0.477949,1.917283 -3.702721,0.884477 -4.752008,0.620782 l 0.851514,-3.395075 c 1.043795,0.2582 4.394922,0.774604 3.900494,2.774293 z M 15.3392,10.715134 c -0.433999,1.74698 -3.120394,0.857008 -3.993884,0.642757 l 0.769111,-3.081939 c 0.87349,0.219746 3.675252,0.620784 3.224773,2.439182 z m 0,0"
+       id="path2" />
+  </g>
 </svg>
diff --git a/damus/Assets.xcassets/Hashtags/bitcoinjungle-hashtag.imageset/Contents.json b/damus/Assets.xcassets/Hashtags/bitcoinjungle-hashtag.imageset/Contents.json
deleted file mode 100644
index a51839ce..00000000
--- a/damus/Assets.xcassets/Hashtags/bitcoinjungle-hashtag.imageset/Contents.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "bitcoinjungle-hashtag.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/damus/Assets.xcassets/Hashtags/bitcoinjungle-hashtag.imageset/bitcoinjungle-hashtag.svg b/damus/Assets.xcassets/Hashtags/bitcoinjungle-hashtag.imageset/bitcoinjungle-hashtag.svg
deleted file mode 100644
index 1b846816..00000000
--- a/damus/Assets.xcassets/Hashtags/bitcoinjungle-hashtag.imageset/bitcoinjungle-hashtag.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.18169 4.46367L4.83266 5.54863C4.74672 5.62383 4.66079 5.70332 4.57485 5.78926C3.04946 7.31465 3.28149 9.0334 3.87231 9.89922C3.97973 10.0561 4.19887 10.0561 4.33208 9.9207L7.30766 6.94512C7.3936 7.17715 7.47524 7.50801 7.51606 7.95918C7.6063 8.9582 7.48169 10.4686 6.81352 12.6084C6.74907 12.8168 6.78559 13.0445 6.91665 13.2207C7.0477 13.3969 7.2518 13.5 7.47094 13.5H8.84594C9.19184 13.5 9.48618 13.2422 9.52915 12.8984C9.79555 10.7715 9.47973 8.44688 8.84809 6.625H11.568C11.6282 6.625 11.684 6.59277 11.7163 6.54121L12.1374 5.83867C12.204 5.72695 12.3651 5.72695 12.4317 5.83867L12.8528 6.54121C12.8829 6.59277 12.9409 6.625 13.001 6.625H14.0022C14.1913 6.625 14.3481 6.47031 14.3116 6.2834C14.1161 5.2543 13.0655 3.875 10.9084 3.875C9.96958 3.875 9.24126 4.13711 8.69985 4.51523C8.34106 3.56133 7.29907 2.5 5.40844 2.5C3.25141 2.5 2.20083 3.8793 2.00532 4.9084C1.9688 5.09531 2.12563 5.25 2.31469 5.25H3.31801C3.37817 5.25 3.43403 5.21777 3.46626 5.16621L3.8852 4.46367C3.9518 4.35195 4.11294 4.35195 4.17954 4.46367H4.18169Z" fill="#F9AD1C"/>
-</svg>
diff --git a/damus/Assets.xcassets/Hashtags/coffee-hashtag.imageset/Contents.json b/damus/Assets.xcassets/Hashtags/coffee-hashtag.imageset/Contents.json
index 7fac6e9c..c4af4c7d 100644
--- a/damus/Assets.xcassets/Hashtags/coffee-hashtag.imageset/Contents.json
+++ b/damus/Assets.xcassets/Hashtags/coffee-hashtag.imageset/Contents.json
@@ -1,15 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "coffee-hashtag.svg",
+      "filename" : "coffee.svg",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
+      "filename" : "coffee.svg",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
+      "filename" : "coffee.svg",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/damus/Assets.xcassets/Hashtags/coffee-hashtag.imageset/coffee-hashtag.svg b/damus/Assets.xcassets/Hashtags/coffee-hashtag.imageset/coffee-hashtag.svg
deleted file mode 100644
index abd6e5c7..00000000
--- a/damus/Assets.xcassets/Hashtags/coffee-hashtag.imageset/coffee-hashtag.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7.24028 1.68331C7.43702 1.91729 7.55677 2.1035 7.69771 2.4013C7.85457 2.73635 7.92103 2.99164 7.93971 3.32142C7.96893 3.93032 7.7589 4.34524 7.22975 4.71753C6.6048 5.1589 6.32832 5.69082 6.32568 6.44868C6.32568 6.79175 6.37622 7.10811 6.47728 7.42197C6.54374 7.6187 6.55177 7.632 6.55703 7.54962C6.58098 7.24115 6.63151 6.92203 6.68994 6.7253C6.84944 6.16957 7.09144 5.90624 7.8547 5.46223C8.41307 5.13522 8.61257 4.82136 8.61257 4.27089C8.60993 3.61146 8.13921 2.56632 7.56216 1.94414C7.4532 1.82715 7.3016 1.67818 7.22449 1.61436L7.08618 1.5L7.24028 1.68331Z" fill="#BE5F00"/>
-<path d="M9.45017 3.38524C9.80917 3.87189 9.85707 4.49947 9.5698 4.95414C9.37569 5.25997 9.07789 5.48868 8.48755 5.79438C7.7085 6.19325 7.36279 6.69318 7.36279 7.41644C7.36279 7.78069 7.38148 7.86847 7.45846 7.86847C7.509 7.86847 7.52229 7.84715 7.54887 7.72227C7.59414 7.50158 7.72705 7.2622 7.89457 7.09468C8.08868 6.90321 8.35463 6.77293 8.99814 6.55224C9.66033 6.32616 9.95274 6.18259 10.1124 6.00441C10.3889 5.69858 10.4766 5.29971 10.3783 4.81583C10.2773 4.32392 10.0938 4.00217 9.67099 3.57395C9.4661 3.36919 9.38898 3.30273 9.45017 3.38524Z" fill="#BE5F00"/>
-<path d="M5.1958 7.31274C4.41938 7.42447 3.85825 7.62923 3.60835 7.88716C3.44083 8.05995 3.4328 8.10785 3.45675 8.6795C3.50189 9.77504 3.69613 10.9557 4.06565 12.4024C4.26778 13.1921 4.47254 13.8676 4.52834 13.9288C4.60282 14.0111 4.88734 14.1361 5.15592 14.2052C6.03604 14.434 8.01446 14.4632 9.05157 14.261C9.52229 14.1706 9.84668 14.0456 10.0142 13.894C10.1046 13.8143 10.1259 13.7718 10.1551 13.6334C10.2403 13.1921 10.2296 13.2133 10.3279 13.2133C10.4689 13.2133 10.905 13.091 11.1204 12.9926C11.4103 12.8569 11.599 12.7266 11.8676 12.4687C12.4872 11.8731 12.8675 10.9556 12.8701 10.0463C12.8701 9.52238 12.7744 9.23787 12.5085 8.96928C12.2186 8.67674 11.8942 8.56238 11.2746 8.54106L10.8677 8.52514L10.8864 8.238L10.9051 7.95085L10.8306 7.88177C10.6152 7.67963 9.83615 7.435 9.07552 7.32603L8.96643 7.31011L8.8601 7.49092L8.75114 7.66911L8.90274 7.69042C9.67652 7.80215 10.0462 7.90045 10.1898 8.0281C10.2642 8.09456 10.2695 8.11048 10.2483 8.17707C10.142 8.47487 8.93208 8.66634 7.18238 8.66634C5.57624 8.66634 4.42214 8.50409 4.16158 8.24352C4.09249 8.1718 4.0871 8.15575 4.11368 8.09732C4.17751 7.95638 4.56308 7.8261 5.19593 7.73306C5.38477 7.70648 5.59217 7.68253 5.65599 7.68253C5.71718 7.68253 5.76772 7.67726 5.76772 7.67187C5.76772 7.66121 5.53637 7.28366 5.52308 7.27037C5.51755 7.2676 5.37135 7.28616 5.1958 7.31274ZM11.5086 9.43737C11.7107 9.47198 11.8676 9.54633 11.926 9.6395C12.0005 9.75122 12.0058 10.166 11.9367 10.4984C11.7905 11.2164 11.4049 11.8094 10.8996 12.1046C10.7161 12.2109 10.4608 12.3039 10.4316 12.2747C10.421 12.2641 10.4556 11.9902 10.5087 11.6658C10.6124 11.0303 10.7188 10.2538 10.7747 9.75662L10.8065 9.45079L10.8996 9.43487C11.0513 9.40815 11.3278 9.40815 11.5086 9.43737Z" fill="#BE5F00"/>
-</svg>
diff --git a/damus/Assets.xcassets/Hashtags/coffee-hashtag.imageset/coffee.svg b/damus/Assets.xcassets/Hashtags/coffee-hashtag.imageset/coffee.svg
new file mode 100644
index 00000000..ad25418b
--- /dev/null
+++ b/damus/Assets.xcassets/Hashtags/coffee-hashtag.imageset/coffee.svg
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Svg Vector Icons : http://www.onlinewebfonts.com/icon -->
+
+<svg
+   version="1.1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 13.999999 18"
+   enable-background="new 0 0 1000 1000"
+   xml:space="preserve"
+   id="svg4"
+   sodipodi:docname="coffee.svg"
+   width="14"
+   height="18"
+   inkscape:version="1.3-dev (77bc73e, 2022-05-18)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+   id="defs4" /><sodipodi:namedview
+   id="namedview4"
+   pagecolor="#ffffff"
+   bordercolor="#000000"
+   borderopacity="0.25"
+   inkscape:showpageshadow="2"
+   inkscape:pageopacity="0.0"
+   inkscape:pagecheckerboard="0"
+   inkscape:deskcolor="#d1d1d1"
+   showgrid="false"
+   inkscape:zoom="10.680141"
+   inkscape:cx="-17.181421"
+   inkscape:cy="4.07298"
+   inkscape:window-width="1368"
+   inkscape:window-height="947"
+   inkscape:window-x="1764"
+   inkscape:window-y="58"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="svg4" />
+<metadata
+   id="metadata1"> Svg Vector Icons : http://www.onlinewebfonts.com/icon </metadata>
+<g
+   id="g4"
+   transform="matrix(0.01779387,0,0,0.01779387,-1.8340539,0.04465199)"><g
+     transform="matrix(0.1,0,0,-0.1,0,511)"
+     id="g3"><path
+       d="m 4302.6,4870.6 c 149.5,-177.8 240.5,-319.3 347.6,-545.6 119.2,-254.6 169.7,-448.6 183.9,-699.2 22.2,-462.7 -137.4,-778 -539.5,-1060.9 -474.9,-335.4 -685,-739.6 -687,-1315.5 0,-260.7 38.4,-501.1 115.2,-739.6 50.5,-149.5 56.6,-159.6 60.6,-97 18.2,234.4 56.6,476.9 101,626.4 121.2,422.3 305.1,622.4 885.1,959.8 424.3,248.5 575.9,487 575.9,905.3 -2,501.1 -359.7,1295.3 -798.2,1768.1 -82.8,88.9 -198,202.1 -256.6,250.6 l -105.1,86.9 z"
+       id="path1"
+       style="fill:#be5f00;fill-opacity:1" /><path
+       d="m 5981.8,3577.3 c 272.8,-369.8 309.2,-846.7 90.9,-1192.2 -147.5,-232.4 -373.8,-406.2 -822.4,-638.5 -592,-303.1 -854.7,-683 -854.7,-1232.6 0,-276.8 14.2,-343.5 72.7,-343.5 38.4,0 48.5,16.2 68.7,111.1 34.4,167.7 135.4,349.6 262.7,476.9 147.5,145.5 349.6,244.5 838.6,412.2 503.2,171.8 725.4,280.9 846.7,416.3 210.1,232.4 276.8,535.5 202.1,903.2 -76.8,373.8 -216.2,618.3 -537.5,943.7 -155.7,155.6 -214.3,206.1 -167.8,143.4 z"
+       id="path2"
+       style="fill:#be5f00;fill-opacity:1" /><path
+       d="M 2748.7,592.8 C 2158.7,507.9 1732.3,352.3 1542.4,156.3 1415.1,25 1409,-11.4 1427.2,-445.8 c 34.3,-832.5 181.9,-1729.7 462.7,-2829 153.6,-600.1 309.2,-1113.4 351.6,-1159.9 56.6,-62.6 272.8,-157.6 476.9,-210.1 668.8,-173.8 2172.2,-196 2960.3,-42.4 357.7,68.7 604.2,163.7 731.5,278.9 68.7,60.6 84.9,92.9 107.1,198 64.7,335.4 56.6,319.3 131.3,319.3 107.1,0 438.5,92.9 602.2,167.7 220.3,103.1 363.7,202.1 567.8,398.1 470.8,452.6 759.8,1149.8 761.8,1840.8 0,398.1 -72.7,614.3 -274.8,818.4 -220.3,222.3 -466.8,309.2 -937.6,325.4 l -309.2,12.1 14.2,218.2 14.2,218.2 -56.6,52.5 C 6866.9,314 6274.9,499.9 5696.9,582.7 L 5614,594.8 5533.2,457.4 5450.4,322 5565.6,305.8 c 588,-84.9 868.9,-159.6 978,-256.6 56.6,-50.5 60.6,-62.6 44.5,-113.2 -80.8,-226.3 -1000.2,-371.8 -2329.8,-371.8 -1220.5,0 -2097.5,123.3 -2295.5,321.3 -52.5,54.5 -56.6,66.7 -36.4,111.1 48.5,107.1 341.5,206.1 822.4,276.8 143.5,20.2 301.1,38.4 349.6,38.4 46.5,0 84.9,4 84.9,8.1 0,8.1 -175.8,295 -185.9,305.1 -4.2,2.1 -115.3,-12 -248.7,-32.2 z m 4797.1,-1614.5 c 153.6,-26.3 272.8,-82.8 317.2,-153.6 56.6,-84.9 60.6,-400.1 8.1,-652.7 -111.1,-545.6 -404.1,-996.2 -788.1,-1220.5 -139.4,-80.8 -333.4,-151.5 -355.6,-129.3 -8.1,8.1 18.2,216.2 58.6,462.7 78.8,482.9 159.6,1073 202.1,1450.8 l 24.2,232.4 70.7,12.1 c 115.3,20.3 325.4,20.3 462.8,-1.9 z"
+       id="path3"
+       style="fill:#be5f00;fill-opacity:1" /></g></g>
+</svg>
diff --git a/damus/Assets.xcassets/Hashtags/damus-hashtag.imageset/Contents.json b/damus/Assets.xcassets/Hashtags/damus-hashtag.imageset/Contents.json
deleted file mode 100644
index 96403fcb..00000000
--- a/damus/Assets.xcassets/Hashtags/damus-hashtag.imageset/Contents.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "damus-hashtag.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/damus/Assets.xcassets/Hashtags/damus-hashtag.imageset/damus-hashtag.svg b/damus/Assets.xcassets/Hashtags/damus-hashtag.imageset/damus-hashtag.svg
deleted file mode 100644
index c1173658..00000000
--- a/damus/Assets.xcassets/Hashtags/damus-hashtag.imageset/damus-hashtag.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2.69941 3.18358C2.72952 4.71436 2.83304 7.71017 3.19121 10.1514C3.36921 11.3646 3.61467 12.4759 3.96242 13.2015C4.13384 13.5592 4.35399 13.8753 4.65049 14.0363C4.80584 14.1206 4.97868 14.1602 5.16226 14.1414C5.34251 14.123 5.51416 14.0504 5.67541 13.9406L5.68044 13.9372C6.92834 13.088 8.81481 11.8042 10.3905 10.4541C11.1791 9.77855 11.9001 9.07778 12.4265 8.39848C12.9451 7.72921 13.3123 7.03354 13.3123 6.37527C13.3123 5.736 12.9695 5.2071 12.4459 4.77325C11.9257 4.34218 11.1985 3.97902 10.3507 3.66051C8.65338 3.02289 6.37778 2.53058 4.05878 2.06089C3.35321 1.91798 2.68501 2.45145 2.69941 3.18358Z" fill="url(#paint0_linear_1550_39090)" stroke="white" stroke-width="0.625017" stroke-linejoin="round"/>
-<path d="M3.01514 4.49944L6.07201 6.0494L5.25397 2.82031L3.01514 4.49944Z" fill="white" fill-opacity="0.12" stroke="white" stroke-width="0.136847"/>
-<path d="M6.03443 6.02063L5.72999 9.00415L3.20312 6.47729L6.03443 6.02063Z" fill="white" fill-opacity="0.56" stroke="white" stroke-width="0.136847"/>
-<path d="M6.00391 6.03586L7.998 3.49377L9.76376 6.18808L6.00391 6.03586Z" fill="white" fill-opacity="0.32" stroke="white" stroke-width="0.136847"/>
-<path d="M6.03467 6.05109L9.94674 9.82616L9.74885 6.18808L6.03467 6.05109Z" fill="white" fill-opacity="0.48" stroke="white" stroke-width="0.136847"/>
-<path d="M5.71484 8.98895L9.9618 9.8566L6.04973 6.05109L5.71484 8.98895Z" fill="white" fill-opacity="0.16" stroke="white" stroke-width="0.136847"/>
-<path d="M5.71503 8.98895L3.7666 11.2418L8.044 11.7594L5.71503 8.98895Z" fill="white" fill-opacity="0.32" stroke="white" stroke-width="0.136847"/>
-<path d="M9.76367 6.18806L11.8034 7.8016L10.9053 4.63541L9.76367 6.18806Z" fill="white" fill-opacity="0.24" stroke="white" stroke-width="0.136847"/>
-<path d="M5.72098 9.12593C5.79665 9.12593 5.85798 9.06459 5.85798 8.98893C5.85798 8.91327 5.79665 8.85193 5.72098 8.85193C5.64532 8.85193 5.58398 8.91327 5.58398 8.98893C5.58398 9.06459 5.64532 9.12593 5.72098 9.12593Z" fill="white"/>
-<path d="M6.04032 6.17286C6.11598 6.17286 6.17732 6.11153 6.17732 6.03586C6.17732 5.9602 6.11598 5.89886 6.04032 5.89886C5.96466 5.89886 5.90332 5.9602 5.90332 6.03586C5.90332 6.11153 5.96466 6.17286 6.04032 6.17286Z" fill="white"/>
-<path d="M9.76053 6.31929C9.8362 6.31929 9.89753 6.25795 9.89753 6.18229C9.89753 6.10662 9.8362 6.04529 9.76053 6.04529C9.68487 6.04529 9.62354 6.10662 9.62354 6.18229C9.62354 6.25795 9.68487 6.31929 9.76053 6.31929Z" fill="white"/>
-<defs>
-<linearGradient id="paint0_linear_1550_39090" x1="2.63227" y1="7.95918" x2="13.367" y2="7.95918" gradientUnits="userSpaceOnUse">
-<stop stop-color="#0DE8FF" stop-opacity="0.780822"/>
-<stop offset="1" stop-color="#D600FC" stop-opacity="0.954338"/>
-</linearGradient>
-</defs>
-</svg>
diff --git a/damus/Assets.xcassets/Hashtags/followfriday-hashtag.imageset/Contents.json b/damus/Assets.xcassets/Hashtags/followfriday-hashtag.imageset/Contents.json
deleted file mode 100644
index 5e4b3e7c..00000000
--- a/damus/Assets.xcassets/Hashtags/followfriday-hashtag.imageset/Contents.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "followfriday-hashtag.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/damus/Assets.xcassets/Hashtags/followfriday-hashtag.imageset/followfriday-hashtag.svg b/damus/Assets.xcassets/Hashtags/followfriday-hashtag.imageset/followfriday-hashtag.svg
deleted file mode 100644
index 252e2d2f..00000000
--- a/damus/Assets.xcassets/Hashtags/followfriday-hashtag.imageset/followfriday-hashtag.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3.6665 4.33333C3.6665 2.67647 5.00965 1.33333 6.6665 1.33333C8.32336 1.33333 9.6665 2.67647 9.6665 4.33333C9.6665 5.99018 8.32336 7.33333 6.6665 7.33333C5.00965 7.33333 3.6665 5.99018 3.6665 4.33333Z" fill="#395EE2"/>
-<path d="M1.13046 12.4643C1.70171 9.92243 3.8004 8 6.66653 8C9.53266 8 11.6314 9.92243 12.2026 12.4643C12.3958 13.3239 11.691 14 10.9343 14H2.39881C1.64204 14 0.937274 13.3239 1.13046 12.4643Z" fill="#395EE2"/>
-<path d="M13.3332 5.33333C13.3332 4.96514 13.0347 4.66666 12.6665 4.66666C12.2983 4.66666 11.9998 4.96514 11.9998 5.33333V6.66666H10.6665C10.2983 6.66666 9.99984 6.96514 9.99984 7.33333C9.99984 7.70152 10.2983 8 10.6665 8H11.9998V9.33333C11.9998 9.70152 12.2983 10 12.6665 10C13.0347 10 13.3332 9.70152 13.3332 9.33333V8H14.6665C15.0347 8 15.3332 7.70152 15.3332 7.33333C15.3332 6.96514 15.0347 6.66666 14.6665 6.66666H13.3332V5.33333Z" fill="#395EE2"/>
-</svg>
diff --git a/damus/Assets.xcassets/Hashtags/growstr-hashtag.imageset/Contents.json b/damus/Assets.xcassets/Hashtags/growstr-hashtag.imageset/Contents.json
deleted file mode 100644
index 9d315084..00000000
--- a/damus/Assets.xcassets/Hashtags/growstr-hashtag.imageset/Contents.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "growstr-hashtag.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/damus/Assets.xcassets/Hashtags/growstr-hashtag.imageset/growstr-hashtag.svg b/damus/Assets.xcassets/Hashtags/growstr-hashtag.imageset/growstr-hashtag.svg
deleted file mode 100644
index 819b1bf1..00000000
--- a/damus/Assets.xcassets/Hashtags/growstr-hashtag.imageset/growstr-hashtag.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2.66667 2C2.29848 2 2 2.29848 2 2.66667V3.33333C2 6.27885 4.38781 8.66667 7.33333 8.66667V13.3333C7.33333 13.7015 7.63181 14 8 14C8.36819 14 8.66667 13.7015 8.66667 13.3333V10.6667C11.6122 10.6667 14 8.27885 14 5.33333V4.66667C14 4.29848 13.7015 4 13.3333 4H12.6667C10.9805 4 9.47705 4.78251 8.49972 6.0042C7.90913 3.70177 5.81996 2 3.33333 2H2.66667Z" fill="#04AB5A"/>
-</svg>
diff --git a/damus/Assets.xcassets/Hashtags/happybirthday-hashtag.imageset/Contents.json b/damus/Assets.xcassets/Hashtags/happybirthday-hashtag.imageset/Contents.json
deleted file mode 100644
index fa206bb1..00000000
--- a/damus/Assets.xcassets/Hashtags/happybirthday-hashtag.imageset/Contents.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "happybirthday-hashtag.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/damus/Assets.xcassets/Hashtags/happybirthday-hashtag.imageset/happybirthday-hashtag.svg b/damus/Assets.xcassets/Hashtags/happybirthday-hashtag.imageset/happybirthday-hashtag.svg
deleted file mode 100644
index 406fe371..00000000
--- a/damus/Assets.xcassets/Hashtags/happybirthday-hashtag.imageset/happybirthday-hashtag.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13.1429 11.5231C12.4472 11.5231 11.7969 11.1092 11.4286 10.8202C11.0603 11.1089 10.4099 11.5231 9.71429 11.5231C9.01866 11.5231 8.3683 11.1092 8 10.8202C7.6317 11.1089 6.98134 11.5231 6.28571 11.5231C5.59009 11.5231 4.93973 11.1092 4.57143 10.8202C4.20312 11.1089 3.55277 11.5231 2.85714 11.5231C2.55527 11.5231 2.26545 11.4409 2 11.3286V13.6326C2 14.1229 2.38384 14.5 2.85714 14.5H13.1429C13.6162 14.5 14 14.1222 14 13.6562V11.3523C13.7348 11.4651 13.4455 11.5231 13.1429 11.5231ZM8.85714 5.21875C8.85714 4.98577 8.66525 4.79688 8.42857 4.79688H7.57143C7.33571 4.79688 7.14286 4.98672 7.14286 5.21875V6.90625H8.85714V5.21875ZM12.2857 5.21875C12.2857 4.98577 12.0938 4.79688 11.8571 4.79688H11C10.7643 4.79688 10.5714 4.98672 10.5714 5.21875V6.90625L12.2616 6.90544L12.2857 5.21875ZM5.42857 5.21875C5.42857 4.98577 5.23668 4.79688 5 4.79688H4.14286C3.90607 4.79688 3.71429 4.98672 3.71429 5.21875V6.90546L5.42857 6.90625V5.21875Z" fill="#CC43C5"/>
-<path opacity="0.4" d="M12.2616 6.88252H3.71429C2.76741 6.88252 2 7.63794 2 8.54629V10.3577C2.26288 10.5186 2.57295 10.6565 2.85714 10.6565C3.41 10.6565 4.06384 10.1362 4.26875 9.93584C4.43616 9.77186 4.70643 9.77186 4.87384 9.93584C5.05625 10.1837 5.73393 10.6794 6.28571 10.6794C6.8375 10.6794 7.49241 10.1592 7.69732 9.95878C7.86473 9.7948 8.135 9.7948 8.30241 9.95878C8.48482 10.1837 9.1625 10.6794 9.71429 10.6794C10.2661 10.6794 10.921 10.1592 11.1259 9.95878C11.2933 9.7948 11.5636 9.7948 11.731 9.95878C11.9134 10.1837 12.5911 10.6794 13.1429 10.6794C13.4271 10.6794 13.7372 10.5416 14 10.3807V8.57002C14 7.66035 13.2313 6.88252 12.2616 6.88252ZM4.57143 3.92939C5.16313 3.92939 5.64286 3.45795 5.64286 2.8755C5.64286 2.29305 4.57143 1 4.57143 1C4.57143 1 3.5 2.31599 3.5 2.89844C3.5 3.48089 3.97973 3.92939 4.57143 3.92939ZM8 3.92939C8.5917 3.92939 9.07143 3.45795 9.07143 2.8755C9.07143 2.29305 8 1 8 1C8 1 6.92857 2.31599 6.92857 2.89844C6.92857 3.48089 7.40804 3.92939 8 3.92939ZM11.4286 3.92939C12.0203 3.92939 12.5 3.45795 12.5 2.8755C12.5 2.29305 11.4286 1 11.4286 1C11.4286 1 10.3571 2.31599 10.3571 2.89844C10.3571 3.48089 10.8366 3.92939 11.4286 3.92939Z" fill="#CC43C5"/>
-</svg>
diff --git a/damus/Assets.xcassets/Hashtags/introductions-hashtag.imageset/Contents.json b/damus/Assets.xcassets/Hashtags/introductions-hashtag.imageset/Contents.json
deleted file mode 100644
index 3e9f4083..00000000
--- a/damus/Assets.xcassets/Hashtags/introductions-hashtag.imageset/Contents.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "introductions-hashtag.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/damus/Assets.xcassets/Hashtags/introductions-hashtag.imageset/introductions-hashtag.svg b/damus/Assets.xcassets/Hashtags/introductions-hashtag.imageset/introductions-hashtag.svg
deleted file mode 100644
index 0e70fb0a..00000000
--- a/damus/Assets.xcassets/Hashtags/introductions-hashtag.imageset/introductions-hashtag.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10.254 3.90973L10.2259 3.71061C10.1556 3.21632 9.76671 2.82744 9.27242 2.75717L9.07329 2.72905C8.86949 2.70094 8.72659 2.50885 8.7547 2.30504C8.78281 2.10123 8.97256 1.95599 9.17871 1.98645L9.37783 2.01456C10.2024 2.13169 10.8513 2.78059 10.9685 3.60519L10.9966 3.80431C11.0247 4.00812 10.8841 4.20022 10.678 4.22833C10.4718 4.25644 10.2821 4.11588 10.254 3.90973ZM6.34649 3.63565C6.05366 3.34282 6.05366 2.86727 6.34649 2.57444C6.63932 2.28161 7.11487 2.28161 7.4077 2.57444L11.9055 7.07226C11.9828 7.14957 12.1257 7.09803 12.1257 6.98558V5.16537C12.1257 4.64765 12.545 4.22833 13.0628 4.22833C13.5805 4.22833 13.9998 4.64765 13.9998 5.16537V9.29774C13.9998 10.708 13.3462 12.0363 12.2311 12.8983C11.0387 13.819 9.52308 14.0626 8.16436 13.6644C7.49906 13.4981 6.86889 13.1537 6.34649 12.6313L6.2317 12.5165L3.72276 10.0076L2.97313 9.25792C2.6803 8.96509 2.6803 8.48954 2.97313 8.19671C3.26595 7.90389 3.7415 7.90389 4.03433 8.19671L4.78163 8.94401L4.78397 8.94635L5.87563 10.0404C5.99744 10.1622 6.19422 10.1622 6.31369 10.0404C6.43317 9.91854 6.43551 9.72176 6.31369 9.60228L3.34795 6.63419C3.05512 6.34136 3.05512 5.86581 3.34795 5.57299C3.64077 5.28016 4.11632 5.28016 4.40915 5.57299L7.3749 8.54108C7.49672 8.6629 7.69349 8.6629 7.81297 8.54108C7.93244 8.41926 7.93478 8.22248 7.81297 8.10301L4.4724 4.7601C4.17957 4.46727 4.17957 3.99172 4.4724 3.6989C4.76523 3.40607 5.24078 3.40607 5.5336 3.6989L8.87417 7.04181C8.99599 7.16362 9.19277 7.16362 9.31224 7.04181C9.43171 6.91999 9.43406 6.72321 9.31224 6.60374L6.34649 3.63565ZM2.32422 10.2324C2.52803 10.2043 2.72013 10.3449 2.74824 10.551L2.77635 10.7502C2.84663 11.2445 3.2355 11.6333 3.72979 11.7036L3.92891 11.7317C4.13272 11.7622 4.27562 11.9519 4.24751 12.1557C4.2194 12.3595 4.0273 12.5024 3.8235 12.4743L3.62437 12.4462C2.79977 12.3291 2.15087 11.6802 2.03374 10.8556L2.00797 10.6565C1.97986 10.4527 2.12042 10.2606 2.32657 10.2324H2.32422Z" fill="#9B59EE"/>
-</svg>
diff --git a/damus/Assets.xcassets/Hashtags/nostr-hashtag.imageset/Contents.json b/damus/Assets.xcassets/Hashtags/nostr-hashtag.imageset/Contents.json
index 7c3c0282..f63c1f1a 100644
--- a/damus/Assets.xcassets/Hashtags/nostr-hashtag.imageset/Contents.json
+++ b/damus/Assets.xcassets/Hashtags/nostr-hashtag.imageset/Contents.json
@@ -6,10 +6,12 @@
       "scale" : "1x"
     },
     {
+      "filename" : "nostr-hashtag.svg",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
+      "filename" : "nostr-hashtag.svg",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/damus/Assets.xcassets/Hashtags/nostr-hashtag.imageset/nostr-hashtag.svg b/damus/Assets.xcassets/Hashtags/nostr-hashtag.imageset/nostr-hashtag.svg
index 3674e4e3..079e981e 100644
--- a/damus/Assets.xcassets/Hashtags/nostr-hashtag.imageset/nostr-hashtag.svg
+++ b/damus/Assets.xcassets/Hashtags/nostr-hashtag.imageset/nostr-hashtag.svg
@@ -1,3 +1,51 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.8324 1.29357C12.7855 1.31559 12.7032 1.36154 12.6505 1.39505C12.528 1.47259 12.4878 1.49078 12.438 1.49078C12.4026 1.49078 12.3969 1.49366 12.3969 1.51184C12.3969 1.52238 12.4083 1.54631 12.4217 1.5645L12.4466 1.59705L12.4275 1.63247C12.3049 1.86989 12.2638 1.97616 12.2245 2.15614C12.1709 2.40697 12.1834 2.77364 12.259 3.15658C12.3049 3.39017 12.3586 3.58834 12.483 3.98469C12.6343 4.46624 12.7511 4.88651 12.7894 5.08086C12.8152 5.21488 12.8468 5.50975 12.8468 5.61602C12.8468 5.77302 12.8095 5.96641 12.7587 6.07363C12.7042 6.19138 12.5902 6.28616 12.4849 6.30244C12.438 6.3101 12.4371 6.32446 12.4801 6.33882C12.4974 6.34456 12.5127 6.35222 12.5165 6.35605C12.529 6.36849 12.4926 6.41923 12.4237 6.48433C12.3078 6.59443 12.168 6.65091 12.0101 6.65091C11.8186 6.65091 11.697 6.56762 11.3093 6.16554C11.0862 5.93577 10.7914 5.6591 10.7311 5.62272C10.7014 5.60548 10.7004 5.60548 10.7052 5.62272C10.7081 5.63325 10.7138 5.65718 10.7177 5.67633C10.7253 5.72324 10.7129 5.72324 10.6554 5.67537C10.5836 5.61602 10.4946 5.5624 10.4161 5.53177C10.2878 5.48294 10.2112 5.47146 9.9556 5.46475L9.72105 5.45901L9.65882 5.41976C9.56309 5.35944 9.53915 5.35466 9.3764 5.35657C9.19833 5.35944 9.12558 5.34987 8.91304 5.2953C8.64594 5.22733 8.58659 5.23116 8.16631 5.3537C7.84655 5.44656 7.74316 5.46667 7.43776 5.4973C7.24629 5.51549 7.08833 5.51549 6.96292 5.49635C6.90739 5.48773 6.86048 5.48294 6.85665 5.48582C6.85378 5.48965 6.86239 5.50688 6.87675 5.52507L6.9026 5.55857L6.88058 5.56336C6.86814 5.56623 6.82219 5.57102 6.7791 5.57389C6.67092 5.58251 6.6288 5.59878 6.56944 5.65718C6.52158 5.70409 6.51775 5.70601 6.43541 5.71845C6.37797 5.72803 6.33202 5.74239 6.28894 5.76441C5.9979 5.91471 5.97206 5.92333 5.83803 5.92333C5.79207 5.92333 5.72314 5.91662 5.68485 5.90897C5.64656 5.90035 5.61401 5.89652 5.61018 5.89939C5.60731 5.90226 5.61018 5.91854 5.61688 5.93481C5.62262 5.95205 5.62645 5.96736 5.62358 5.96928C5.62167 5.97215 5.6006 5.96928 5.57858 5.96258C5.55561 5.95683 5.47998 5.94726 5.41009 5.94056C5.25404 5.9262 5.07502 5.9396 4.91131 5.97885L4.80217 6.00374L4.851 6.02576C4.90174 6.04778 4.92376 6.07363 4.91418 6.09948C4.91131 6.10714 4.86536 6.13586 4.81366 6.16266C4.57336 6.28616 4.32062 6.53029 4.11766 6.83568C4.01236 6.9946 3.91853 7.14682 3.90992 7.17554C3.90417 7.19565 3.90513 7.1966 3.94247 7.19086C3.97693 7.18512 3.98172 7.18703 3.98172 7.20235C3.98172 7.21288 3.96736 7.24543 3.94917 7.27511C3.90513 7.34691 3.87641 7.42924 3.82759 7.6188C3.75291 7.9127 3.69643 8.04386 3.59495 8.16353C3.55857 8.20565 3.54612 8.22767 3.55378 8.23246C3.56048 8.23629 3.59208 8.24012 3.62558 8.24012C3.66101 8.24012 3.68494 8.24395 3.68494 8.25065C3.68494 8.25639 3.67345 8.27554 3.65909 8.29373C3.62846 8.3349 3.63612 8.34447 3.70505 8.35117C3.80844 8.3617 3.80365 8.35692 3.79599 8.42967C3.79216 8.4651 3.78546 8.55222 3.78163 8.62306C3.77685 8.6939 3.76632 8.78007 3.75674 8.81453C3.73568 8.89591 3.68494 8.99643 3.62654 9.07206C3.60069 9.10557 3.57963 9.1362 3.57963 9.14099C3.57963 9.14482 3.59591 9.15152 3.61601 9.15439C3.63516 9.15726 3.66292 9.16205 3.67728 9.16396C3.73855 9.17354 3.95013 9.13429 4.06788 9.09121C4.16457 9.05578 4.30626 8.9792 4.40104 8.91122C4.45274 8.87484 4.50635 8.83942 4.52167 8.83463C4.53603 8.82889 4.58868 8.8241 4.63942 8.8241C4.89503 8.8241 5.1966 8.73028 5.37275 8.5953C5.4053 8.57041 5.44168 8.54456 5.45221 8.53881C5.47615 8.52637 5.48189 8.53115 5.50774 8.58285C5.52784 8.62115 5.54412 8.61349 5.56231 8.55796C5.59103 8.46893 5.65517 8.36649 5.6973 8.34447C5.72123 8.33107 5.73368 8.3416 5.79112 8.4268C5.81697 8.46318 5.861 8.51775 5.89068 8.54647C5.92036 8.57519 5.94429 8.60678 5.94429 8.61827C5.94429 8.6288 5.92515 8.67571 5.90121 8.72358C5.861 8.804 5.82367 8.91697 5.8342 8.9275C5.83707 8.93037 5.86005 8.91218 5.88589 8.88825C5.93376 8.84325 5.96344 8.83176 5.96344 8.8557C5.96344 8.86336 5.95387 8.90261 5.94334 8.94473C5.91844 9.03759 5.9127 9.208 5.93376 9.24438L5.94717 9.26832L5.98163 9.22906C6.02184 9.18311 6.0946 9.14482 6.22193 9.10365C6.31958 9.07206 6.39904 9.05866 6.55221 9.04908C6.60487 9.04525 6.70443 9.03664 6.7724 9.02898C7.05195 8.99643 7.04525 8.99547 7.12471 9.08259C7.18789 9.15152 7.24151 9.19268 7.28746 9.20705C7.30661 9.21279 7.32288 9.22141 7.32288 9.22523C7.32288 9.23672 7.30182 9.25874 7.25108 9.29895C7.22523 9.31906 7.10652 9.42628 6.98781 9.53637C6.58189 9.91357 6.54551 9.93368 6.16066 10.0016C6.09843 10.0131 6.02184 10.0294 5.9912 10.039C5.80835 10.0964 5.65804 10.2429 5.46083 10.5569C5.36222 10.7149 5.30574 10.7876 5.18128 10.9236C5.01279 11.1055 4.86344 11.2424 4.43646 11.6043C3.96066 12.0083 3.71845 12.3098 3.57963 12.6698C3.51836 12.8278 3.48007 12.8641 3.37284 12.8641C3.33646 12.8641 3.28285 12.8574 3.25413 12.8498C3.18329 12.8306 3.02054 12.8306 2.96597 12.8498C2.94012 12.8593 2.90757 12.8814 2.88268 12.9091C2.84343 12.9522 2.84151 12.9532 2.79747 12.9465C2.77354 12.9436 2.73333 12.9292 2.7094 12.9149C2.43751 12.7579 2.35326 12.7282 2.16754 12.7272C2.04691 12.7263 2 12.7531 2 12.823C2 12.8651 2.02968 12.9043 2.1168 12.9723C2.1953 13.0355 2.24317 13.0901 2.449 13.3591C2.50452 13.4318 2.52559 13.451 2.57154 13.474C2.62419 13.4989 2.63377 13.5008 2.74674 13.4998C2.81279 13.4998 2.89034 13.4941 2.91906 13.4864C2.94778 13.4797 3.04543 13.4558 3.13446 13.4328C3.40348 13.3639 3.42933 13.36 3.62367 13.3524C3.79695 13.3466 3.81035 13.3447 3.86014 13.3198C3.9329 13.2844 3.99129 13.2174 4.08128 13.0642C4.30148 12.6889 4.35605 12.6037 4.45848 12.4649C4.66814 12.1844 4.90748 11.9087 5.18224 11.633C5.45413 11.3611 5.53455 11.3056 5.7959 11.2127C5.95291 11.1562 6.07832 11.0949 6.18842 11.0222C6.28511 10.9571 6.43446 10.8125 6.47084 10.7484C6.48424 10.7254 6.52445 10.6756 6.55987 10.6373C6.65561 10.5359 6.72932 10.5014 6.97823 10.443C7.1362 10.4047 7.19747 10.3836 7.3516 10.3157C7.53446 10.2343 7.56222 10.2257 7.79198 10.1788C7.90495 10.1558 8.02079 10.1318 8.0476 10.1251C8.07536 10.1184 8.10121 10.1156 8.10408 10.1194C8.10791 10.1223 8.11844 10.1673 8.12897 10.219C8.14237 10.2889 8.14908 10.3712 8.15291 10.5359C8.15865 10.7895 8.15003 10.9044 8.10791 11.115C8.06004 11.3515 8.00739 11.4913 7.89538 11.6818C7.83889 11.7756 7.82453 11.8417 7.83985 11.9269C7.86187 12.0475 7.89825 12.0963 8.00643 12.149C8.09738 12.194 8.16822 12.1988 8.34821 12.1758C8.46788 12.1605 8.5818 12.1547 8.83167 12.1509C9.47022 12.1394 9.79955 12.1844 10.5539 12.3816C10.8191 12.4515 10.8488 12.464 10.9139 12.5358C10.9828 12.6114 11.0221 12.6985 11.0814 12.9072C11.0996 12.9704 11.1217 13.0317 11.1293 13.0441C11.1695 13.1044 11.2777 13.1513 11.3792 13.1513C11.4835 13.1513 11.4979 13.0968 11.4309 12.9541C11.3849 12.8565 11.3801 12.8115 11.4146 12.7962C11.4443 12.7818 11.4845 12.8009 11.5123 12.8421C11.5237 12.8593 11.5553 12.9254 11.5841 12.9886C11.6386 13.115 11.6855 13.1772 11.7497 13.2117C11.7832 13.2289 11.8033 13.2318 11.8799 13.2308C11.9498 13.2289 11.9852 13.2337 12.0321 13.249C12.1173 13.2768 12.3509 13.2796 12.4179 13.2538C12.5271 13.2117 12.5519 13.115 12.4754 13.0326C12.4533 13.0096 12.3681 12.9637 12.215 12.8957C12.147 12.8651 12.0244 12.777 11.9756 12.7244C11.9076 12.6497 11.8693 12.5903 11.7612 12.396C11.6348 12.1701 11.5965 12.1117 11.5103 12.0217C11.4548 11.9633 11.4204 11.9365 11.3687 11.9116C11.2605 11.858 11.2873 11.8608 10.5396 11.8302C10.3261 11.8216 9.94986 11.7957 9.91156 11.7871C9.90103 11.7852 9.82923 11.7756 9.7536 11.768C9.58223 11.7488 9.18397 11.677 9.07196 11.6435C8.93315 11.6033 8.76657 11.5104 8.71679 11.4444C8.68615 11.4042 8.66605 11.3467 8.65264 11.2654C8.63158 11.1275 8.6986 10.9628 8.90251 10.6526C9.02218 10.4708 9.08728 10.3492 9.1227 10.2429C9.15238 10.152 9.18015 9.97293 9.18015 9.86762C9.18015 9.79486 9.18397 9.76997 9.19546 9.75848C9.21461 9.73933 9.2194 9.74125 9.37927 9.85613C9.44916 9.90591 9.54011 9.96527 9.58032 9.98729C9.65978 10.0323 9.70669 10.0658 9.70669 10.0782C9.70669 10.0821 9.69329 10.0945 9.67605 10.105L9.64542 10.1251L9.67318 10.1357C9.77658 10.1749 9.96517 10.1855 10.35 10.173C10.5281 10.1673 10.6803 10.1644 10.688 10.1682C10.6956 10.1711 10.7023 10.1826 10.7023 10.1941C10.7023 10.2132 10.7052 10.2142 10.754 10.2084C10.8593 10.196 11.0087 10.1309 11.1619 10.0294C11.2471 9.97388 11.2566 9.9691 11.3246 9.96335C11.4787 9.94995 11.5438 9.88868 11.8253 9.48946C11.9096 9.37075 11.9622 9.31235 11.9871 9.31235C11.989 9.31235 11.989 9.3382 11.9871 9.36979C11.9852 9.40139 11.9871 9.42724 11.9919 9.42724C12.0139 9.42724 12.1259 9.28842 12.1948 9.17545C12.3069 8.99164 12.3528 8.87197 12.4543 8.49382C12.5558 8.11662 12.5606 8.1013 12.5835 8.1013C12.5979 8.1013 12.6046 8.11088 12.6113 8.1396C12.6237 8.19034 12.6228 8.18938 12.6515 8.16257C12.6898 8.12811 12.7501 8.03525 12.7989 7.93855C12.8229 7.89069 12.8468 7.85239 12.8516 7.85239C12.8573 7.85239 12.8621 7.86867 12.864 7.88781C12.866 7.90792 12.8707 7.92419 12.8755 7.92419C12.8937 7.92419 12.9646 7.8275 13.0086 7.7423C13.0364 7.68868 13.0919 7.54508 13.1426 7.39478C13.1905 7.25405 13.2518 7.09034 13.2786 7.03098C13.4049 6.75527 13.4691 6.52742 13.5141 6.20096C13.538 6.01906 13.538 5.4772 13.5141 5.26754C13.4921 5.08086 13.4633 4.9047 13.4394 4.80322C13.3954 4.6175 13.2939 4.31019 13.2163 4.12733C13.0919 3.83438 13.0076 3.58739 12.9674 3.39592C12.9215 3.17764 12.9215 2.84831 12.9684 2.65875C12.9981 2.53621 13.0469 2.46345 13.1273 2.42324C13.1886 2.39165 13.2403 2.34378 13.3063 2.25667C13.4212 2.1054 13.4825 2.06615 13.7879 1.94936C14.0272 1.85745 14.1201 1.80288 14.1201 1.75406C14.1201 1.7148 14.0799 1.69949 13.9535 1.68896C13.8463 1.68034 13.5849 1.62194 13.5332 1.59418C13.5237 1.58939 13.5074 1.56641 13.4978 1.54248C13.4758 1.49174 13.403 1.41132 13.3456 1.37399C13.292 1.34048 13.2767 1.33952 13.3073 1.37303C13.3303 1.39792 13.3293 1.39792 13.2948 1.37016C13.2747 1.35484 13.2546 1.3309 13.2499 1.31655C13.2412 1.29165 13.2364 1.28974 13.1924 1.28974C13.1445 1.28974 13.0957 1.27442 13.0957 1.2591C13.0957 1.25527 13.0555 1.25144 13.0076 1.2524C12.9234 1.2524 12.9138 1.25527 12.8324 1.29357ZM13.359 1.4142C13.3686 1.42473 13.3743 1.43334 13.3714 1.43334C13.3686 1.43334 13.359 1.42473 13.3494 1.4142C13.3398 1.40366 13.3341 1.39505 13.337 1.39505C13.3398 1.39505 13.3494 1.40366 13.359 1.4142Z" fill="#CC43C5"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="18pt"
+   height="18.199053pt"
+   viewBox="0 0 18 18.199053"
+   preserveAspectRatio="xMidYMid"
+   id="svg1"
+   sodipodi:docname="nostr-hashtag.svg"
+   inkscape:version="1.3-dev (77bc73e, 2022-05-18)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="pt"
+     showgrid="false"
+     inkscape:zoom="5.4017383"
+     inkscape:cx="50.354161"
+     inkscape:cy="-13.514168"
+     inkscape:window-width="1497"
+     inkscape:window-height="866"
+     inkscape:window-x="1747"
+     inkscape:window-y="96"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg1" />
+  <metadata
+     id="metadata1">
+Created by potrace 1.15, written by Peter Selinger 2001-2017
+</metadata>
+  <g
+     transform="matrix(0.00138509,0,0,-0.00138509,0.3,17.927982)"
+     fill="#000000"
+     stroke="none"
+     id="g1">
+    <path
+       d="m 11315,12756 c -49,-23 -135,-71 -190,-106 -128,-81 -170,-100 -222,-100 -37,0 -43,-3 -43,-22 0,-11 12,-36 26,-55 l 26,-34 -20,-37 c -128,-248 -171,-359 -212,-547 -56,-262 -43,-645 36,-1045 48,-244 104,-451 234,-865 158,-503 280,-942 320,-1145 27,-140 60,-448 60,-559 0,-164 -39,-366 -92,-478 -57,-123 -176,-222 -286,-239 -49,-8 -50,-23 -5,-38 18,-6 34,-14 38,-18 13,-13 -25,-66 -97,-134 -121,-115 -267,-174 -432,-174 -200,0 -327,87 -732,507 -233,240 -541,529 -604,567 -31,18 -32,18 -27,0 3,-11 9,-36 13,-56 8,-49 -5,-49 -65,1 -75,62 -168,118 -250,150 -134,51 -214,63 -481,70 l -245,6 -65,41 c -100,63 -125,68 -295,66 -186,-3 -262,7 -484,64 -279,71 -341,67 -780,-61 -334,-97 -442,-118 -761,-150 -200,-19 -365,-19 -496,1 -58,9 -107,14 -111,11 -3,-4 6,-22 21,-41 l 27,-35 -23,-5 c -13,-3 -61,-8 -106,-11 -113,-9 -157,-26 -219,-87 -50,-49 -54,-51 -140,-64 -60,-10 -108,-25 -153,-48 -304,-157 -331,-166 -471,-166 -48,0 -120,7 -160,15 -40,9 -74,13 -78,10 -3,-3 0,-20 7,-37 6,-18 10,-34 7,-36 -2,-3 -24,0 -47,7 -24,6 -103,16 -176,23 -163,15 -350,1 -521,-40 l -114,-26 51,-23 c 53,-23 76,-50 66,-77 -3,-8 -51,-38 -105,-66 -251,-129 -515,-384 -727,-703 -110,-166 -208,-325 -217,-355 -6,-21 -5,-22 34,-16 36,6 41,4 41,-12 0,-11 -15,-45 -34,-76 -46,-75 -76,-161 -127,-359 -78,-307 -137,-444 -243,-569 -38,-44 -51,-67 -43,-72 7,-4 40,-8 75,-8 37,0 62,-4 62,-11 0,-6 -12,-26 -27,-45 -32,-43 -24,-53 48,-60 108,-11 103,-6 95,-82 -4,-37 -11,-128 -15,-202 -5,-74 -16,-164 -26,-200 -22,-85 -75,-190 -136,-269 -27,-35 -49,-67 -49,-72 0,-4 17,-11 38,-14 20,-3 49,-8 64,-10 64,-10 285,31 408,76 101,37 249,117 348,188 54,38 110,75 126,80 15,6 70,11 123,11 267,0 582,98 766,239 34,26 72,53 83,59 25,13 31,8 58,-46 21,-40 38,-32 57,26 30,93 97,200 141,223 25,14 38,3 98,-86 27,-38 73,-95 104,-125 31,-30 56,-63 56,-75 0,-11 -20,-60 -45,-110 -42,-84 -81,-202 -70,-213 3,-3 27,16 54,41 50,47 81,59 81,34 0,-8 -10,-49 -21,-93 -26,-97 -32,-275 -10,-313 l 14,-25 36,41 c 42,48 118,88 251,131 102,33 185,47 345,57 55,4 159,13 230,21 292,34 285,35 368,-56 66,-72 122,-115 170,-130 20,-6 37,-15 37,-19 0,-12 -22,-35 -75,-77 -27,-21 -151,-133 -275,-248 -424,-394 -462,-415 -864,-486 -65,-12 -145,-29 -177,-39 -191,-60 -348,-213 -554,-541 -103,-165 -162,-241 -292,-383 -176,-190 -332,-333 -778,-711 -497,-422 -750,-737 -895,-1113 -64,-165 -104,-203 -216,-203 -38,0 -94,7 -124,15 -74,20 -244,20 -301,0 -27,-10 -61,-33 -87,-62 -41,-45 -43,-46 -89,-39 -25,3 -67,18 -92,33 C 457,781 369,812 175,813 49,814 0,786 0,713 0,669 31,628 122,557 204,491 254,434 469,153 527,77 549,57 597,33 652,7 662,5 780,6 c 69,0 150,6 180,14 30,7 132,32 225,56 281,72 308,76 511,84 181,6 195,8 247,34 76,37 137,107 231,267 230,392 287,481 394,626 219,293 469,581 756,869 284,284 368,342 641,439 164,59 295,123 410,199 101,68 257,219 295,286 14,24 56,76 93,116 100,106 177,142 437,203 165,40 229,62 390,133 191,85 220,94 460,143 118,24 239,49 267,56 29,7 56,10 59,6 4,-3 15,-50 26,-104 14,-73 21,-159 25,-331 6,-265 -3,-385 -47,-605 -50,-247 -105,-393 -222,-592 -59,-98 -74,-167 -58,-256 23,-126 61,-177 174,-232 95,-47 169,-52 357,-28 125,16 244,22 505,26 667,12 1011,-35 1799,-241 277,-73 308,-86 376,-161 72,-79 113,-170 175,-388 19,-66 42,-130 50,-143 42,-63 155,-112 261,-112 109,0 124,57 54,206 -48,102 -53,149 -17,165 31,15 73,-5 102,-48 12,-18 45,-87 75,-153 57,-132 106,-197 173,-233 35,-18 56,-21 136,-20 73,2 110,-3 159,-19 89,-29 333,-32 403,-5 114,44 140,145 60,231 -23,24 -112,72 -272,143 -71,32 -199,124 -250,179 -71,78 -111,140 -224,343 -132,236 -172,297 -262,391 -58,61 -94,89 -148,115 -113,56 -85,53 -866,85 -223,9 -616,36 -656,45 -11,2 -86,12 -165,20 -179,20 -595,95 -712,130 -145,42 -319,139 -371,208 -32,42 -53,102 -67,187 -22,144 48,316 261,640 125,190 193,317 230,428 31,95 60,282 60,392 0,76 4,102 16,114 20,20 25,18 192,-102 73,-52 168,-114 210,-137 83,-47 132,-82 132,-95 0,-4 -14,-17 -32,-28 l -32,-21 29,-11 c 108,-41 305,-52 707,-39 186,6 345,9 353,5 8,-3 15,-15 15,-27 0,-20 3,-21 54,-15 110,13 266,81 426,187 89,58 99,63 170,69 161,14 229,78 523,495 88,124 143,185 169,185 2,0 2,-27 0,-60 -2,-33 0,-60 5,-60 23,0 140,145 212,263 117,192 165,317 271,712 106,394 111,410 135,410 15,0 22,-10 29,-40 13,-53 12,-52 42,-24 40,36 103,133 154,234 25,50 50,90 55,90 6,0 11,-17 13,-37 2,-21 7,-38 12,-38 19,0 93,101 139,190 29,56 87,206 140,363 50,147 114,318 142,380 132,288 199,526 246,867 25,190 25,756 0,975 -23,195 -53,379 -78,485 -46,194 -152,515 -233,706 -130,306 -218,564 -260,764 -48,228 -48,572 1,770 31,128 82,204 166,246 64,33 118,83 187,174 120,158 184,199 503,321 250,96 347,153 347,204 0,41 -42,57 -174,68 -112,9 -385,70 -439,99 -10,5 -27,29 -37,54 -23,53 -99,137 -159,176 -56,35 -72,36 -40,1 24,-26 23,-26 -13,3 -21,16 -42,41 -47,56 -9,26 -14,28 -60,28 -50,0 -101,16 -101,32 0,4 -42,8 -92,7 -88,0 -98,-3 -183,-43 z m 550,-126 c 10,-11 16,-20 13,-20 -3,0 -13,9 -23,20 -10,11 -16,20 -13,20 3,0 13,-9 23,-20 z"
+       id="path1"
+       style="fill:#cc43c5;fill-opacity:1" />
+  </g>
 </svg>
diff --git a/damus/Assets.xcassets/Hashtags/plebchain-hashtag.imageset/Contents.json b/damus/Assets.xcassets/Hashtags/plebchain-hashtag.imageset/Contents.json
index e995c7a9..616b632e 100644
--- a/damus/Assets.xcassets/Hashtags/plebchain-hashtag.imageset/Contents.json
+++ b/damus/Assets.xcassets/Hashtags/plebchain-hashtag.imageset/Contents.json
@@ -1,15 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "plebchain-hashtag.svg",
+      "filename" : "plebchain.svg",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
+      "filename" : "plebchain.svg",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
+      "filename" : "plebchain.svg",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/damus/Assets.xcassets/Hashtags/plebchain-hashtag.imageset/plebchain-hashtag.svg b/damus/Assets.xcassets/Hashtags/plebchain-hashtag.imageset/plebchain-hashtag.svg
deleted file mode 100644
index c1c54f0a..00000000
--- a/damus/Assets.xcassets/Hashtags/plebchain-hashtag.imageset/plebchain-hashtag.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13.2835 9.88078C12.6457 8.53673 11.2357 7.78848 9.06529 6.97707C9.03885 6.96711 8.54261 6.80595 7.9661 6.61897C7.30185 6.40367 6.57849 6.4575 5.95407 6.76986L4.73291 7.38029L9.94422 13.9123H12.8221L13.291 12.8038C13.6867 11.8692 13.7184 10.7977 13.2835 9.88078Z" fill="#BF26ED"/>
-<path d="M11.9516 5.36204C12.0066 4.98838 12.0648 4.59326 12.0922 4.40876C12.2552 3.30397 11.4914 2.27602 10.3866 2.11299C9.28181 1.94996 8.25387 2.71377 8.09084 3.81856C8.06377 4.00275 8.00528 4.39787 7.95021 4.77184C7.76167 4.81073 7.60797 4.96194 7.57811 5.16324C7.53424 5.45756 7.63411 5.83962 7.82545 5.96811C7.89017 6.9217 8.57121 7.82053 9.52418 7.96116C10.4771 8.10179 11.3884 7.43754 11.726 6.54338C11.9463 6.47524 12.1522 6.13861 12.1952 5.84397C12.2241 5.64236 12.1208 5.45351 11.9516 5.36204Z" fill="#BF26ED"/>
-<path d="M14.996 11.8713C14.9699 11.5369 14.7888 11.2335 14.5399 11.0083L13.2727 9.85931C13.2727 9.85931 13.3879 10.0905 13.4946 10.7105L11.2228 9.65646C10.6369 9.38578 9.99879 9.24547 9.35321 9.24547H8.81497C8.23006 9.24547 7.694 8.87648 7.52568 8.31614C7.46159 8.10334 7.41305 7.84479 7.39345 7.5318C7.86916 7.13326 8.16255 6.50852 8.17904 5.86948C8.36478 5.73289 8.44847 5.3471 8.39216 5.05496C8.35358 4.8549 8.19366 4.71054 8.00387 4.67943C7.93294 4.30826 7.85827 3.91594 7.82342 3.733C7.61404 2.63598 6.55498 1.91635 5.45796 2.12542C4.36094 2.3345 3.64131 3.39387 3.85039 4.49089C3.88523 4.67383 3.96021 5.06616 4.03084 5.43733C3.86563 5.53595 3.77012 5.72916 3.80807 5.92921C3.86345 6.22167 4.08342 6.54959 4.30618 6.60808C4.39641 6.81964 4.51961 7.01565 4.66739 7.19019L4.73304 7.38029L4.34445 9.75602L3.06138 10.0351C2.89399 10.0749 2.7403 10.1421 2.60372 10.2308C2.08912 10.5646 1.89684 11.1999 2.04836 11.7733C2.08694 11.9189 2.78852 13.9123 2.78852 13.9123H10.9555L11.2277 12.7845L13.5484 13.188C14.338 13.329 15.0605 12.6893 14.996 11.8713Z" fill="#F59119"/>
-<path d="M9.25969 12.0017L7.75852 11.484C7.75852 11.484 8.40317 11.4103 8.39757 11.0668C8.39725 11.0422 8.38948 10.9065 8.19222 10.9261C8.13809 10.9314 7.70283 10.975 7.397 11.0055C7.19508 11.0257 6.99596 11.0655 6.80182 11.1246L6.69572 11.157L4.34519 9.75601C4.34519 9.75601 4.34519 9.75601 4.57822 9.24701C4.98548 8.35658 4.73378 7.38028 4.73378 7.38028L1.74981 8.87211C1.29028 9.10172 1 9.57152 1 10.0855C1 10.7118 1.42873 11.2566 2.03728 11.404L6.32798 12.3181L8.05035 12.9553C8.16236 12.9908 8.27032 12.9954 8.39508 12.9575C8.52015 12.9195 8.55935 12.8918 8.62002 12.8474C8.78429 12.7273 9.09075 12.4896 9.31196 12.3169C9.42583 12.2276 9.39565 12.0487 9.25969 12.0017Z" fill="#BF26ED"/>
-</svg>
diff --git a/damus/Assets.xcassets/Hashtags/plebchain-hashtag.imageset/plebchain.svg b/damus/Assets.xcassets/Hashtags/plebchain-hashtag.imageset/plebchain.svg
new file mode 100644
index 00000000..432d0e09
--- /dev/null
+++ b/damus/Assets.xcassets/Hashtags/plebchain-hashtag.imageset/plebchain.svg
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   viewBox="0 0 21.315096 18"
+   width="21.315096"
+   height="18"
+   version="1.1"
+   id="svg21"
+   sodipodi:docname="plebchain.svg"
+   inkscape:version="1.3-dev (77bc73e, 2022-05-18)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs21" />
+  <sodipodi:namedview
+     id="namedview21"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="19.666667"
+     inkscape:cx="12.762712"
+     inkscape:cy="12.991525"
+     inkscape:window-width="1418"
+     inkscape:window-height="883"
+     inkscape:window-x="1745"
+     inkscape:window-y="10"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg21" />
+  <path
+     d="M 18.625339,11.886754 C 17.668676,9.87076 15.553749,8.748431 12.298294,7.531368 12.258627,7.5164347 11.514296,7.2747022 10.649566,6.9942364 9.6532356,6.6713042 8.5682391,6.7520372 7.6316422,7.220569 L 5.7999816,8.136166 13.616623,17.9338 h 4.316652 l 0.703264,-1.662727 c 0.593598,-1.401862 0.641198,-3.009057 -0.0112,-4.384319 z"
+     id="path5"
+     style="fill:#bf26ed;fill-opacity:1;stroke-width:0.466665" />
+  <path
+     d="M 16.627546,5.1089093 C 16.710146,4.5484447 16.797412,3.95578 16.838479,3.6790475 17.083011,2.0219197 15.937348,0.48005806 14.28022,0.23552546 12.623092,-0.00900704 11.081231,1.1366559 10.836698,2.7937838 c -0.0406,0.2762657 -0.128333,0.8689305 -0.210932,1.4298619 -0.282799,0.058333 -0.513332,0.2851324 -0.558132,0.5870648 -0.0658,0.441465 0.084,1.0145298 0.370999,1.2072625 0.09707,1.4303286 1.118596,2.778524 2.547992,2.989457 1.429395,0.210933 2.796257,-0.785398 3.302589,-2.1265932 0.330399,-0.1021996 0.639331,-0.6071313 0.703731,-1.0490632 0.0434,-0.302399 -0.111533,-0.5856647 -0.365399,-0.7228643 z"
+     id="path10"
+     style="fill:#bf26ed;fill-opacity:1;stroke-width:0.466665" />
+  <path
+     d="m 21.193864,14.872477 c -0.0392,-0.501665 -0.310799,-0.956663 -0.684131,-1.294529 l -1.900727,-1.723394 c 0,0 0.172666,0.346732 0.332732,1.276796 L 15.53415,11.550288 c -0.878731,-0.405999 -1.835861,-0.616465 -2.804191,-0.616465 h -0.807331 c -0.87733,0 -1.681394,-0.553464 -1.9338602,-1.393928 C 9.8926348,9.220696 9.819835,8.832897 9.7904351,8.363432 V 8.362965 C 10.503966,7.7651672 10.944031,6.8285703 10.968765,5.8700401 11.247364,5.6651742 11.372897,5.0865094 11.28843,4.648311 11.230564,4.3482453 10.990698,4.1317127 10.706032,4.0850462 10.599632,3.5283147 10.487633,2.93985 10.435366,2.6654509 10.121301,1.0199896 8.5327726,-0.05940684 6.8873113,0.25419216 5.2418501,0.56779106 4.1624536,2.1567859 4.4760526,3.8022471 4.5283191,4.0766462 4.6407854,4.665111 4.7467184,5.2218423 4.4989192,5.3697751 4.355653,5.6595742 4.4125861,5.9596399 4.4956525,6.3983051 4.8255848,6.8901701 5.159717,6.9779032 5.2950499,7.2952355 5.4798493,7.5892345 5.7015152,7.8510336 L 5.7999816,8.136166 5.2171168,11.699621 3.2925898,12.11822 C 3.041524,12.177953 2.8109914,12.278752 2.6061254,12.411752 1.8342613,12.912484 1.5458622,13.865414 1.7731282,14.725478 1.8309946,14.943877 2.8833245,17.9338 2.8833245,17.9338 H 15.133284 l 0.408332,-1.691661 3.480855,0.605265 c 1.184397,0.211399 2.267993,-0.748064 2.171393,-1.974927 z"
+     id="path16"
+     style="fill:#f59119;fill-opacity:1;stroke-width:0.466665" />
+  <path
+     d="m 12.589026,15.06801 -2.251659,-0.776531 c 0,0 0.96693,-0.1106 0.95853,-0.625798 -4.67e-4,-0.03687 -0.01213,-0.240332 -0.307999,-0.210932 -0.0812,0.0079 -0.734064,0.07327 -1.1927962,0.118999 -0.3028657,0.03033 -0.6015314,0.09007 -0.8927304,0.178733 l -0.1591328,0.04853 -3.5256551,-2.101393 c 0,0 0,0 0.3495322,-0.763464 C 6.1779803,9.600561 5.8004482,8.136166 5.8004482,8.136166 L 1.324663,10.373825 C 0.63539857,10.718224 0.2,11.422889 0.2,12.193819 c 0,0.939397 0.64306455,1.756528 1.5558615,1.977727 l 6.4357789,1.371062 2.5834586,0.955731 c 0.167999,0.0532 0.329932,0.0602 0.517065,0.0033 0.187599,-0.05693 0.246399,-0.09847 0.337398,-0.165199 0.2464,-0.180133 0.706065,-0.536665 1.037864,-0.795664 0.170799,-0.133933 0.125533,-0.402266 -0.0784,-0.472732 z"
+     id="path21"
+     style="fill:#bf26ed;fill-opacity:1;stroke-width:0.466665" />
+</svg>
diff --git a/damus/Assets.xcassets/Hashtags/sats-hashtag.imageset/Contents.json b/damus/Assets.xcassets/Hashtags/sats-hashtag.imageset/Contents.json
deleted file mode 100644
index b870954c..00000000
--- a/damus/Assets.xcassets/Hashtags/sats-hashtag.imageset/Contents.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "sats-hashtag.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/damus/Assets.xcassets/Hashtags/sats-hashtag.imageset/sats-hashtag.svg b/damus/Assets.xcassets/Hashtags/sats-hashtag.imageset/sats-hashtag.svg
deleted file mode 100644
index c5709efe..00000000
--- a/damus/Assets.xcassets/Hashtags/sats-hashtag.imageset/sats-hashtag.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10.2097 1.81595L9.20068 1.54803L8.74286 3.27229L9.7519 3.54021L10.2097 1.81595Z" fill="#F9AD1C"/>
-<path d="M7.25562 12.9419L6.24658 12.674L5.78876 14.3982L6.7978 14.6661L7.25562 12.9419Z" fill="#F9AD1C"/>
-<path d="M12.175 6.88294L12.4429 5.8739L5.24817 3.96357L4.98025 4.97261L12.175 6.88294Z" fill="#F9AD1C"/>
-<path d="M11.4674 9.5475L11.7354 8.53847L4.54065 6.62814L4.27273 7.63718L11.4674 9.5475Z" fill="#F9AD1C"/>
-<path d="M10.7804 12.1372L11.0483 11.1281L3.85363 9.21778L3.58572 10.2268L10.7804 12.1372Z" fill="#F9AD1C"/>
-</svg>
diff --git a/damus/Assets.xcassets/Hashtags/zap-hashtag.imageset/Contents.json b/damus/Assets.xcassets/Hashtags/zap-hashtag.imageset/Contents.json
index 6116363d..37663ab7 100644
--- a/damus/Assets.xcassets/Hashtags/zap-hashtag.imageset/Contents.json
+++ b/damus/Assets.xcassets/Hashtags/zap-hashtag.imageset/Contents.json
@@ -1,15 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "zap-hashtag.svg",
+      "filename" : "zapathon.svg",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
+      "filename" : "zapathon.svg",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
+      "filename" : "zapathon.svg",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/damus/Assets.xcassets/Hashtags/zap-hashtag.imageset/zap-hashtag.svg b/damus/Assets.xcassets/Hashtags/zap-hashtag.imageset/zap-hashtag.svg
deleted file mode 100644
index a5c5dcfc..00000000
--- a/damus/Assets.xcassets/Hashtags/zap-hashtag.imageset/zap-hashtag.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6.86489 9.39594L6.49972 8.58693L4.02148 8.7482L4.86912 9.8351L6.8828 9.71053L6.86489 9.39594ZM10.6245 5.75791L10.2248 6.29387L9.69672 7.03594L9.62911 7.13091L7.68887 9.85729L5.43849 13.0341L6.18531 14.6195C8.0558 12.0582 9.8948 9.47424 11.7364 6.8921L10.6245 5.75791ZM9.61043 5.25742L10.164 2.51029L9.21026 1.507L8.42717 4.63067L8.11156 6.01014L9.3479 6.45857L9.61043 5.25742Z" fill="#C88D15"/>
-<path d="M10.6362 5.74371L10.3811 5.76065L10.0188 5.78459L9.75374 5.80207L8.25361 5.90143L8.53042 4.58126L8.80997 3.24854L9.21204 1.49998L6.76708 4.91L4 8.79803L5.98257 8.66681L6.38299 8.64035L6.10572 9.96089L6.06139 10.1725L5.99353 10.4963L5.46671 13.0083L6.19928 11.9788L7.86903 9.63228L9.80918 6.90581L9.87679 6.81089L10.6363 5.74371H10.6362Z" fill="#E2CE29"/>
-</svg>
diff --git a/damus/Assets.xcassets/Hashtags/zap-hashtag.imageset/zapathon.svg b/damus/Assets.xcassets/Hashtags/zap-hashtag.imageset/zapathon.svg
new file mode 100644
index 00000000..266924b2
--- /dev/null
+++ b/damus/Assets.xcassets/Hashtags/zap-hashtag.imageset/zapathon.svg
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="11.106925"
+   height="18"
+   viewBox="0 0 2.9387073 4.7624999"
+   version="1.1"
+   id="svg1"
+   inkscape:version="1.3-dev (77bc73e, 2022-05-18)"
+   sodipodi:docname="zapathon.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     showgrid="false"
+     inkscape:zoom="16"
+     inkscape:cx="16.96875"
+     inkscape:cy="9.96875"
+     inkscape:window-width="1406"
+     inkscape:window-height="767"
+     inkscape:window-x="1741"
+     inkscape:window-y="214"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs1" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-10.993855,-8.058313)">
+    <g
+       transform="matrix(0.01604881,0,0,-0.01604881,10.573102,13.422443)"
+       id="g10"
+       inkscape:label="Bolt"
+       style="display:inline">
+      <path
+         id="path14"
+         style="fill:#c98f19;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.1"
+         d="m 94.833712,155.13322 -8.129016,18.00903 -55.167069,-3.59001 18.868958,-24.19503 44.825648,2.77303 z m 83.691438,80.98476 -8.89814,-11.93085 -11.755,-16.519 -1.505,-2.114 -43.191,-60.691 L 63.081111,74.14633 79.705774,38.853232 C 121.34411,95.870625 162.2814,153.39008 203.27601,210.87013 Z m -22.57414,11.14115 12.32197,61.15287 -21.22997,22.33399 -17.432,-69.53486 -7.0256,-30.70796 27.52164,-9.9823 5.84396,26.73826"
+         sodipodi:nodetypes="cccccccccccccccccccccc" />
+      <path
+         id="path16"
+         style="fill:#fadf05;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.1"
+         d="m 178.78514,236.43412 -5.679,-0.377 -8.065,-0.533 -5.9,-0.389 -33.394,-2.212 6.162,29.388 6.223,29.667 8.95029,38.92409 -54.426393,-75.90909 -61.5969,-86.55 44.1332,2.921 8.9137,0.589 -6.1723,-29.396 -0.9867,-4.71 -1.5106,-7.209 -11.7273,-55.917704 16.3074,22.9175 37.169603,52.234204 43.189,60.693 1.505,2.113 16.907,23.756 h -0.002"
+         sodipodi:nodetypes="cccccccccccccccccccccc" />
+    </g>
+  </g>
+</svg>
diff --git a/damus/Assets.xcassets/Hashtags/zapan-hashtag.imageset/Contents.json b/damus/Assets.xcassets/Hashtags/zapan-hashtag.imageset/Contents.json
deleted file mode 100644
index 1e19d607..00000000
--- a/damus/Assets.xcassets/Hashtags/zapan-hashtag.imageset/Contents.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "zapan-hashtag.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/damus/Assets.xcassets/Hashtags/zapan-hashtag.imageset/zapan-hashtag.svg b/damus/Assets.xcassets/Hashtags/zapan-hashtag.imageset/zapan-hashtag.svg
deleted file mode 100644
index e46aa3c3..00000000
--- a/damus/Assets.xcassets/Hashtags/zapan-hashtag.imageset/zapan-hashtag.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_i_1550_39097)">
-<rect x="1" y="3.1875" width="14" height="9.625" rx="1.75" fill="white"/>
-</g>
-<rect x="1.04375" y="3.23125" width="13.9125" height="9.5375" rx="1.70625" stroke="#DDE1E3" stroke-width="0.0875"/>
-<circle cx="8" cy="8" r="2.625" fill="#E51D4D"/>
-<defs>
-<filter id="filter0_i_1550_39097" x="1" y="3.1875" width="14" height="9.625" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset/>
-<feGaussianBlur stdDeviation="0.875"/>
-<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.07 0"/>
-<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1550_39097"/>
-</filter>
-</defs>
-</svg>