diff --git a/server/src/main/kotlin/ir/armor/tachidesk/util/Extension.kt b/server/src/main/kotlin/ir/armor/tachidesk/util/Extension.kt
index 3c47f6b3..92b22f2e 100644
--- a/server/src/main/kotlin/ir/armor/tachidesk/util/Extension.kt
+++ b/server/src/main/kotlin/ir/armor/tachidesk/util/Extension.kt
@@ -166,3 +166,7 @@ fun getExtensionIcon(apkName: String): Pair<InputStream, String> {
         ).execute()
     }
 }
+
+fun getExtensionIconUrl(apkName: String): String {
+    return "http://127.0.0.1:4567/api/v1/extension/icon/$apkName"
+}
diff --git a/server/src/main/kotlin/ir/armor/tachidesk/util/ExtensionsList.kt b/server/src/main/kotlin/ir/armor/tachidesk/util/ExtensionsList.kt
index 0a16c64b..bed95bb9 100644
--- a/server/src/main/kotlin/ir/armor/tachidesk/util/ExtensionsList.kt
+++ b/server/src/main/kotlin/ir/armor/tachidesk/util/ExtensionsList.kt
@@ -80,7 +80,7 @@ fun getExtensionList(offline: Boolean = false): List<ExtensionDataClass> {
                 it[ExtensionsTable.lang],
                 it[ExtensionsTable.isNsfw],
                 it[ExtensionsTable.apkName],
-                it[ExtensionsTable.iconUrl],
+                getExtensionIconUrl(it[ExtensionsTable.apkName]),
                 it[ExtensionsTable.installed],
                 it[ExtensionsTable.classFQName]
             )
diff --git a/server/src/main/kotlin/ir/armor/tachidesk/util/SourceList.kt b/server/src/main/kotlin/ir/armor/tachidesk/util/SourceList.kt
index cf3edc7a..7d6e9143 100644
--- a/server/src/main/kotlin/ir/armor/tachidesk/util/SourceList.kt
+++ b/server/src/main/kotlin/ir/armor/tachidesk/util/SourceList.kt
@@ -78,7 +78,7 @@ fun getSourceList(): List<SourceDataClass> {
                 it[SourceTable.id].value.toString(),
                 it[SourceTable.name],
                 Locale(it[SourceTable.lang]).getDisplayLanguage(Locale(it[SourceTable.lang])),
-                ExtensionsTable.select { ExtensionsTable.id eq it[SourceTable.extension] }.first()[ExtensionsTable.iconUrl],
+                getExtensionIconUrl(ExtensionsTable.select { ExtensionsTable.id eq it[SourceTable.extension] }.first()[ExtensionsTable.apkName]),
                 getHttpSource(it[SourceTable.id].value).supportsLatest
             )
         }
diff --git a/webUI/react/src/components/ExtensionCard.tsx b/webUI/react/src/components/ExtensionCard.tsx
index 78b0c624..26e75887 100644
--- a/webUI/react/src/components/ExtensionCard.tsx
+++ b/webUI/react/src/components/ExtensionCard.tsx
@@ -43,7 +43,7 @@ interface IProps {
 export default function ExtensionCard(props: IProps) {
     const {
         extension: {
-            name, lang, versionName, installed, apkName,
+            name, lang, versionName, installed, apkName, iconUrl,
         },
     } = props;
     const [installedState, setInstalledState] = useState<string>((installed ? 'uninstall' : 'install'));
@@ -81,7 +81,7 @@ export default function ExtensionCard(props: IProps) {
                         variant="rounded"
                         className={classes.icon}
                         alt={name}
-                        src={`http://127.0.0.1:4567/api/v1/extension/icon/${apkName}`}
+                        src={iconUrl}
                     />
                     <div style={{ display: 'flex', flexDirection: 'column' }}>
                         <Typography variant="h5" component="h2">