diff --git a/src/renderer/components/item-list/helpers/item-list-state.ts b/src/renderer/components/item-list/helpers/item-list-state.ts
index e005d7ea9..468176b5d 100644
--- a/src/renderer/components/item-list/helpers/item-list-state.ts
+++ b/src/renderer/components/item-list/helpers/item-list-state.ts
@@ -109,6 +109,7 @@ export interface ItemListStateItem {
     _itemType: LibraryItem;
     _serverId: string;
     id: string;
+    imageId: null | string;
 }
 
 export type ItemListStateItemWithRequiredProperties = Record<string, unknown> & {
diff --git a/src/renderer/components/item-list/item-table-list/hooks/use-table-imperative-handle.ts b/src/renderer/components/item-list/item-table-list/hooks/use-table-imperative-handle.ts
index 96aa2db98..9d304bec0 100644
--- a/src/renderer/components/item-list/item-table-list/hooks/use-table-imperative-handle.ts
+++ b/src/renderer/components/item-list/item-table-list/hooks/use-table-imperative-handle.ts
@@ -1,6 +1,7 @@
 import { useEffect, useImperativeHandle, useMemo } from 'react';
 
-import { ItemListHandle, ItemListStateActions } from '/@/renderer/components/item-list/types';
+import { ItemListStateActions } from '/@/renderer/components/item-list/helpers/item-list-state';
+import { ItemListHandle } from '/@/renderer/components/item-list/types';
 
 interface UseTableImperativeHandleProps {
     enableHeader: boolean;
diff --git a/src/renderer/features/albums/context/album-list-context.tsx b/src/renderer/features/albums/context/album-list-context.tsx
deleted file mode 100644
index bd7a6bbb0..000000000
--- a/src/renderer/features/albums/context/album-list-context.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-import { createContext, useContext } from 'react';
-
-import { ListKey } from '/@/renderer/store';
-
-export const AlbumListContext = createContext<{ id?: string; pageKey: ListKey }>({
-    pageKey: 'album',
-});
-
-export const useAlbumListContext = () => {
-    const ctxValue = useContext(AlbumListContext);
-    return ctxValue;
-};
diff --git a/src/renderer/features/artists/components/album-artist-detail-header.tsx b/src/renderer/features/artists/components/album-artist-detail-header.tsx
index cd354296a..d77cf55de 100644
--- a/src/renderer/features/artists/components/album-artist-detail-header.tsx
+++ b/src/renderer/features/artists/components/album-artist-detail-header.tsx
@@ -13,6 +13,8 @@ import {
     LibraryHeader,
     LibraryHeaderMenu,
 } from '/@/renderer/features/shared/components/library-header';
+import { useSetFavorite } from '/@/renderer/features/shared/hooks/use-set-favorite';
+import { useSetRating } from '/@/renderer/features/shared/hooks/use-set-rating';
 import { AppRoute } from '/@/renderer/router/routes';
 import { useCurrentServer, useShowRatings } from '/@/renderer/store';
 import { usePlayButtonBehavior } from '/@/renderer/store/settings.store';
@@ -65,7 +67,9 @@ export const AlbumArtistDetailHeader = forwardRef((_props, ref: Ref<HTMLDivEleme
         },
     ];
 
-    const { addToQueueByFetch, setFavorite, setRating } = usePlayer();
+    const { addToQueueByFetch } = usePlayer();
+    const setFavorite = useSetFavorite();
+    const setRating = useSetRating();
     const playButtonBehavior = usePlayButtonBehavior();
 
     const handlePlay = useCallback(
diff --git a/src/renderer/features/settings/components/window/password-settings.tsx b/src/renderer/features/settings/components/window/password-settings.tsx
index ff9da9592..bf05dfe96 100644
--- a/src/renderer/features/settings/components/window/password-settings.tsx
+++ b/src/renderer/features/settings/components/window/password-settings.tsx
@@ -53,5 +53,5 @@ export const PasswordSettings = memo(() => {
         },
     ];
 
-    return <SettingsSection divider={false} options={updateOptions} />;
+    return <SettingsSection options={updateOptions} />;
 });