diff --git a/aimenet-web/app/page.tsx b/aimenet-web/app/page.tsx
index f6fd384..aada902 100644
--- a/aimenet-web/app/page.tsx
+++ b/aimenet-web/app/page.tsx
@@ -16,7 +16,7 @@ import {
     Plus,
     ShieldAlert,
     SquareArrowOutUpRight,
-    Trash
+    Trash, WalletCards
 } from "lucide-react";
 import {useLiveQuery} from "dexie-react-hooks";
 import {AimeServer, db} from "@/lib/database";
@@ -24,7 +24,7 @@ import {zodResolver} from "@hookform/resolvers/zod";
 import {Card} from "@/components/ui/card";
 import {Input} from "@/components/ui/input";
 import {Button} from "@/components/ui/button";
-import {Footer} from "@/components/ui/footer";
+import {Footer} from "@/components/footer";
 import {Separator} from "@/components/ui/separator";
 import {
     ContextMenu,
@@ -35,6 +35,7 @@ import {
 } from "@/components/ui/context-menu";
 import {Alert, AlertDescription, AlertTitle} from "@/components/ui/alert";
 import {Form, FormControl, FormField, FormItem, FormMessage} from "@/components/ui/form";
+import {LoadingIndicator} from "@/components/loading-indicator";
 
 const serverAdditionSchema = z.object({
     address: z.string().startsWith("http")
@@ -48,12 +49,7 @@ function ServerList(props: { servers: AimeServer[] | undefined }) {
     const router = useRouter();
 
     if (!props.servers) {
-        return (
-            <div className="flex gap-2 justify-center items-center text-gray-500 pt-5">
-                <Loader className="h-8 w-8"/>
-                <span className="text-center">Loading...</span>
-            </div>
-        );
+        return (<LoadingIndicator/>);
     }
 
     if (!props.servers.length) {
@@ -227,7 +223,7 @@ export default function ServerListingPage() {
             <div className="flex items-center gap-1">
                 <h2 className="text-4xl font-bold select-none flex-grow">Servers</h2>
                 <Button variant="ghost" size={"default"} onClick={() => router.push('/cards')}>
-                    <CreditCard className="h-4 w-4 sm:mr-2"/>
+                    <WalletCards className="h-4 w-4 sm:mr-2"/>
                     <span className="hidden sm:block">Manage Cards</span>
                 </Button>
             </div>
diff --git a/aimenet-web/components/ui/footer.tsx b/aimenet-web/components/footer.tsx
similarity index 100%
rename from aimenet-web/components/ui/footer.tsx
rename to aimenet-web/components/footer.tsx