diff --git a/packages/web/src/plugins/PluginsList.svelte b/packages/web/src/plugins/PluginsList.svelte
index 6e2161ec..c0e09ab9 100644
--- a/packages/web/src/plugins/PluginsList.svelte
+++ b/packages/web/src/plugins/PluginsList.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import openNewTab from '../utility/openNewTab';
 
-  import { extractPluginAuthor, extractPluginIcon } from './manifestExtractors';
+  import { extractPluginAuthor, extractPluginDescription, extractPluginIcon } from './manifestExtractors';
 
   export let plugins: any[];
 
@@ -30,7 +30,7 @@
         {/if}
       </div>
       <div>
-        {(packageManifest.description?.indexOf('[![') >= 0 ? null : packageManifest.description) || '(No description)'}
+        {extractPluginDescription(packageManifest)}
       </div>
       <div class="bold">
         {extractPluginAuthor(packageManifest)}
diff --git a/packages/web/src/plugins/manifestExtractors.ts b/packages/web/src/plugins/manifestExtractors.ts
index b5545495..ad75d287 100644
--- a/packages/web/src/plugins/manifestExtractors.ts
+++ b/packages/web/src/plugins/manifestExtractors.ts
@@ -6,17 +6,24 @@ export function extractPluginIcon(packageManifest) {
   const homepage = (links && links.homepage) || packageManifest.homepage;
   const tested = repository || homepage || packageManifest.homepage;
 
+  if (packageManifest.description) {
+    const iconLink = packageManifest.description.match(/\!\[icon\]\(([^)]+)\)/, '');
+    if (iconLink) {
+      return iconLink[1];
+    }
+  }
+
   if (tested == 'https://dbgate.org' || tested == 'https://github.com/dbgate/dbgate') {
     // monorepo plugin
     return `https://github.com/dbgate/dbgate/raw/master/plugins/${packageManifest.name}/icon.svg`;
   }
 
-  if (tested) {
-    const match = tested.match(/https:\/\/github.com\/([^/]*)\/([^/]*)/);
-    if (match) {
-      return `https://raw.githubusercontent.com/${match[1]}/${match[2]}/master/icon.svg`;
-    }
-  }
+  // if (tested) {
+  //   const match = tested.match(/https:\/\/github.com\/([^/]*)\/([^/]*)/);
+  //   if (match) {
+  //     return `https://raw.githubusercontent.com/${match[1]}/${match[2]}/master/icon.svg`;
+  //   }
+  // }
   return 'unknown.svg';
 }
 
@@ -39,3 +46,11 @@ export function extractPluginAuthor(packageManifest) {
   }
   return '(Unknown author)';
 }
+
+export function extractPluginDescription(packageManifest) {
+  if (!packageManifest.description || packageManifest.description?.indexOf('[![') >= 0) {
+    return '(No description)';
+  }
+
+  return packageManifest.description.replace(/\!\[icon\]\([^)]+\)/, '').trim();
+}