diff --git a/src/components/cardbuilder/Card/CardContent.tsx b/src/components/cardbuilder/Card/CardContent.tsx
index 3d846758a4..11a443fb90 100644
--- a/src/components/cardbuilder/Card/CardContent.tsx
+++ b/src/components/cardbuilder/Card/CardContent.tsx
@@ -32,7 +32,7 @@ const CardContent: FC<CardContentProps> = ({
 
     return (
         <div
-            className={`${cardContentClass}`}
+            className={cardContentClass}
         >
             <CardImageContainer
                 item={item}
diff --git a/src/components/cardbuilder/Card/cardHelper.ts b/src/components/cardbuilder/Card/cardHelper.ts
index b6f8c37ab1..b07289dfc2 100644
--- a/src/components/cardbuilder/Card/cardHelper.ts
+++ b/src/components/cardbuilder/Card/cardHelper.ts
@@ -5,6 +5,7 @@ import {
     ImageType
 } from '@jellyfin/sdk/lib/generated-client';
 import { Api } from '@jellyfin/sdk';
+import { getImageApi } from '@jellyfin/sdk/lib/utils/api/image-api';
 import escapeHTML from 'escape-html';
 
 import { appRouter } from 'components/router/appRouter';
@@ -45,7 +46,7 @@ export function getCardLogoUrl(
     }
 
     if (api && imgTag && imgType && itemId) {
-        const response = api.getItemImageUrl(itemId, imgType, {
+        const response = getImageApi(api).getItemImageUrlById(itemId, imgType, {
             height: logoHeight,
             tag: imgTag
         });
diff --git a/src/components/cardbuilder/Card/useCardImageUrl.ts b/src/components/cardbuilder/Card/useCardImageUrl.ts
index ef1cb6ab61..3e1997d542 100644
--- a/src/components/cardbuilder/Card/useCardImageUrl.ts
+++ b/src/components/cardbuilder/Card/useCardImageUrl.ts
@@ -1,12 +1,11 @@
 import { BaseItemKind, ImageType } from '@jellyfin/sdk/lib/generated-client';
+import { getImageApi } from '@jellyfin/sdk/lib/utils/api/image-api';
 import { useApi } from 'hooks/useApi';
 import { getDesiredAspect } from '../cardBuilderUtils';
 
-import type { ItemDto } from 'types/itemDto';
+import type { ItemDto, NullableNumber, NullableString } from 'types/itemDto';
 import type { CardOptions } from 'types/cardOptions';
 
-type ShapeType = string | null | undefined;
-
 function getPreferThumbInfo(item: ItemDto, cardOptions: CardOptions) {
     let imgType;
     let itemId;
@@ -73,11 +72,11 @@ function getPreferLogoInfo(item: ItemDto) {
 }
 
 function getCalculatedHeight(
-    width: number | undefined,
-    primaryImageAspectRatio: number | null | undefined
+    itemWidth: NullableNumber,
+    itemPrimaryImageAspectRatio: NullableNumber
 ) {
-    if (width && primaryImageAspectRatio) {
-        return Math.round(width / primaryImageAspectRatio);
+    if (itemWidth && itemPrimaryImageAspectRatio) {
+        return Math.round(itemWidth / itemPrimaryImageAspectRatio);
     }
 }
 
@@ -86,20 +85,20 @@ function isForceName(cardOptions: CardOptions) {
 }
 
 function isCoverImage(
-    primaryImageAspectRatio: number | null | undefined,
-    uiAspect: number | null
+    itemPrimaryImageAspectRatio: NullableNumber,
+    uiAspect: NullableNumber
 ) {
-    if (primaryImageAspectRatio && uiAspect) {
-        return Math.abs(primaryImageAspectRatio - uiAspect) / uiAspect <= 0.2;
+    if (itemPrimaryImageAspectRatio && uiAspect) {
+        return Math.abs(itemPrimaryImageAspectRatio - uiAspect) / uiAspect <= 0.2;
     }
 
     return false;
 }
 
 function shouldShowPreferBanner(
-    imageTagsBanner: string | undefined,
+    imageTagsBanner: NullableString,
     cardOptions: CardOptions,
-    shape: ShapeType
+    shape: NullableString
 ): boolean {
     return (
         (cardOptions.preferBanner || shape === 'banner')
@@ -125,20 +124,20 @@ function shouldShowImageTagsThumb(item: ItemDto): boolean {
 }
 
 function shouldShowSeriesThumbImageTag(
-    item: ItemDto,
+    itemSeriesThumbImageTag: NullableString,
     cardOptions: CardOptions
 ): boolean {
     return (
-        Boolean(item.SeriesThumbImageTag) && cardOptions.inheritThumb !== false
+        Boolean(itemSeriesThumbImageTag) && cardOptions.inheritThumb !== false
     );
 }
 
 function shouldShowParentThumbImageTag(
-    item: ItemDto,
+    itemParentThumbItemId: NullableString,
     cardOptions: CardOptions
 ): boolean {
     return (
-        Boolean(item.ParentThumbItemId) && cardOptions.inheritThumb !== false
+        Boolean(itemParentThumbItemId) && cardOptions.inheritThumb !== false
     );
 }
 
@@ -146,14 +145,14 @@ function shouldShowParentBackdropImageTags(item: ItemDto): boolean {
     return Boolean(item.AlbumId) && Boolean(item.AlbumPrimaryImageTag);
 }
 
-function shouldShowPreferThumb(type: string | null | undefined, cardOptions: CardOptions): boolean {
-    return Boolean(cardOptions.preferThumb) && !(type === BaseItemKind.Program || type === BaseItemKind.Episode);
+function shouldShowPreferThumb(itemType: NullableString, cardOptions: CardOptions): boolean {
+    return Boolean(cardOptions.preferThumb) && !(itemType === BaseItemKind.Program || itemType === BaseItemKind.Episode);
 }
 
 function getCardImageInfo(
     item: ItemDto,
     cardOptions: CardOptions,
-    shape: ShapeType
+    shape: NullableString
 ) {
     const width = cardOptions.width;
     let height;
@@ -221,15 +220,11 @@ function getCardImageInfo(
         imgType = ImageType.Backdrop;
         imgTag = item.BackdropImageTags[0];
         itemId = item.Id;
-        /*} else if (item.ImageTags?.Thumb) {
-        imgType = ImageType.Thumb;
-        imgTag = item.ImageTags.Thumb;
-        itemId = item.Id;*/
-    } else if (shouldShowSeriesThumbImageTag(item, cardOptions)) {
+    } else if (shouldShowSeriesThumbImageTag(item.SeriesThumbImageTag, cardOptions)) {
         imgType = ImageType.Thumb;
         imgTag = item.SeriesThumbImageTag;
         itemId = item.SeriesId;
-    } else if (shouldShowParentThumbImageTag(item, cardOptions)) {
+    } else if (shouldShowParentThumbImageTag(item.ParentThumbItemId, cardOptions)) {
         imgType = ImageType.Thumb;
         imgTag = item.ParentThumbImageTag;
         itemId = item.ParentThumbItemId;
@@ -256,7 +251,7 @@ function getCardImageInfo(
 interface UseCardImageUrlProps {
     item: ItemDto;
     cardOptions: CardOptions;
-    shape: ShapeType;
+    shape: NullableString;
 }
 
 function useCardImageUrl({ item, cardOptions, shape }: UseCardImageUrlProps) {
@@ -280,7 +275,7 @@ function useCardImageUrl({ item, cardOptions, shape }: UseCardImageUrlProps) {
         if (height) {
             height = Math.round(height * ratio);
         }
-        imgUrl = api?.getItemImageUrl(itemId, imgType, {
+        imgUrl = getImageApi(api).getItemImageUrlById(itemId, imgType, {
             quality: 96,
             fillWidth: width,
             fillHeight: height,
diff --git a/src/components/listview/List/listHelper.ts b/src/components/listview/List/listHelper.ts
index d2ab794ea4..8386ff3273 100644
--- a/src/components/listview/List/listHelper.ts
+++ b/src/components/listview/List/listHelper.ts
@@ -1,5 +1,6 @@
 import { Api } from '@jellyfin/sdk';
 import { BaseItemKind, ImageType } from '@jellyfin/sdk/lib/generated-client';
+import { getImageApi } from '@jellyfin/sdk/lib/utils/api/image-api';
 import globalize from 'scripts/globalize';
 
 import type { ItemDto } from 'types/itemDto';
@@ -110,7 +111,7 @@ export function getImageUrl(
     }
 
     if (api && imgTag && imgType && itemId) {
-        const response = api.getItemImageUrl(itemId, imgType, {
+        const response = getImageApi(api).getItemImageUrlById(itemId, imgType, {
             fillWidth: fillWidth,
             fillHeight: fillHeight,
             tag: imgTag