diff --git a/discord.go b/discord.go
index 1f37a03..f10e7c5 100644
--- a/discord.go
+++ b/discord.go
@@ -210,7 +210,9 @@ func (d *DiscordDaemon) NewTempInvite(ageSeconds, maxUses int) (inviteURL, iconU
 		d.app.err.Printf("Discord: Failed to get guild: %v", err)
 		return
 	}
+	// FIXME: Fix CSS, and handle no icon
 	iconURL = guild.IconURL("256")
+	fmt.Println("GOT ICON", iconURL)
 	return
 }
 
diff --git a/html/form.html b/html/form.html
index dff83e5..1ef1820 100644
--- a/html/form.html
+++ b/html/form.html
@@ -49,7 +49,7 @@
             <div class="card relative mx-auto my-[10%] w-4/5 lg:w-1/3">
                 <span class="heading mb-4">{{ .strings.linkDiscord }}</span>
                 <p class="content mb-4"> {{ .discordSendPINMessage }}</p>
-                <h1 class="text-center text-2xl mb-2">{{ .discordPIN }}</h1>
+                <h1 class="text-center text-2xl mb-2 pin"></h1>
                 <a id="discord-invite"></a>
                 <span class="button ~info @low full-width center mt-4" id="discord-waiting">{{ .strings.success }}</span>
             </div>
diff --git a/html/user.html b/html/user.html
index 3e61003..3de47a7 100644
--- a/html/user.html
+++ b/html/user.html
@@ -46,7 +46,9 @@
                 <span class="heading mb-4">{{ .strings.linkDiscord }}</span>
                 <p class="content mb-4"> {{ .discordSendPINMessage }}</p>
                 <h1 class="text-center text-2xl mb-2 pin"></h1>
-                <a id="discord-invite"></a>
+                <div class="row center">
+                    <a id="discord-invite"></a>
+                </div>
                 <span class="button ~info @low full-width center mt-4" id="discord-waiting">{{ .strings.success }}</span>
             </div>
         </div>
diff --git a/tailwind.config.js b/tailwind.config.js
index e6c93da..b9825a6 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -40,7 +40,8 @@ module.exports = {
               d_urge: dark.d_urge,
               d_warning: dark.d_warning,
               d_info: dark.d_info,
-              d_critical: dark.d_critical
+              d_critical: dark.d_critical,
+              discord: "#5865F2"
           }
       }
   },
diff --git a/ts/modules/account-linking.ts b/ts/modules/account-linking.ts
index fce2ec8..76e34c5 100644
--- a/ts/modules/account-linking.ts
+++ b/ts/modules/account-linking.ts
@@ -75,7 +75,13 @@ export class Discord {
         const link = document.getElementById("discord-invite") as HTMLAnchorElement;
         link.href = inv.invite;
         link.target = "_blank";
-        link.innerHTML = `<span class="img-circle lg mr-4"><img class="img-circle" src="${inv.icon}" width="64" height="64"></span>${window.discordServerName}`;
+        if (inv.icon != "") {
+            link.innerHTML = `<span class="img-circle lg mr-4"><img class="img-circle" src="${inv.icon}" width="64" height="64"></span>${window.discordServerName}`;
+        } else {
+            link.innerHTML = `
+            <span class="shield mr-4 bg-discord"><i class="ri-discord-fill ri-xl text-white"></i></span>${window.discordServerName}
+            `;
+        }
     });
 
     private _checkVerified = () => {