diff --git a/frontend/src/pages/profile/profile.html b/frontend/src/pages/profile/profile.html
index 5dfa4f2..b24ab6d 100644
--- a/frontend/src/pages/profile/profile.html
+++ b/frontend/src/pages/profile/profile.html
@@ -31,6 +31,19 @@
 				</div>
 			</div>
 		</div>
+		<div id="iconBox" class="mb-1 grid grid-cols-[auto_1fr] gap-2 hidden">
+			<div id="viewIconBox" class="h-[128px] w-[128px] p-2 border-gray-700 border-2 rounded-lg">
+				<img/>
+			</div>
+			<div id="updateIconBox">
+				<form id="updateIconForm" class="flex flex-col justify-evenly h-full">
+					<input type="file" name="upload" accept="image/png, image/jpeg" class="text-black border-black border-2 rounded-lg px-4 w-[230px]"></input>
+					<span class="text-black font-base">Select Image</span>
+					<button type="submit" class="w-full bg-blue-600 text-white py-2 rounded hover:bg-blue-700"> Update </button>
+				</form>
+			</div>
+		</div>
+
 		<!-- Display Name -->
 		<div id="displayNameWrapper" class="py-2">
 			<label class="block font-medium mb-1 text-gray-700">Display Name</label>
@@ -52,8 +65,7 @@
 			<label class="block font-medium mb-1 text-gray-700">Description</label>
 			<input id="descBox" type="text" placeholder="Description..." name="Description"
 				class="w-full px-4 py-2 border border-gray-300 text-gray-700 rounded-xl focus:outline-none focus:ring-2 focus:ring-blue-500" />
-			<button id="descButton"
-				class="w-full bg-blue-600 text-white py-2 rounded hover:bg-blue-700">Update</button>
+			<button id="descButton" class="w-full bg-blue-600 text-white py-2 rounded hover:bg-blue-700">Update</button>
 		</div>
 		<!-- TOTP -->
 		<div class="border rounded p-4" id="totpWrapper" hidden>
diff --git a/frontend/src/pages/profile/profile.ts b/frontend/src/pages/profile/profile.ts
index c1e59fd..54f348b 100644
--- a/frontend/src/pages/profile/profile.ts
+++ b/frontend/src/pages/profile/profile.ts
@@ -40,6 +40,45 @@ function removeBgColor(...elem: HTMLElement[]) {
 	}
 }
 
+async function setup_profile_image(container: HTMLDivElement, url: string) {
+	let imgNode = container.querySelector<HTMLImageElement>("img");
+	let formNode = container.querySelector<HTMLFormElement>("form");
+	if (!imgNode || !formNode) return;
+	imgNode.src = url;
+	container.classList.remove("hidden");
+	formNode.addEventListener("submit", async (e) => {
+		e.preventDefault();
+		let form = e.target;
+		if (!form) return;
+		let data = new FormData(form as HTMLFormElement);
+		let req = await fetch("/api/icons/set", {
+			body: data,
+			method: "POST",
+		});
+		if (req.status === 200 || req.status === 400) {
+			let json = await req.json();
+			if (!("kind" in json) || !("msg" in json))
+				return showError("Unknown Error");
+			if (typeof json.kind !== "string" || typeof json.msg !== "string")
+				return showError("Unknown Error");
+			const pjson: { kind: string; msg: string } = json;
+			if (pjson.kind === "success") {
+				showSuccess("Updated image !");
+				return handleRoute();
+			} else {
+				console.log(`Failed to upload image: ${pjson.msg}`);
+				showError("Failed to change image");
+			}
+		} if (req.status === 413)
+		{
+			showError("Image too big");
+		}
+		else {
+			showError("Unknown Error");
+		}
+	});
+}
+
 async function route(url: string, _args: { [k: string]: string }) {
 	setTitle("Edit Profile");
 	return {
@@ -99,8 +138,7 @@ async function route(url: string, _args: { [k: string]: string }) {
 
 			let descWrapper =
 				app.querySelector<HTMLDivElement>("#descWrapper")!;
-			let descBox =
-				app.querySelector<HTMLInputElement>("#descBox")!;
+			let descBox = app.querySelector<HTMLInputElement>("#descBox")!;
 			let descButton =
 				app.querySelector<HTMLButtonElement>("#descButton")!;
 
@@ -126,6 +164,8 @@ async function route(url: string, _args: { [k: string]: string }) {
 			let totpWrapper =
 				app.querySelector<HTMLDivElement>("#totpWrapper")!;
 
+			let imgBox = app.querySelector<HTMLDivElement>("#iconBox")!;
+
 			descBox.value = user.desc;
 
 			if (user.guest) {
@@ -138,10 +178,7 @@ async function route(url: string, _args: { [k: string]: string }) {
 					descButton,
 				);
 
-				descButton.classList.add(
-					"bg-gray-700",
-					"hover:bg-gray-700",
-				);
+				descButton.classList.add("bg-gray-700", "hover:bg-gray-700");
 				descButton.disabled = true;
 				descBox.disabled = true;
 
@@ -174,6 +211,7 @@ async function route(url: string, _args: { [k: string]: string }) {
 				passwordWrapper.hidden = false;
 
 				accountTypeBox.innerText = "Normal";
+				setup_profile_image(imgBox, `/icons/${user.id}`);
 			} else if (
 				!isNullish(user.selfInfo?.providerId) &&
 				!isNullish(user.selfInfo?.providerUser)
@@ -195,6 +233,7 @@ async function route(url: string, _args: { [k: string]: string }) {
 				totpWrapper.hidden = true;
 
 				accountTypeBox.innerText = "Provider";
+				setup_profile_image(imgBox, `/icons/${user.id}`);
 			}
 
 			// ---- Update UI ----
@@ -269,12 +308,13 @@ async function route(url: string, _args: { [k: string]: string }) {
 				}
 			};
 			descButton.onclick = async () => {
-				let req = await client.changeDesc({ changeDescRequest: { desc: descBox.value } });
+				let req = await client.changeDesc({
+					changeDescRequest: { desc: descBox.value },
+				});
 				if (req.kind === "success") {
 					showSuccess("Successfully changed description");
 					handleRoute();
-				}
-				else {
+				} else {
 					showError(`Failed to update`);
 				}
 			};
diff --git a/nginx/conf/locations/icons.conf b/nginx/conf/locations/icons.conf
index 386664d..3bd0e6a 100644
--- a/nginx/conf/locations/icons.conf
+++ b/nginx/conf/locations/icons.conf
@@ -6,4 +6,5 @@ location /api/icons/ {
 location /icons/ {
 	root /volumes/;
 	default_type image/png;
+	add_header Cache-Control "max-age=30";
 }