diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php
index 8b79ea1..dacc501 100644
--- a/app/Http/Controllers/AuthController.php
+++ b/app/Http/Controllers/AuthController.php
@@ -19,11 +19,15 @@ class AuthController extends Controller
 
 		$authUser = User::updateOrCreate(
 			[ 'email' => $user->getEmail() ],
-			[ 'name' => $user->getName() ]
 		);
 
 		if ($authUser)
 		{
+			if ($authUser->name == '')
+			{
+				$authUser->name = $user->getName();
+				$authUser->save();
+			}
 			Auth::login($authUser);
 			return redirect('/');
 		}
diff --git a/app/Livewire/App/Icon.php b/app/Livewire/App/Icon.php
index 1b48b52..452a538 100644
--- a/app/Livewire/App/Icon.php
+++ b/app/Livewire/App/Icon.php
@@ -6,6 +6,8 @@ use Livewire\Component;
 
 class Icon extends Component
 {
+	public string $family = 'classic';
+	public string $variant = 'light';
 	public string $name = 'paw-simple';
 	public string $label = '';
 	public string $style = '';
diff --git a/app/Livewire/Pages/Profile.php b/app/Livewire/Pages/Profile.php
index cb3d29a..3bda18d 100644
--- a/app/Livewire/Pages/Profile.php
+++ b/app/Livewire/Pages/Profile.php
@@ -4,6 +4,7 @@ namespace App\Livewire\Pages;
 
 use App\Models\User;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Validation\Rule;
 use Livewire\Attributes\Validate;
 use Livewire\Component;
 use Livewire\WithFileUploads;
@@ -14,15 +15,39 @@ class Profile extends Component
 
 	public User $user;
 
-	#[Validate('image|max:10240')]
 	public $avatar = null;
+	public string $name = '';
+
+	public function mount(User $user)
+	{
+		$this->user = $user;
+		$this->name = $user->name;
+	}
 
     public function render()
     {
         return view('livewire.pages.profile')->title($this->user->name);
     }
 
-	public function updated()
+	public function rules()
+	{
+		return [
+			'avatar' => [
+				'nullable',
+				'image',
+				'max:10240',
+			],
+			'name' => [
+				'required',
+				'string',
+				'min:2',
+				'max:40',
+				Rule::unique('users', 'name')->ignore($this->user),
+			],
+		];
+	}
+
+	public function updated($name, $value)
 	{
 		if (Auth::id() != $this->user->id)
 		{
@@ -31,10 +56,16 @@ class Profile extends Component
 
 		$this->validate();
 
-		$this->user->avatarExt = $this->avatar->getClientOriginalExtension();
-		$this->user->save();
+		$this->user->update([ $name => $value ]);
+
+		if (isset($this->avatar))
+		{
+			$this->user->avatarExt = $this->avatar->getClientOriginalExtension();
+			$this->user->save();
+
+			$this->avatar->storeAs('avatars', $this->user->id);
+			return $this->redirect("/profiles/{$this->user->id}");
+		}
 
-		$this->avatar->storeAs('avatars', $this->user->id);
-		return $this->redirect("/profiles/{$this->user->id}");
 	}
 }
diff --git a/package-lock.json b/package-lock.json
index 6b923e4..0cd0e05 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,5 +1,5 @@
 {
-    "name": "photos",
+    "name": "nyaabooru",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
diff --git a/resources/views/livewire/app/footer.blade.php b/resources/views/livewire/app/footer.blade.php
index 37e07d3..5805df4 100644
--- a/resources/views/livewire/app/footer.blade.php
+++ b/resources/views/livewire/app/footer.blade.php
@@ -7,6 +7,8 @@
 		<span class="wa-caption-l">&copy; 2025 <a href="https://nyaastudios.io" target="_blank">NyaaStudios</a>; All rights reserved.</span>
 	</div>
 	<div class="wa-cluster wa-heading-m">
-		<wa-icon-button family="brands" name="github" href="https://github.com/NyaaStudios/nyaabooru" target="_blank"></wa-icon-button>
+		<a href="https://github.com/NyaaStudios/nyaabooru" class="wa-link-plain" target="_blank">
+			<livewire:app.icon family="brands" name="github" />
+		</a>
 	</div>
 </div>
diff --git a/resources/views/livewire/app/icon.blade.php b/resources/views/livewire/app/icon.blade.php
index cb598a6..8851daa 100644
--- a/resources/views/livewire/app/icon.blade.php
+++ b/resources/views/livewire/app/icon.blade.php
@@ -1,6 +1,7 @@
 <wa-icon
 	name="{{ $name }}"
-	variant="light"
+	family="{{ $family }}"
+	variant="{{ $variant }}"
 	label="{{ $label }}"
 	fixed-width
 	@isset($slot)
diff --git a/resources/views/livewire/app/pfp.blade.php b/resources/views/livewire/app/pfp.blade.php
index 6767b75..6b32751 100644
--- a/resources/views/livewire/app/pfp.blade.php
+++ b/resources/views/livewire/app/pfp.blade.php
@@ -5,4 +5,6 @@
 	label="avatar for {{ $user->name }}"
 	shape="{{ $shape }}"
 	style="--size: {{ $size }}"
-></wa-avatar>
+>
+	<livewire:app.icon name="user" slot="icon" size="2.5rem" />
+</wa-avatar>
diff --git a/resources/views/livewire/app/user-card.blade.php b/resources/views/livewire/app/user-card.blade.php
index f2cb83e..faea6e0 100644
--- a/resources/views/livewire/app/user-card.blade.php
+++ b/resources/views/livewire/app/user-card.blade.php
@@ -1,13 +1,11 @@
-<article class="wa-stack nyaabooru-pfp">
-	<a class="wa-frame wa-border-radius-l" style="inline-size: 15rem;" href="{{ url("/profiles/$user->id") }}" wire:navigate.hover>
-		@if (\Illuminate\Support\Facades\Storage::has("avatars/$user->id"))
-			<img src="{{ $user->getAvatarBase64() }}"/>
-		@else
-			<livewire:app.icon name="user" />
-		@endif
+<wa-card>
+	<a class="wa-stack nyaabooru-pfp wa-link-plain" href="{{ url("/profiles/$user->id") }}" wire:navigate.hover>
+		<div class="wa-frame wa-border-radius-l" style="inline-size: 10rem;" >
+			<livewire:app.pfp :$user size="10rem" />
+		</div>
+		<div class="wa-stack wa-gap-3xs">
+			<span class="wa-heading-s">{{ $user->name }}</span>
+			<span class="wa-caption-m">Joined <wa-format-date value="{{ $user->created_at }}"></wa-format-date></span>
+		</div>
 	</a>
-	<div class="wa-stack wa-gap-3xs">
-		<span class="wa-heading-s">{{ $user->name }}</span>
-		<span class="wa-caption-m">Joined <wa-format-date value="{{ $user->created_at }}"></wa-format-date></span>
-	</div>
-</article>
+</wa-card>
diff --git a/resources/views/livewire/pages/profile.blade.php b/resources/views/livewire/pages/profile.blade.php
index 7b1e67e..a325a43 100644
--- a/resources/views/livewire/pages/profile.blade.php
+++ b/resources/views/livewire/pages/profile.blade.php
@@ -23,10 +23,21 @@
 			<h2>User settings</h2>
 			<form wire:submit>
 				<wa-card>
-					<div class="wa-stack">
-						<span class="wa-heading-m">Profile picture</span>
-						<input type="file" wire:model.live="avatar" wire:loading.attr="disabled" />
-						@error('avatar')
+					<div class="wa-stack wa-gap-l">
+						<div class="wa-stack">
+							<span class="wa-heading-m">Profile picture</span>
+							<input type="file" wire:model.live="avatar" wire:loading.attr="disabled" />
+							@error('avatar')
+								<span class="wa-caption-m">{{ $message }}</span>
+							@enderror
+						</div>
+
+						<wa-divider></wa-divider>
+
+						<wa-input wire:model.live="name" label="Display name">
+							<livewire:app.icon slot="start" name="user-tag" />
+						</wa-input>
+						@error('name')
 							<span class="wa-caption-m">{{ $message }}</span>
 						@enderror
 					</div>