diff --git a/src/main/events/index.ts b/src/main/events/index.ts
index 15f466e1..190fd56b 100644
--- a/src/main/events/index.ts
+++ b/src/main/events/index.ts
@@ -24,7 +24,6 @@ import "./library/remove-game";
 import "./library/remove-game-from-library";
 import "./misc/open-external";
 import "./misc/show-open-dialog";
-import "./misc/image-path-to-base-64";
 import "./torrenting/cancel-game-download";
 import "./torrenting/pause-game-download";
 import "./torrenting/resume-game-download";
diff --git a/src/main/events/misc/image-path-to-base-64.ts b/src/main/events/misc/image-path-to-base-64.ts
deleted file mode 100644
index 68b80cdf..00000000
--- a/src/main/events/misc/image-path-to-base-64.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import mime from "mime";
-import { registerEvent } from "../register-event";
-import fs from "node:fs";
-
-const imagePathToBase64 = async (
-  _event: Electron.IpcMainInvokeEvent,
-  filePath: string
-) => {
-  const buffer = fs.readFileSync(filePath);
-  const mimeType = mime.getType(filePath);
-  return `data:${mimeType};base64,${buffer.toString("base64")}`;
-};
-
-registerEvent("imagePathToBase64", imagePathToBase64);
diff --git a/src/main/events/profile/update-profile.ts b/src/main/events/profile/update-profile.ts
index e4a4595c..ca351629 100644
--- a/src/main/events/profile/update-profile.ts
+++ b/src/main/events/profile/update-profile.ts
@@ -2,6 +2,7 @@ import { registerEvent } from "../register-event";
 import { HydraApi } from "@main/services/hydra-api";
 import axios from "axios";
 import fs from "node:fs";
+import path from "node:path";
 import mime from "mime";
 import { UserProfile } from "@types";
 
@@ -26,6 +27,8 @@ const updateProfile = async (
   displayName: string,
   newProfileImagePath: string | null
 ): Promise<UserProfile> => {
+  console.log(newProfileImagePath);
+
   if (!newProfileImagePath) {
     return (await patchUserProfile(displayName)).data;
   }
@@ -35,7 +38,7 @@ const updateProfile = async (
   const fileSizeInBytes = stats.size;
 
   const profileImageUrl = await HydraApi.post(`/presigned-urls/profile-image`, {
-    imageExt: newProfileImagePath.split(".").at(-1),
+    imageExt: path.extname(newProfileImagePath).slice(1),
     imageLength: fileSizeInBytes,
   })
     .then(async (preSignedResponse) => {
diff --git a/src/main/index.ts b/src/main/index.ts
index 53b68bba..10399beb 100644
--- a/src/main/index.ts
+++ b/src/main/index.ts
@@ -2,6 +2,7 @@ import { app, BrowserWindow, net, protocol } from "electron";
 import updater from "electron-updater";
 import i18n from "i18next";
 import path from "node:path";
+import url from "node:url";
 import { electronApp, optimizer } from "@electron-toolkit/utils";
 import { DownloadManager, logger, WindowManager } from "@main/services";
 import { dataSource } from "@main/data-source";
@@ -51,9 +52,10 @@ if (process.defaultApp) {
 app.whenReady().then(async () => {
   electronApp.setAppUserModelId("site.hydralauncher.hydra");
 
-  protocol.handle("hydra", (request) =>
-    net.fetch("file://" + request.url.slice("hydra://".length))
-  );
+  protocol.handle("local", (request) => {
+    const filePath = request.url.slice("local://".length);
+    return net.fetch(url.pathToFileURL(filePath).toString());
+  });
 
   await dataSource.initialize();
   await dataSource.runMigrations();
diff --git a/src/preload/index.ts b/src/preload/index.ts
index f577211d..607c0fb0 100644
--- a/src/preload/index.ts
+++ b/src/preload/index.ts
@@ -106,8 +106,6 @@ contextBridge.exposeInMainWorld("electron", {
   getVersion: () => ipcRenderer.invoke("getVersion"),
   getDefaultDownloadsPath: () => ipcRenderer.invoke("getDefaultDownloadsPath"),
   openExternal: (src: string) => ipcRenderer.invoke("openExternal", src),
-  imagePathToBase64: (filePath: string) =>
-    ipcRenderer.invoke("imagePathToBase64", filePath),
   showOpenDialog: (options: Electron.OpenDialogOptions) =>
     ipcRenderer.invoke("showOpenDialog", options),
   platform: process.platform,
diff --git a/src/renderer/index.html b/src/renderer/index.html
index 85a75bdc..92b9c88a 100644
--- a/src/renderer/index.html
+++ b/src/renderer/index.html
@@ -6,7 +6,7 @@
     <title>Hydra</title>
     <meta
       http-equiv="Content-Security-Policy"
-      content="default-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'; img-src 'self' data: https://cdn.losbroxas.org https://steamcdn-a.akamaihd.net https://shared.akamai.steamstatic.com https://cdn.cloudflare.steamstatic.com https://cdn2.steamgriddb.com https://cdn.akamai.steamstatic.com; media-src 'self' data: https://cdn.losbroxas.org https://steamcdn-a.akamaihd.net https://cdn.cloudflare.steamstatic.com https://cdn2.steamgriddb.com https://cdn.akamai.steamstatic.com https://shared.akamai.steamstatic.com;"
+      content="default-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'; img-src 'self' data: local: https://cdn.losbroxas.org https://steamcdn-a.akamaihd.net https://shared.akamai.steamstatic.com https://cdn.cloudflare.steamstatic.com https://cdn2.steamgriddb.com https://cdn.akamai.steamstatic.com; media-src 'self' data: https://cdn.losbroxas.org https://steamcdn-a.akamaihd.net https://cdn.cloudflare.steamstatic.com https://cdn2.steamgriddb.com https://cdn.akamai.steamstatic.com https://shared.akamai.steamstatic.com;"
     />
   </head>
   <body style="background-color: #1c1c1c">
diff --git a/src/renderer/src/declaration.d.ts b/src/renderer/src/declaration.d.ts
index 2201a754..01b290a3 100644
--- a/src/renderer/src/declaration.d.ts
+++ b/src/renderer/src/declaration.d.ts
@@ -96,7 +96,6 @@ declare global {
 
     /* Misc */
     openExternal: (src: string) => Promise<void>;
-    imagePathToBase64: (filePath: string) => Promise<string>;
     getVersion: () => Promise<string>;
     ping: () => string;
     getDefaultDownloadsPath: () => Promise<string>;
diff --git a/src/renderer/src/pages/user/user-content.tsx b/src/renderer/src/pages/user/user-content.tsx
index 816f25a9..8c0db59a 100644
--- a/src/renderer/src/pages/user/user-content.tsx
+++ b/src/renderer/src/pages/user/user-content.tsx
@@ -17,7 +17,7 @@ const MAX_MINUTES_TO_SHOW_IN_PLAYTIME = 120;
 
 export interface ProfileContentProps {
   userProfile: UserProfile;
-  updateUserProfile: () => void;
+  updateUserProfile: () => Promise<void>;
 }
 
 export function UserContent({
@@ -70,10 +70,6 @@ export function UserContent({
     navigate("/");
   };
 
-  const handleUpdateUserProfile = async () => {
-    updateUserProfile();
-  };
-
   const isMe = userDetails?.id == userProfile.id;
 
   const profileContentBoxBackground = useMemo(() => {
@@ -87,7 +83,7 @@ export function UserContent({
       <UserEditProfileModal
         visible={showEditProfileModal}
         onClose={() => setShowEditProfileModal(false)}
-        updateUser={handleUpdateUserProfile}
+        updateUserProfile={updateUserProfile}
         userProfile={userProfile}
       />
 
diff --git a/src/renderer/src/pages/user/user-edit-modal.tsx b/src/renderer/src/pages/user/user-edit-modal.tsx
index 53712ab2..67d1a057 100644
--- a/src/renderer/src/pages/user/user-edit-modal.tsx
+++ b/src/renderer/src/pages/user/user-edit-modal.tsx
@@ -1,33 +1,36 @@
 import { Button, Modal, TextField } from "@renderer/components";
 import { UserProfile } from "@types";
 import * as styles from "./user.css";
-import { PencilIcon, PersonIcon } from "@primer/octicons-react";
+import { DeviceCameraIcon, PersonIcon } from "@primer/octicons-react";
 import { SPACING_UNIT } from "@renderer/theme.css";
-import { useState } from "react";
+import { useEffect, useMemo, useState } from "react";
 import { useToast, useUserDetails } from "@renderer/hooks";
 
 export interface UserEditProfileModalProps {
   userProfile: UserProfile;
   visible: boolean;
   onClose: () => void;
-  updateUser: () => Promise<void>;
+  updateUserProfile: () => Promise<void>;
 }
 
 export const UserEditProfileModal = ({
   userProfile,
   visible,
   onClose,
-  updateUser,
+  updateUserProfile,
 }: UserEditProfileModalProps) => {
-  const [displayName, setDisplayName] = useState(userProfile.displayName);
+  const [displayName, setDisplayName] = useState("");
   const [newImagePath, setNewImagePath] = useState<string | null>(null);
-  const [newImageBase64, setNewImageBase64] = useState<string | null>(null);
   const [isSaving, setIsSaving] = useState(false);
 
   const { patchUser } = useUserDetails();
 
   const { showSuccessToast, showErrorToast } = useToast();
 
+  useEffect(() => {
+    setDisplayName(userProfile.displayName);
+  }, [userProfile.displayName]);
+
   const handleChangeProfileAvatar = async () => {
     const { filePaths } = await window.electron.showOpenDialog({
       properties: ["openFile"],
@@ -42,19 +45,16 @@ export const UserEditProfileModal = ({
     if (filePaths && filePaths.length > 0) {
       const path = filePaths[0];
 
-      window.electron.imagePathToBase64(path).then((base64) => {
-        setNewImageBase64(base64);
-      });
-
       setNewImagePath(path);
     }
   };
 
   const handleSaveProfile = async () => {
     setIsSaving(true);
+
     patchUser(displayName, newImagePath)
-      .then(() => {
-        updateUser();
+      .then(async () => {
+        await updateUserProfile();
         showSuccessToast("Salvo com sucesso");
         cleanFormAndClose();
       })
@@ -69,7 +69,6 @@ export const UserEditProfileModal = ({
   const resetModal = () => {
     setDisplayName(userProfile.displayName);
     setNewImagePath(null);
-    setNewImageBase64(null);
   };
 
   const cleanFormAndClose = () => {
@@ -77,6 +76,12 @@ export const UserEditProfileModal = ({
     onClose();
   };
 
+  const avatarUrl = useMemo(() => {
+    if (newImagePath) return `local:${newImagePath}`;
+    if (userProfile.profileImageUrl) return userProfile.profileImageUrl;
+    return null;
+  }, [newImagePath, userProfile.profileImageUrl]);
+
   return (
     <>
       <Modal
@@ -84,7 +89,8 @@ export const UserEditProfileModal = ({
         title="Editar Perfil"
         onClose={cleanFormAndClose}
       >
-        <section
+        <form
+          onSubmit={handleSaveProfile}
           style={{
             display: "flex",
             flexDirection: "column",
@@ -95,20 +101,21 @@ export const UserEditProfileModal = ({
           }}
         >
           <button
+            type="button"
             className={styles.profileAvatarEditContainer}
             onClick={handleChangeProfileAvatar}
           >
-            {newImageBase64 || userProfile.profileImageUrl ? (
+            {avatarUrl ? (
               <img
                 className={styles.profileAvatar}
                 alt={userProfile.displayName}
-                src={newImageBase64 ?? userProfile.profileImageUrl ?? ""}
+                src={avatarUrl}
               />
             ) : (
               <PersonIcon size={96} />
             )}
             <div className={styles.editProfileImageBadge}>
-              <PencilIcon size={16} />
+              <DeviceCameraIcon size={16} />
             </div>
           </button>
 
@@ -121,11 +128,11 @@ export const UserEditProfileModal = ({
           <Button
             disabled={isSaving}
             style={{ alignSelf: "end" }}
-            onClick={handleSaveProfile}
+            type="submit"
           >
-            {isSaving ? "Salvando..." : "Salvar"}
+            {isSaving ? "Salvando…" : "Salvar"}
           </Button>
-        </section>
+        </form>
       </Modal>
     </>
   );
diff --git a/src/renderer/src/pages/user/user.tsx b/src/renderer/src/pages/user/user.tsx
index ce188d22..bce22211 100644
--- a/src/renderer/src/pages/user/user.tsx
+++ b/src/renderer/src/pages/user/user.tsx
@@ -16,7 +16,7 @@ export const User = () => {
   const dispatch = useAppDispatch();
 
   const getUserProfile = useCallback(() => {
-    window.electron.getUser(userId!).then((userProfile) => {
+    return window.electron.getUser(userId!).then((userProfile) => {
       if (userProfile) {
         dispatch(setHeaderTitle(userProfile.displayName));
         setUserProfile(userProfile);
@@ -28,9 +28,7 @@ export const User = () => {
     getUserProfile();
   }, [getUserProfile]);
 
-  const handleUpdateProfile = () => {
-    getUserProfile();
-  };
+  console.log(userProfile);
 
   return (
     <SkeletonTheme baseColor={vars.color.background} highlightColor="#444">
@@ -38,7 +36,7 @@ export const User = () => {
         {userProfile ? (
           <UserContent
             userProfile={userProfile}
-            updateUserProfile={handleUpdateProfile}
+            updateUserProfile={getUserProfile}
           />
         ) : (
           <UserSkeleton />