diff --git a/apps/nextjs/src/app/[locale]/manage/medias/_actions/upload-media.tsx b/apps/nextjs/src/app/[locale]/manage/medias/_actions/upload-media.tsx
index 72b880fc9..f8164cdac 100644
--- a/apps/nextjs/src/app/[locale]/manage/medias/_actions/upload-media.tsx
+++ b/apps/nextjs/src/app/[locale]/manage/medias/_actions/upload-media.tsx
@@ -1,15 +1,40 @@
 "use client";
 
+import type { JSX } from "react";
 import { Button, FileButton } from "@mantine/core";
 import { IconUpload } from "@tabler/icons-react";
 
 import { clientApi } from "@homarr/api/client";
 import { revalidatePathActionAsync } from "@homarr/common/client";
+import type { MaybePromise } from "@homarr/common/types";
 import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
 import { useI18n } from "@homarr/translation/client";
 import { supportedMediaUploadFormats } from "@homarr/validation";
 
-export const UploadMedia = () => {
+export const UploadMediaButton = () => {
+  const t = useI18n();
+  const onSettledAsync = async () => {
+    await revalidatePathActionAsync("/manage/medias");
+  };
+
+  return (
+    <UploadMedia onSettled={onSettledAsync}>
+      {({ onClick, loading }) => (
+        <Button onClick={onClick} loading={loading} rightSection={<IconUpload size={16} stroke={1.5} />}>
+          {t("media.action.upload.label")}
+        </Button>
+      )}
+    </UploadMedia>
+  );
+};
+
+interface UploadMediaProps {
+  children: (props: { onClick: () => void; loading: boolean }) => JSX.Element;
+  onSettled?: () => MaybePromise<void>;
+  onSuccess?: (media: { id: string; url: string }) => MaybePromise<void>;
+}
+
+export const UploadMedia = ({ children, onSettled, onSuccess }: UploadMediaProps) => {
   const t = useI18n();
   const { mutateAsync, isPending } = clientApi.media.uploadMedia.useMutation();
 
@@ -18,10 +43,14 @@ export const UploadMedia = () => {
     const formData = new FormData();
     formData.append("file", file);
     await mutateAsync(formData, {
-      onSuccess() {
+      async onSuccess(mediaId) {
         showSuccessNotification({
           message: t("media.action.upload.notification.success.message"),
         });
+        await onSuccess?.({
+          id: mediaId,
+          url: `/api/user-medias/${mediaId}`,
+        });
       },
       onError() {
         showErrorNotification({
@@ -29,18 +58,14 @@ export const UploadMedia = () => {
         });
       },
       async onSettled() {
-        await revalidatePathActionAsync("/manage/medias");
+        await onSettled?.();
       },
     });
   };
 
   return (
     <FileButton onChange={handleFileUploadAsync} accept={supportedMediaUploadFormats.join(",")}>
-      {({ onClick }) => (
-        <Button onClick={onClick} loading={isPending} rightSection={<IconUpload size={16} stroke={1.5} />}>
-          {t("media.action.upload.label")}
-        </Button>
-      )}
+      {({ onClick }) => children({ onClick, loading: isPending })}
     </FileButton>
   );
 };
diff --git a/apps/nextjs/src/app/[locale]/manage/medias/page.tsx b/apps/nextjs/src/app/[locale]/manage/medias/page.tsx
index 17c01f519..ed50a18ad 100644
--- a/apps/nextjs/src/app/[locale]/manage/medias/page.tsx
+++ b/apps/nextjs/src/app/[locale]/manage/medias/page.tsx
@@ -16,7 +16,7 @@ import { DynamicBreadcrumb } from "~/components/navigation/dynamic-breadcrumb";
 import { CopyMedia } from "./_actions/copy-media";
 import { DeleteMedia } from "./_actions/delete-media";
 import { IncludeFromAllUsersSwitch } from "./_actions/show-all";
-import { UploadMedia } from "./_actions/upload-media";
+import { UploadMediaButton } from "./_actions/upload-media";
 
 const searchParamsSchema = z.object({
   search: z.string().optional(),
@@ -61,7 +61,7 @@ export default async function GroupsListPage(props: MediaListPageProps) {
             )}
           </Group>
 
-          {session.user.permissions.includes("media-upload") && <UploadMedia />}
+          {session.user.permissions.includes("media-upload") && <UploadMediaButton />}
         </Group>
         <Table striped highlightOnHover>
           <TableThead>
diff --git a/apps/nextjs/src/components/icons/picker/icon-picker.tsx b/apps/nextjs/src/components/icons/picker/icon-picker.tsx
index 432142dbf..d0758a66e 100644
--- a/apps/nextjs/src/components/icons/picker/icon-picker.tsx
+++ b/apps/nextjs/src/components/icons/picker/icon-picker.tsx
@@ -1,10 +1,12 @@
 import type { FocusEventHandler } from "react";
 import { startTransition, useState } from "react";
 import {
+  ActionIcon,
   Box,
   Card,
   Combobox,
   Flex,
+  Group,
   Image,
   Indicator,
   InputBase,
@@ -16,10 +18,13 @@ import {
   useCombobox,
 } from "@mantine/core";
 import { useDebouncedValue } from "@mantine/hooks";
+import { IconUpload } from "@tabler/icons-react";
 
 import { clientApi } from "@homarr/api/client";
+import { useSession } from "@homarr/auth/client";
 import { useScopedI18n } from "@homarr/translation/client";
 
+import { UploadMedia } from "~/app/[locale]/manage/medias/_actions/upload-media";
 import classes from "./icon-picker.module.css";
 
 interface IconPickerProps {
@@ -34,6 +39,7 @@ export const IconPicker = ({ initialValue, onChange, error, onFocus, onBlur }: I
   const [value, setValue] = useState<string>(initialValue ?? "");
   const [search, setSearch] = useState(initialValue ?? "");
   const [previewUrl, setPreviewUrl] = useState<string | null>(initialValue ?? null);
+  const { data: session } = useSession();
 
   const tCommon = useScopedI18n("common");
 
@@ -105,40 +111,61 @@ export const IconPicker = ({ initialValue, onChange, error, onFocus, onBlur }: I
   return (
     <Combobox store={combobox} withinPortal>
       <Combobox.Target>
-        <InputBase
-          rightSection={<Combobox.Chevron />}
-          leftSection={
-            previewUrl ? (
-              // eslint-disable-next-line @next/next/no-img-element
-              <img src={previewUrl} alt="" style={{ width: 20, height: 20 }} />
-            ) : null
-          }
-          value={search}
-          onChange={(event) => {
-            combobox.openDropdown();
-            combobox.updateSelectedOptionIndex();
-            setSearch(event.currentTarget.value);
-            setValue(event.currentTarget.value);
-            setPreviewUrl(null);
-            onChange(event.currentTarget.value);
-          }}
-          onClick={() => combobox.openDropdown()}
-          onFocus={(event) => {
-            onFocus?.(event);
-            combobox.openDropdown();
-          }}
-          onBlur={(event) => {
-            onBlur?.(event);
-            combobox.closeDropdown();
-            setPreviewUrl(value);
-            setSearch(value || "");
-          }}
-          rightSectionPointerEvents="none"
-          withAsterisk
-          error={error}
-          label={tCommon("iconPicker.label")}
-          placeholder={tCommon("iconPicker.header", { countIcons: data?.countIcons ?? 0 })}
-        />
+        <Group wrap="nowrap" gap="xs" w="100%" align="start">
+          <InputBase
+            flex={1}
+            rightSection={<Combobox.Chevron />}
+            leftSection={
+              previewUrl ? (
+                // eslint-disable-next-line @next/next/no-img-element
+                <img src={previewUrl} alt="" style={{ width: 20, height: 20 }} />
+              ) : null
+            }
+            value={search}
+            onChange={(event) => {
+              combobox.openDropdown();
+              combobox.updateSelectedOptionIndex();
+              setSearch(event.currentTarget.value);
+              setValue(event.currentTarget.value);
+              setPreviewUrl(null);
+              onChange(event.currentTarget.value);
+            }}
+            onClick={() => combobox.openDropdown()}
+            onFocus={(event) => {
+              onFocus?.(event);
+              combobox.openDropdown();
+            }}
+            onBlur={(event) => {
+              onBlur?.(event);
+              combobox.closeDropdown();
+              setPreviewUrl(value);
+              setSearch(value || "");
+            }}
+            rightSectionPointerEvents="none"
+            withAsterisk
+            error={error}
+            label={tCommon("iconPicker.label")}
+            placeholder={tCommon("iconPicker.header", { countIcons: data?.countIcons ?? 0 })}
+          />
+          {session?.user.permissions.includes("media-upload") && (
+            <UploadMedia
+              onSuccess={({ url }) => {
+                startTransition(() => {
+                  setValue(url);
+                  setPreviewUrl(url);
+                  setSearch(url);
+                  onChange(url);
+                });
+              }}
+            >
+              {({ onClick, loading }) => (
+                <ActionIcon onClick={onClick} loading={loading} mt={24} size={36} variant="default">
+                  <IconUpload size={16} stroke={1.5} />
+                </ActionIcon>
+              )}
+            </UploadMedia>
+          )}
+        </Group>
       </Combobox.Target>
 
       <Combobox.Dropdown>