diff --git a/src/components/Icon/icons.ts b/src/components/Icon/icons.ts
index 2707025..60dae5b 100644
--- a/src/components/Icon/icons.ts
+++ b/src/components/Icon/icons.ts
@@ -11,6 +11,7 @@ import arrow from './svg/arrow.svg?raw';
 import check from './svg/check.svg?raw';
 import plus from './svg/plus.svg?raw';
 import minus from './svg/minus.svg?raw';
+import megaphone from './svg/megaphone.svg?raw';
 
 const icons = {
 	moon,
@@ -24,7 +25,8 @@ const icons = {
 	arrow,
 	check,
 	plus,
-	minus
+	minus,
+	megaphone
 };
 
 export type IconName = keyof typeof icons;
diff --git a/src/components/Icon/svg/megaphone.svg b/src/components/Icon/svg/megaphone.svg
new file mode 100644
index 0000000..9ba86fd
--- /dev/null
+++ b/src/components/Icon/svg/megaphone.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
+  <path stroke-linecap="round" stroke-linejoin="round" d="M10.34 15.84c-.688-.06-1.386-.09-2.09-.09H7.5a4.5 4.5 0 1 1 0-9h.75c.704 0 1.402-.03 2.09-.09m0 9.18c.253.962.584 1.892.985 2.783.247.55.06 1.21-.463 1.511l-.657.38c-.551.318-1.26.117-1.527-.461a20.845 20.845 0 0 1-1.44-4.282m3.102.069a18.03 18.03 0 0 1-.59-4.59c0-1.586.205-3.124.59-4.59m0 9.18a23.848 23.848 0 0 1 8.835 2.535M10.34 6.66a23.847 23.847 0 0 0 8.835-2.535m0 0A23.74 23.74 0 0 0 18.795 3m.38 1.125a23.91 23.91 0 0 1 1.014 5.395m-1.014 8.855c-.118.38-.245.754-.38 1.125m.38-1.125a23.91 23.91 0 0 0 1.014-5.395m0-3.46c.495.413.811 1.035.811 1.73 0 .695-.316 1.317-.811 1.73m0-3.46a24.347 24.347 0 0 1 0 3.46" />
+</svg>
diff --git a/src/components/LinkTag.svelte b/src/components/LinkTag.svelte
index 689ba85..0a03d44 100644
--- a/src/components/LinkTag.svelte
+++ b/src/components/LinkTag.svelte
@@ -7,7 +7,7 @@
 <a
 	{href}
 	class={`${
-		bad ? 'bg-red-100' : 'bg-green-100'
+		bad ? 'bg-orange-100 cursor-text' : 'bg-green-100'
 	} no-underline rounded-xl px-3 p-2 hover:scale-105 transition-all duration-200 ease-in-out`}
 	target="_blank"
 	rel="noreferrer noopener"
diff --git a/src/features/WalletCard.svelte b/src/features/WalletCard.svelte
index e312c4a..3afe153 100644
--- a/src/features/WalletCard.svelte
+++ b/src/features/WalletCard.svelte
@@ -9,7 +9,7 @@
 <div class="flex-1">
 	<div
 		class={`flex gap-4 p-4 items-center rounded-3xl flex-wrap ${
-			bad ? 'bg-red-300' : 'bg-green-400'
+			bad ? 'bg-orange-300' : 'bg-green-400'
 		}`}
 	>
 		{#each wallets as { name, href }}
diff --git a/src/lib/constants.ts b/src/lib/constants.ts
index 0d622eb..417d0ae 100644
--- a/src/lib/constants.ts
+++ b/src/lib/constants.ts
@@ -1,18 +1,6 @@
 import type { AcceptedWallet } from './types';
 
 export const WALLET_ADOPTION: AcceptedWallet[] = [
-	{
-		name: 'Armory',
-		href: 'https://www.bitcoinarmory.com/',
-		sending: false,
-		receiving: false
-	},
-	{
-		name: 'bcoin',
-		href: 'https://bcoin.io/',
-		sending: false,
-		receiving: false
-	},
 	{
 		name: 'BDK-CLI',
 		href: 'https://github.com/bitcoindevkit/bdk-cli/pull/156',
@@ -25,18 +13,6 @@ export const WALLET_ADOPTION: AcceptedWallet[] = [
 		sending: true,
 		receiving: true
 	},
-	{
-		name: 'Bitcoin Knots',
-		href: 'https://bitcoinknots.org/',
-		sending: false,
-		receiving: false
-	},
-	{
-		name: 'Bitcoin Wallet for Android',
-		href: 'https://play.google.com/store/apps/details?id=de.schildbach.wallet',
-		sending: false,
-		receiving: false
-	},
 	{
 		name: 'BitMask',
 		href: 'https://segwit.bitmask.app/',
@@ -51,7 +27,7 @@ export const WALLET_ADOPTION: AcceptedWallet[] = [
 	},
 	{
 		name: 'Blixt Wallet',
-		href: 'https://blixtwallet.github.io/',
+		href: 'https://github.com/hsjoberg/blixt-wallet/issues/1262',
 		sending: false,
 		receiving: false
 	},
@@ -68,20 +44,8 @@ export const WALLET_ADOPTION: AcceptedWallet[] = [
 		receiving: false
 	},
 	{
-		name: 'Brainbow',
-		href: 'https://github.com/Bitcoin-Brainbow/Brainbow',
-		sending: false,
-		receiving: false
-	},
-	{
-		name: 'Breadwallet',
-		href: 'https://play.google.com/store/apps/details?id=com.breadwallet',
-		sending: false,
-		receiving: false
-	},
-	{
-		name: 'BTC.com',
-		href: 'https://btc.com/',
+		name: 'Boltz',
+		href: 'https://github.com/BoltzExchange/boltz-backend/issues/449',
 		sending: false,
 		receiving: false
 	},
@@ -92,44 +56,38 @@ export const WALLET_ADOPTION: AcceptedWallet[] = [
 		receiving: true
 	},
 	{
-		name: 'Casa',
-		href: 'https://casa.io/',
-		sending: false,
-		receiving: false
-	},
-	{
-		name: 'Core Lightning',
-		href: 'https://corelightning.org/',
+		name: 'Bull Bitcoin',
+		href: 'https://github.com/SatoshiPortal/bullbitcoin-mobile/issues',
 		sending: false,
 		receiving: false
 	},
 	{
-		name: 'Coinomi',
-		href: 'https://www.coinomi.com/en/',
+		name: 'Casa',
+		href: 'https://casa.io/',
 		sending: false,
 		receiving: false
 	},
 	{
-		name: 'Eclair',
-		href: 'https://electrum.org/',
+		name: 'Core Lightning',
+		href: 'https://github.com/payjoin/nolooking/issues/67',
 		sending: false,
 		receiving: false
 	},
 	{
 		name: 'Electrum',
-		href: 'https://electrum.org/',
+		href: 'https://github.com/spesmilo/electrum/issues/6585',
 		sending: false,
 		receiving: false
 	},
 	{
 		name: 'Envoy',
-		href: 'https://foundationdevices.com/envoy/',
+		href: 'https://github.com/Foundation-Devices/envoy/pull/84',
 		sending: false,
 		receiving: false
 	},
 	{
 		name: 'Fedimint',
-		href: 'https://fedimint.org/',
+		href: 'https://github.com/fedimint/fedimint/discussions/1764',
 		sending: false,
 		receiving: false
 	},
@@ -141,25 +99,19 @@ export const WALLET_ADOPTION: AcceptedWallet[] = [
 	},
 	{
 		name: 'Fully Noded',
-		href: 'https://fullynoded.app/',
+		href: 'https://github.com/Fonta1n3/FullyNoded/issues/126',
 		sending: false,
 		receiving: false
 	},
 	{
 		name: 'Gordian Wallet',
-		href: 'https://github.com/BlockchainCommons/GordianWallet-iOS',
-		sending: false,
-		receiving: false
-	},
-	{
-		name: 'Guarda Wallet',
-		href: 'https://guarda.com/',
+		href: 'https://github.com/orgs/BlockchainCommons/discussions/49',
 		sending: false,
 		receiving: false
 	},
 	{
 		name: 'JAM',
-		href: 'https://jamapp.org/',
+		href: 'https://github.com/joinmarket-webui/jam/issues/406',
 		sending: false,
 		receiving: false
 	},
@@ -171,25 +123,19 @@ export const WALLET_ADOPTION: AcceptedWallet[] = [
 	},
 	{
 		name: 'Liana',
-		href: 'https://wizardsardine.com/liana/',
+		href: 'https://github.com/wizardsardine/liana/issues/534',
 		sending: false,
 		receiving: false
 	},
 	{
-		name: 'LND',
-		href: 'https://docs.lightning.engineering/lightning-network-tools/lnd',
-		sending: false,
-		receiving: false
+		name: 'LND (nolooking)',
+		href: 'https://github.com/payjoin/nolooking',
+		sending: true,
+		receiving: true
 	},
 	{
 		name: 'Mutiny Wallet',
-		href: 'https://www.mutinywallet.com/',
-		sending: false,
-		receiving: false
-	},
-	{
-		name: 'Mycelium',
-		href: 'https://wallet.mycelium.com/',
+		href: 'https://github.com/MutinyWallet/mutiny-node/issues/194',
 		sending: false,
 		receiving: false
 	},
@@ -201,13 +147,7 @@ export const WALLET_ADOPTION: AcceptedWallet[] = [
 	},
 	{
 		name: 'Phoenix',
-		href: 'https://phoenix.acinq.co/',
-		sending: false,
-		receiving: false
-	},
-	{
-		name: 'Samourai Wallet',
-		href: 'https://samouraiwallet.com/',
+		href: 'https://github.com/ACINQ/phoenix/issues/161',
 		sending: false,
 		receiving: false
 	},
@@ -219,7 +159,7 @@ export const WALLET_ADOPTION: AcceptedWallet[] = [
 	},
 	{
 		name: 'Stack Wallet',
-		href: 'https://stackwallet.com/',
+		href: 'https://github.com/cypherstack/stack_wallet/issues/445',
 		sending: false,
 		receiving: false
 	},
@@ -229,18 +169,6 @@ export const WALLET_ADOPTION: AcceptedWallet[] = [
 		sending: false,
 		receiving: false
 	},
-	{
-		name: 'Trust Wallet',
-		href: 'https://trustwallet.com/',
-		sending: false,
-		receiving: false
-	},
-	{
-		name: 'Vortex',
-		href: 'https://lnvortex.com/',
-		sending: false,
-		receiving: false
-	},
 	{
 		name: 'Wasabi Wallet',
 		href: 'https://docs.wasabiwallet.io/using-wasabi/PayJoin.html',
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index d537adc..bb20b2e 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -124,14 +124,14 @@ If there is a wallet you’d like to see adopt payjoin or you are a wallet devel
 	</div>
 	<div class="flex sm:flex-row flex-col gap-8 w-3/4">
 		<div class="flex flex-col gap-2 w-full items-center">
-			<H3 class="flex gap-2 items-center sm:flex-row flex-col"
+			<H3 class="flex gap-4 items-center sm:flex-row flex-col"
 				><Icon name="check" class="text-green-400 w-8 sm:w-4" />Supports Payjoin</H3
 			>
 			<WalletCard wallets={privateWallets} />
 		</div>
 		<div class="flex flex-col gap-2 w-full items-center">
-			<H3 class="flex flex-col sm:flex-row gap-2 items-center"
-				><Icon name="close" class="text-red-300 w-8 sm:w-4" />Needs a nudge</H3
+			<H3 class="flex flex-col sm:flex-row gap-4 items-center"
+				><Icon name="megaphone" class="text-orange-300 w-8 sm:w-4" />Needs a nudge</H3
 			>
 			<WalletCard bad wallets={surveillableWallets} />
 		</div>