diff --git a/package.json b/package.json
index a281ba2a690..25f7bc5ca90 100644
--- a/package.json
+++ b/package.json
@@ -354,7 +354,7 @@
     "react-grid-layout": "1.3.4",
     "react-highlight-words": "0.18.0",
     "react-hook-form": "7.5.3",
-    "react-inlinesvg": "2.3.0",
+    "react-inlinesvg": "3.0.0",
     "react-loadable": "5.5.0",
     "react-moveable": "0.32.7",
     "react-popper": "2.3.0",
diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json
index 0c613f00dc0..01c999b4d89 100644
--- a/packages/grafana-ui/package.json
+++ b/packages/grafana-ui/package.json
@@ -75,7 +75,7 @@
     "react-dropzone": "12.0.4",
     "react-highlight-words": "0.18.0",
     "react-hook-form": "7.5.3",
-    "react-inlinesvg": "2.3.0",
+    "react-inlinesvg": "3.0.0",
     "react-popper": "2.3.0",
     "react-popper-tooltip": "^4.3.1",
     "react-router-dom": "^5.2.0",
diff --git a/packages/grafana-ui/src/components/Icon/iconBundle.ts b/packages/grafana-ui/src/components/Icon/iconBundle.ts
index 67737b810a5..69ce1355936 100644
--- a/packages/grafana-ui/src/components/Icon/iconBundle.ts
+++ b/packages/grafana-ui/src/components/Icon/iconBundle.ts
@@ -168,7 +168,7 @@ export let cacheInitialized = false;
 export let iconRoot = 'public/img/icons';
 
 function cacheItem(content: string, path: string) {
-  cacheStore[iconRoot + path] = { content, status: 'loaded', queue: [] };
+  cacheStore[iconRoot + path] = { content, status: 'loaded' };
 }
 
 export function initIconCache() {
diff --git a/yarn.lock b/yarn.lock
index 5632e8b54fa..26dbd7ab2b4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4445,7 +4445,7 @@ __metadata:
     react-dropzone: 12.0.4
     react-highlight-words: 0.18.0
     react-hook-form: 7.5.3
-    react-inlinesvg: 2.3.0
+    react-inlinesvg: 3.0.0
     react-popper: 2.3.0
     react-popper-tooltip: ^4.3.1
     react-router-dom: ^5.2.0
@@ -20477,7 +20477,7 @@ __metadata:
     react-grid-layout: 1.3.4
     react-highlight-words: 0.18.0
     react-hook-form: 7.5.3
-    react-inlinesvg: 2.3.0
+    react-inlinesvg: 3.0.0
     react-loadable: 5.5.0
     react-moveable: 0.32.7
     react-popper: 2.3.0
@@ -30250,12 +30250,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-from-dom@npm:^0.6.0":
-  version: 0.6.1
-  resolution: "react-from-dom@npm:0.6.1"
+"react-from-dom@npm:^0.6.2":
+  version: 0.6.2
+  resolution: "react-from-dom@npm:0.6.2"
   peerDependencies:
-    react: ^15.0.0 || ^16.0.0 || ^17.0.0
-  checksum: 2b642ce9000fca9583c4162a117bfcaa72f7645be4fb4a709d4c5620f0f5de09132b95e996c687a347f9919cdcc385dae511a18482524d5e7ab0bd7883ce3e51
+    react: ^16.8.0 || ^17.0.0 || ^18.0.0
+  checksum: 5d66b0c1eb591247a73bed9487a04e390abb4ad6c65e6cea7bfdd35070685b90a5da720de30915b963aba3f4628135d6db4c93da40cd5114c8bbe34a9725a83e
   languageName: node
   linkType: hard
 
@@ -30347,15 +30347,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-inlinesvg@npm:2.3.0":
-  version: 2.3.0
-  resolution: "react-inlinesvg@npm:2.3.0"
+"react-inlinesvg@npm:3.0.0":
+  version: 3.0.0
+  resolution: "react-inlinesvg@npm:3.0.0"
   dependencies:
     exenv: ^1.2.2
-    react-from-dom: ^0.6.0
+    react-from-dom: ^0.6.2
   peerDependencies:
-    react: ^16.8.0 || ^17.0.0
-  checksum: ea43f6ec069ae6ef5be65fe587bf3fbaae0668124ddf7ec7b4f569cd4b6a32654897065019611d3a068e69275727f5918b9218d1b3f368f2a8d5198aaaf93a17
+    react: ^16.8.0 || ^17.0.0 || ^18.0.0
+  checksum: ceb34c4c5494e4992a1949c7e6166f373858a40215a8e900f360ce60053b19dd6da8637ca87770b953c449ddfa48c52ec288e09978660de92f51aac25b110a71
   languageName: node
   linkType: hard