diff --git a/public/app/core/icons/cached.json b/public/app/core/icons/cached.json
index 4bfb615427e..9d2af6a7ff5 100644
--- a/public/app/core/icons/cached.json
+++ b/public/app/core/icons/cached.json
@@ -25,6 +25,7 @@
   "unicons/bell-slash",
   "unicons/bolt",
   "unicons/book",
+  "unicons/bookmark",
   "unicons/book-open",
   "unicons/brackets-curly",
   "unicons/bug",
@@ -170,5 +171,6 @@
   "mono/heart-break",
   "mono/panel-add",
   "mono/library-panel",
-  "unicons/record-audio"
+  "unicons/record-audio",
+  "solid/bookmark"
 ]
diff --git a/public/app/core/icons/iconBundle.ts b/public/app/core/icons/iconBundle.ts
index f493d0a71c2..b8ed8ae2cbf 100644
--- a/public/app/core/icons/iconBundle.ts
+++ b/public/app/core/icons/iconBundle.ts
@@ -33,152 +33,154 @@ import u1022 from '../../../img/icons/unicons/bell.svg';
 import u1023 from '../../../img/icons/unicons/bell-slash.svg';
 import u1024 from '../../../img/icons/unicons/bolt.svg';
 import u1025 from '../../../img/icons/unicons/book.svg';
-import u1026 from '../../../img/icons/unicons/book-open.svg';
-import u1027 from '../../../img/icons/unicons/brackets-curly.svg';
-import u1028 from '../../../img/icons/unicons/bug.svg';
-import u1029 from '../../../img/icons/unicons/building.svg';
-import u1030 from '../../../img/icons/unicons/calculator-alt.svg';
-import u1031 from '../../../img/icons/unicons/calendar-alt.svg';
-import u1032 from '../../../img/icons/unicons/calendar-slash.svg';
-import u1033 from '../../../img/icons/unicons/camera.svg';
-import u1034 from '../../../img/icons/unicons/channel-add.svg';
-import u1035 from '../../../img/icons/unicons/chart-line.svg';
-import u1036 from '../../../img/icons/unicons/check.svg';
-import u1037 from '../../../img/icons/unicons/check-circle.svg';
-import u1038 from '../../../img/icons/unicons/circle.svg';
-import u1039 from '../../../img/icons/unicons/clipboard-alt.svg';
-import u1040 from '../../../img/icons/unicons/clock-nine.svg';
-import u1041 from '../../../img/icons/unicons/cloud.svg';
-import u1042 from '../../../img/icons/unicons/cloud-download.svg';
-import u1043 from '../../../img/icons/unicons/code-branch.svg';
-import u1044 from '../../../img/icons/unicons/cog.svg';
-import u1045 from '../../../img/icons/unicons/columns.svg';
-import u1046 from '../../../img/icons/unicons/comment-alt.svg';
-import u1047 from '../../../img/icons/unicons/comment-alt-share.svg';
-import u1048 from '../../../img/icons/unicons/comments-alt.svg';
-import u1049 from '../../../img/icons/unicons/compass.svg';
-import u1050 from '../../../img/icons/unicons/copy.svg';
-import u1051 from '../../../img/icons/unicons/corner-down-right-alt.svg';
-import u1052 from '../../../img/icons/unicons/cube.svg';
-import u1053 from '../../../img/icons/unicons/dashboard.svg';
-import u1054 from '../../../img/icons/unicons/database.svg';
-import u1055 from '../../../img/icons/unicons/document-info.svg';
-import u1056 from '../../../img/icons/unicons/download-alt.svg';
-import u1057 from '../../../img/icons/unicons/draggabledots.svg';
-import u1058 from '../../../img/icons/unicons/edit.svg';
-import u1059 from '../../../img/icons/unicons/ellipsis-v.svg';
-import u1060 from '../../../img/icons/unicons/ellipsis-h.svg';
-import u1061 from '../../../img/icons/unicons/envelope.svg';
-import u1062 from '../../../img/icons/unicons/exchange-alt.svg';
-import u1063 from '../../../img/icons/unicons/exclamation-circle.svg';
-import u1064 from '../../../img/icons/unicons/exclamation-triangle.svg';
-import u1065 from '../../../img/icons/unicons/external-link-alt.svg';
-import u1066 from '../../../img/icons/unicons/eye.svg';
-import u1067 from '../../../img/icons/unicons/eye-slash.svg';
-import u1068 from '../../../img/icons/unicons/file-alt.svg';
-import u1069 from '../../../img/icons/unicons/file-blank.svg';
-import u1070 from '../../../img/icons/unicons/filter.svg';
-import u1071 from '../../../img/icons/unicons/folder.svg';
-import u1072 from '../../../img/icons/unicons/folder-open.svg';
-import u1073 from '../../../img/icons/unicons/folder-plus.svg';
-import u1074 from '../../../img/icons/unicons/folder-upload.svg';
-import u1075 from '../../../img/icons/unicons/forward.svg';
-import u1076 from '../../../img/icons/unicons/graph-bar.svg';
-import u1077 from '../../../img/icons/unicons/history.svg';
-import u1078 from '../../../img/icons/unicons/history-alt.svg';
-import u1079 from '../../../img/icons/unicons/home-alt.svg';
-import u1080 from '../../../img/icons/unicons/import.svg';
-import u1081 from '../../../img/icons/unicons/info.svg';
-import u1082 from '../../../img/icons/unicons/info-circle.svg';
-import u1083 from '../../../img/icons/unicons/k6.svg';
-import u1084 from '../../../img/icons/unicons/key-skeleton-alt.svg';
-import u1085 from '../../../img/icons/unicons/keyboard.svg';
-import u1086 from '../../../img/icons/unicons/link.svg';
-import u1087 from '../../../img/icons/unicons/list-ul.svg';
-import u1088 from '../../../img/icons/unicons/lock.svg';
-import u1089 from '../../../img/icons/unicons/minus.svg';
-import u1090 from '../../../img/icons/unicons/minus-circle.svg';
-import u1091 from '../../../img/icons/unicons/mobile-android.svg';
-import u1092 from '../../../img/icons/unicons/monitor.svg';
-import u1093 from '../../../img/icons/unicons/pause.svg';
-import u1094 from '../../../img/icons/unicons/pen.svg';
-import u1095 from '../../../img/icons/unicons/play.svg';
-import u1096 from '../../../img/icons/unicons/plug.svg';
-import u1097 from '../../../img/icons/unicons/plus.svg';
-import u1098 from '../../../img/icons/unicons/plus-circle.svg';
-import u1099 from '../../../img/icons/unicons/power.svg';
-import u1100 from '../../../img/icons/unicons/presentation-play.svg';
-import u1101 from '../../../img/icons/unicons/process.svg';
-import u1102 from '../../../img/icons/unicons/question-circle.svg';
-import u1103 from '../../../img/icons/unicons/repeat.svg';
-import u1104 from '../../../img/icons/unicons/rocket.svg';
-import u1105 from '../../../img/icons/unicons/rss.svg';
-import u1106 from '../../../img/icons/unicons/save.svg';
-import u1107 from '../../../img/icons/unicons/search.svg';
-import u1108 from '../../../img/icons/unicons/search-minus.svg';
-import u1109 from '../../../img/icons/unicons/search-plus.svg';
-import u1110 from '../../../img/icons/unicons/share-alt.svg';
-import u1111 from '../../../img/icons/unicons/shield.svg';
-import u1112 from '../../../img/icons/unicons/signal.svg';
-import u1113 from '../../../img/icons/unicons/signin.svg';
-import u1114 from '../../../img/icons/unicons/signout.svg';
-import u1115 from '../../../img/icons/unicons/sitemap.svg';
-import u1116 from '../../../img/icons/unicons/slack.svg';
-import u1117 from '../../../img/icons/unicons/sliders-v-alt.svg';
-import u1118 from '../../../img/icons/unicons/sort-amount-down.svg';
-import u1119 from '../../../img/icons/unicons/sort-amount-up.svg';
-import u1120 from '../../../img/icons/unicons/square-shape.svg';
-import u1121 from '../../../img/icons/unicons/star.svg';
-import u1122 from '../../../img/icons/unicons/step-backward.svg';
-import u1123 from '../../../img/icons/unicons/sync.svg';
-import u1124 from '../../../img/icons/unicons/stopwatch.svg';
-import u1125 from '../../../img/icons/unicons/table.svg';
-import u1126 from '../../../img/icons/unicons/tag-alt.svg';
-import u1127 from '../../../img/icons/unicons/times.svg';
-import u1128 from '../../../img/icons/unicons/trash-alt.svg';
-import u1129 from '../../../img/icons/unicons/unlock.svg';
-import u1130 from '../../../img/icons/unicons/upload.svg';
-import u1131 from '../../../img/icons/unicons/user.svg';
-import u1132 from '../../../img/icons/unicons/users-alt.svg';
-import u1133 from '../../../img/icons/unicons/wrap-text.svg';
-import u1134 from '../../../img/icons/unicons/cloud-upload.svg';
-import u1135 from '../../../img/icons/unicons/credit-card.svg';
-import u1136 from '../../../img/icons/unicons/file-copy-alt.svg';
-import u1137 from '../../../img/icons/unicons/fire.svg';
-import u1138 from '../../../img/icons/unicons/hourglass.svg';
-import u1139 from '../../../img/icons/unicons/layer-group.svg';
-import u1140 from '../../../img/icons/unicons/layers-alt.svg';
-import u1141 from '../../../img/icons/unicons/line-alt.svg';
-import u1142 from '../../../img/icons/unicons/list-ui-alt.svg';
-import u1143 from '../../../img/icons/unicons/message.svg';
-import u1144 from '../../../img/icons/unicons/palette.svg';
-import u1145 from '../../../img/icons/unicons/percentage.svg';
-import u1146 from '../../../img/icons/unicons/shield-exclamation.svg';
-import u1147 from '../../../img/icons/unicons/plus-square.svg';
-import u1148 from '../../../img/icons/unicons/x.svg';
-import u1149 from '../../../img/icons/unicons/capture.svg';
-import u1150 from '../../../img/icons/custom/gf-grid.svg';
-import u1151 from '../../../img/icons/custom/gf-landscape.svg';
-import u1152 from '../../../img/icons/custom/gf-layout-simple.svg';
-import u1153 from '../../../img/icons/custom/gf-portrait.svg';
-import u1154 from '../../../img/icons/custom/gf-show-context.svg';
-import u1155 from '../../../img/icons/custom/gf-bar-alignment-after.svg';
-import u1156 from '../../../img/icons/custom/gf-bar-alignment-before.svg';
-import u1157 from '../../../img/icons/custom/gf-bar-alignment-center.svg';
-import u1158 from '../../../img/icons/custom/gf-interpolation-linear.svg';
-import u1159 from '../../../img/icons/custom/gf-interpolation-smooth.svg';
-import u1160 from '../../../img/icons/custom/gf-interpolation-step-after.svg';
-import u1161 from '../../../img/icons/custom/gf-interpolation-step-before.svg';
-import u1162 from '../../../img/icons/custom/gf-logs.svg';
-import u1163 from '../../../img/icons/custom/gf-movepane-left.svg';
-import u1164 from '../../../img/icons/custom/gf-movepane-right.svg';
-import u1165 from '../../../img/icons/mono/favorite.svg';
-import u1166 from '../../../img/icons/mono/grafana.svg';
-import u1167 from '../../../img/icons/mono/heart.svg';
-import u1168 from '../../../img/icons/mono/heart-break.svg';
-import u1169 from '../../../img/icons/mono/panel-add.svg';
-import u1170 from '../../../img/icons/mono/library-panel.svg';
-import u1171 from '../../../img/icons/unicons/record-audio.svg';
+import u1026 from '../../../img/icons/unicons/bookmark.svg';
+import u1027 from '../../../img/icons/unicons/book-open.svg';
+import u1028 from '../../../img/icons/unicons/brackets-curly.svg';
+import u1029 from '../../../img/icons/unicons/bug.svg';
+import u1030 from '../../../img/icons/unicons/building.svg';
+import u1031 from '../../../img/icons/unicons/calculator-alt.svg';
+import u1032 from '../../../img/icons/unicons/calendar-alt.svg';
+import u1033 from '../../../img/icons/unicons/calendar-slash.svg';
+import u1034 from '../../../img/icons/unicons/camera.svg';
+import u1035 from '../../../img/icons/unicons/channel-add.svg';
+import u1036 from '../../../img/icons/unicons/chart-line.svg';
+import u1037 from '../../../img/icons/unicons/check.svg';
+import u1038 from '../../../img/icons/unicons/check-circle.svg';
+import u1039 from '../../../img/icons/unicons/circle.svg';
+import u1040 from '../../../img/icons/unicons/clipboard-alt.svg';
+import u1041 from '../../../img/icons/unicons/clock-nine.svg';
+import u1042 from '../../../img/icons/unicons/cloud.svg';
+import u1043 from '../../../img/icons/unicons/cloud-download.svg';
+import u1044 from '../../../img/icons/unicons/code-branch.svg';
+import u1045 from '../../../img/icons/unicons/cog.svg';
+import u1046 from '../../../img/icons/unicons/columns.svg';
+import u1047 from '../../../img/icons/unicons/comment-alt.svg';
+import u1048 from '../../../img/icons/unicons/comment-alt-share.svg';
+import u1049 from '../../../img/icons/unicons/comments-alt.svg';
+import u1050 from '../../../img/icons/unicons/compass.svg';
+import u1051 from '../../../img/icons/unicons/copy.svg';
+import u1052 from '../../../img/icons/unicons/corner-down-right-alt.svg';
+import u1053 from '../../../img/icons/unicons/cube.svg';
+import u1054 from '../../../img/icons/unicons/dashboard.svg';
+import u1055 from '../../../img/icons/unicons/database.svg';
+import u1056 from '../../../img/icons/unicons/document-info.svg';
+import u1057 from '../../../img/icons/unicons/download-alt.svg';
+import u1058 from '../../../img/icons/unicons/draggabledots.svg';
+import u1059 from '../../../img/icons/unicons/edit.svg';
+import u1060 from '../../../img/icons/unicons/ellipsis-v.svg';
+import u1061 from '../../../img/icons/unicons/ellipsis-h.svg';
+import u1062 from '../../../img/icons/unicons/envelope.svg';
+import u1063 from '../../../img/icons/unicons/exchange-alt.svg';
+import u1064 from '../../../img/icons/unicons/exclamation-circle.svg';
+import u1065 from '../../../img/icons/unicons/exclamation-triangle.svg';
+import u1066 from '../../../img/icons/unicons/external-link-alt.svg';
+import u1067 from '../../../img/icons/unicons/eye.svg';
+import u1068 from '../../../img/icons/unicons/eye-slash.svg';
+import u1069 from '../../../img/icons/unicons/file-alt.svg';
+import u1070 from '../../../img/icons/unicons/file-blank.svg';
+import u1071 from '../../../img/icons/unicons/filter.svg';
+import u1072 from '../../../img/icons/unicons/folder.svg';
+import u1073 from '../../../img/icons/unicons/folder-open.svg';
+import u1074 from '../../../img/icons/unicons/folder-plus.svg';
+import u1075 from '../../../img/icons/unicons/folder-upload.svg';
+import u1076 from '../../../img/icons/unicons/forward.svg';
+import u1077 from '../../../img/icons/unicons/graph-bar.svg';
+import u1078 from '../../../img/icons/unicons/history.svg';
+import u1079 from '../../../img/icons/unicons/history-alt.svg';
+import u1080 from '../../../img/icons/unicons/home-alt.svg';
+import u1081 from '../../../img/icons/unicons/import.svg';
+import u1082 from '../../../img/icons/unicons/info.svg';
+import u1083 from '../../../img/icons/unicons/info-circle.svg';
+import u1084 from '../../../img/icons/unicons/k6.svg';
+import u1085 from '../../../img/icons/unicons/key-skeleton-alt.svg';
+import u1086 from '../../../img/icons/unicons/keyboard.svg';
+import u1087 from '../../../img/icons/unicons/link.svg';
+import u1088 from '../../../img/icons/unicons/list-ul.svg';
+import u1089 from '../../../img/icons/unicons/lock.svg';
+import u1090 from '../../../img/icons/unicons/minus.svg';
+import u1091 from '../../../img/icons/unicons/minus-circle.svg';
+import u1092 from '../../../img/icons/unicons/mobile-android.svg';
+import u1093 from '../../../img/icons/unicons/monitor.svg';
+import u1094 from '../../../img/icons/unicons/pause.svg';
+import u1095 from '../../../img/icons/unicons/pen.svg';
+import u1096 from '../../../img/icons/unicons/play.svg';
+import u1097 from '../../../img/icons/unicons/plug.svg';
+import u1098 from '../../../img/icons/unicons/plus.svg';
+import u1099 from '../../../img/icons/unicons/plus-circle.svg';
+import u1100 from '../../../img/icons/unicons/power.svg';
+import u1101 from '../../../img/icons/unicons/presentation-play.svg';
+import u1102 from '../../../img/icons/unicons/process.svg';
+import u1103 from '../../../img/icons/unicons/question-circle.svg';
+import u1104 from '../../../img/icons/unicons/repeat.svg';
+import u1105 from '../../../img/icons/unicons/rocket.svg';
+import u1106 from '../../../img/icons/unicons/rss.svg';
+import u1107 from '../../../img/icons/unicons/save.svg';
+import u1108 from '../../../img/icons/unicons/search.svg';
+import u1109 from '../../../img/icons/unicons/search-minus.svg';
+import u1110 from '../../../img/icons/unicons/search-plus.svg';
+import u1111 from '../../../img/icons/unicons/share-alt.svg';
+import u1112 from '../../../img/icons/unicons/shield.svg';
+import u1113 from '../../../img/icons/unicons/signal.svg';
+import u1114 from '../../../img/icons/unicons/signin.svg';
+import u1115 from '../../../img/icons/unicons/signout.svg';
+import u1116 from '../../../img/icons/unicons/sitemap.svg';
+import u1117 from '../../../img/icons/unicons/slack.svg';
+import u1118 from '../../../img/icons/unicons/sliders-v-alt.svg';
+import u1119 from '../../../img/icons/unicons/sort-amount-down.svg';
+import u1120 from '../../../img/icons/unicons/sort-amount-up.svg';
+import u1121 from '../../../img/icons/unicons/square-shape.svg';
+import u1122 from '../../../img/icons/unicons/star.svg';
+import u1123 from '../../../img/icons/unicons/step-backward.svg';
+import u1124 from '../../../img/icons/unicons/sync.svg';
+import u1125 from '../../../img/icons/unicons/stopwatch.svg';
+import u1126 from '../../../img/icons/unicons/table.svg';
+import u1127 from '../../../img/icons/unicons/tag-alt.svg';
+import u1128 from '../../../img/icons/unicons/times.svg';
+import u1129 from '../../../img/icons/unicons/trash-alt.svg';
+import u1130 from '../../../img/icons/unicons/unlock.svg';
+import u1131 from '../../../img/icons/unicons/upload.svg';
+import u1132 from '../../../img/icons/unicons/user.svg';
+import u1133 from '../../../img/icons/unicons/users-alt.svg';
+import u1134 from '../../../img/icons/unicons/wrap-text.svg';
+import u1135 from '../../../img/icons/unicons/cloud-upload.svg';
+import u1136 from '../../../img/icons/unicons/credit-card.svg';
+import u1137 from '../../../img/icons/unicons/file-copy-alt.svg';
+import u1138 from '../../../img/icons/unicons/fire.svg';
+import u1139 from '../../../img/icons/unicons/hourglass.svg';
+import u1140 from '../../../img/icons/unicons/layer-group.svg';
+import u1141 from '../../../img/icons/unicons/layers-alt.svg';
+import u1142 from '../../../img/icons/unicons/line-alt.svg';
+import u1143 from '../../../img/icons/unicons/list-ui-alt.svg';
+import u1144 from '../../../img/icons/unicons/message.svg';
+import u1145 from '../../../img/icons/unicons/palette.svg';
+import u1146 from '../../../img/icons/unicons/percentage.svg';
+import u1147 from '../../../img/icons/unicons/shield-exclamation.svg';
+import u1148 from '../../../img/icons/unicons/plus-square.svg';
+import u1149 from '../../../img/icons/unicons/x.svg';
+import u1150 from '../../../img/icons/unicons/capture.svg';
+import u1151 from '../../../img/icons/custom/gf-grid.svg';
+import u1152 from '../../../img/icons/custom/gf-landscape.svg';
+import u1153 from '../../../img/icons/custom/gf-layout-simple.svg';
+import u1154 from '../../../img/icons/custom/gf-portrait.svg';
+import u1155 from '../../../img/icons/custom/gf-show-context.svg';
+import u1156 from '../../../img/icons/custom/gf-bar-alignment-after.svg';
+import u1157 from '../../../img/icons/custom/gf-bar-alignment-before.svg';
+import u1158 from '../../../img/icons/custom/gf-bar-alignment-center.svg';
+import u1159 from '../../../img/icons/custom/gf-interpolation-linear.svg';
+import u1160 from '../../../img/icons/custom/gf-interpolation-smooth.svg';
+import u1161 from '../../../img/icons/custom/gf-interpolation-step-after.svg';
+import u1162 from '../../../img/icons/custom/gf-interpolation-step-before.svg';
+import u1163 from '../../../img/icons/custom/gf-logs.svg';
+import u1164 from '../../../img/icons/custom/gf-movepane-left.svg';
+import u1165 from '../../../img/icons/custom/gf-movepane-right.svg';
+import u1166 from '../../../img/icons/mono/favorite.svg';
+import u1167 from '../../../img/icons/mono/grafana.svg';
+import u1168 from '../../../img/icons/mono/heart.svg';
+import u1169 from '../../../img/icons/mono/heart-break.svg';
+import u1170 from '../../../img/icons/mono/panel-add.svg';
+import u1171 from '../../../img/icons/mono/library-panel.svg';
+import u1172 from '../../../img/icons/unicons/record-audio.svg';
+import u1173 from '../../../img/icons/solid/bookmark.svg';
 // do not edit this list directly
 // the list of icons live here: @grafana/ui/components/Icon/cached.json
 
@@ -238,152 +240,154 @@ export function initIconCache() {
   cacheItem(u1023, resolvePath('unicons/bell-slash.svg'));
   cacheItem(u1024, resolvePath('unicons/bolt.svg'));
   cacheItem(u1025, resolvePath('unicons/book.svg'));
-  cacheItem(u1026, resolvePath('unicons/book-open.svg'));
-  cacheItem(u1027, resolvePath('unicons/brackets-curly.svg'));
-  cacheItem(u1028, resolvePath('unicons/bug.svg'));
-  cacheItem(u1029, resolvePath('unicons/building.svg'));
-  cacheItem(u1030, resolvePath('unicons/calculator-alt.svg'));
-  cacheItem(u1031, resolvePath('unicons/calendar-alt.svg'));
-  cacheItem(u1032, resolvePath('unicons/calendar-slash.svg'));
-  cacheItem(u1033, resolvePath('unicons/camera.svg'));
-  cacheItem(u1034, resolvePath('unicons/channel-add.svg'));
-  cacheItem(u1035, resolvePath('unicons/chart-line.svg'));
-  cacheItem(u1036, resolvePath('unicons/check.svg'));
-  cacheItem(u1037, resolvePath('unicons/check-circle.svg'));
-  cacheItem(u1038, resolvePath('unicons/circle.svg'));
-  cacheItem(u1039, resolvePath('unicons/clipboard-alt.svg'));
-  cacheItem(u1040, resolvePath('unicons/clock-nine.svg'));
-  cacheItem(u1041, resolvePath('unicons/cloud.svg'));
-  cacheItem(u1042, resolvePath('unicons/cloud-download.svg'));
-  cacheItem(u1043, resolvePath('unicons/code-branch.svg'));
-  cacheItem(u1044, resolvePath('unicons/cog.svg'));
-  cacheItem(u1045, resolvePath('unicons/columns.svg'));
-  cacheItem(u1046, resolvePath('unicons/comment-alt.svg'));
-  cacheItem(u1047, resolvePath('unicons/comment-alt-share.svg'));
-  cacheItem(u1048, resolvePath('unicons/comments-alt.svg'));
-  cacheItem(u1049, resolvePath('unicons/compass.svg'));
-  cacheItem(u1050, resolvePath('unicons/copy.svg'));
-  cacheItem(u1051, resolvePath('unicons/corner-down-right-alt.svg'));
-  cacheItem(u1052, resolvePath('unicons/cube.svg'));
-  cacheItem(u1053, resolvePath('unicons/dashboard.svg'));
-  cacheItem(u1054, resolvePath('unicons/database.svg'));
-  cacheItem(u1055, resolvePath('unicons/document-info.svg'));
-  cacheItem(u1056, resolvePath('unicons/download-alt.svg'));
-  cacheItem(u1057, resolvePath('unicons/draggabledots.svg'));
-  cacheItem(u1058, resolvePath('unicons/edit.svg'));
-  cacheItem(u1059, resolvePath('unicons/ellipsis-v.svg'));
-  cacheItem(u1060, resolvePath('unicons/ellipsis-h.svg'));
-  cacheItem(u1061, resolvePath('unicons/envelope.svg'));
-  cacheItem(u1062, resolvePath('unicons/exchange-alt.svg'));
-  cacheItem(u1063, resolvePath('unicons/exclamation-circle.svg'));
-  cacheItem(u1064, resolvePath('unicons/exclamation-triangle.svg'));
-  cacheItem(u1065, resolvePath('unicons/external-link-alt.svg'));
-  cacheItem(u1066, resolvePath('unicons/eye.svg'));
-  cacheItem(u1067, resolvePath('unicons/eye-slash.svg'));
-  cacheItem(u1068, resolvePath('unicons/file-alt.svg'));
-  cacheItem(u1069, resolvePath('unicons/file-blank.svg'));
-  cacheItem(u1070, resolvePath('unicons/filter.svg'));
-  cacheItem(u1071, resolvePath('unicons/folder.svg'));
-  cacheItem(u1072, resolvePath('unicons/folder-open.svg'));
-  cacheItem(u1073, resolvePath('unicons/folder-plus.svg'));
-  cacheItem(u1074, resolvePath('unicons/folder-upload.svg'));
-  cacheItem(u1075, resolvePath('unicons/forward.svg'));
-  cacheItem(u1076, resolvePath('unicons/graph-bar.svg'));
-  cacheItem(u1077, resolvePath('unicons/history.svg'));
-  cacheItem(u1078, resolvePath('unicons/history-alt.svg'));
-  cacheItem(u1079, resolvePath('unicons/home-alt.svg'));
-  cacheItem(u1080, resolvePath('unicons/import.svg'));
-  cacheItem(u1081, resolvePath('unicons/info.svg'));
-  cacheItem(u1082, resolvePath('unicons/info-circle.svg'));
-  cacheItem(u1083, resolvePath('unicons/k6.svg'));
-  cacheItem(u1084, resolvePath('unicons/key-skeleton-alt.svg'));
-  cacheItem(u1085, resolvePath('unicons/keyboard.svg'));
-  cacheItem(u1086, resolvePath('unicons/link.svg'));
-  cacheItem(u1087, resolvePath('unicons/list-ul.svg'));
-  cacheItem(u1088, resolvePath('unicons/lock.svg'));
-  cacheItem(u1089, resolvePath('unicons/minus.svg'));
-  cacheItem(u1090, resolvePath('unicons/minus-circle.svg'));
-  cacheItem(u1091, resolvePath('unicons/mobile-android.svg'));
-  cacheItem(u1092, resolvePath('unicons/monitor.svg'));
-  cacheItem(u1093, resolvePath('unicons/pause.svg'));
-  cacheItem(u1094, resolvePath('unicons/pen.svg'));
-  cacheItem(u1095, resolvePath('unicons/play.svg'));
-  cacheItem(u1096, resolvePath('unicons/plug.svg'));
-  cacheItem(u1097, resolvePath('unicons/plus.svg'));
-  cacheItem(u1098, resolvePath('unicons/plus-circle.svg'));
-  cacheItem(u1099, resolvePath('unicons/power.svg'));
-  cacheItem(u1100, resolvePath('unicons/presentation-play.svg'));
-  cacheItem(u1101, resolvePath('unicons/process.svg'));
-  cacheItem(u1102, resolvePath('unicons/question-circle.svg'));
-  cacheItem(u1103, resolvePath('unicons/repeat.svg'));
-  cacheItem(u1104, resolvePath('unicons/rocket.svg'));
-  cacheItem(u1105, resolvePath('unicons/rss.svg'));
-  cacheItem(u1106, resolvePath('unicons/save.svg'));
-  cacheItem(u1107, resolvePath('unicons/search.svg'));
-  cacheItem(u1108, resolvePath('unicons/search-minus.svg'));
-  cacheItem(u1109, resolvePath('unicons/search-plus.svg'));
-  cacheItem(u1110, resolvePath('unicons/share-alt.svg'));
-  cacheItem(u1111, resolvePath('unicons/shield.svg'));
-  cacheItem(u1112, resolvePath('unicons/signal.svg'));
-  cacheItem(u1113, resolvePath('unicons/signin.svg'));
-  cacheItem(u1114, resolvePath('unicons/signout.svg'));
-  cacheItem(u1115, resolvePath('unicons/sitemap.svg'));
-  cacheItem(u1116, resolvePath('unicons/slack.svg'));
-  cacheItem(u1117, resolvePath('unicons/sliders-v-alt.svg'));
-  cacheItem(u1118, resolvePath('unicons/sort-amount-down.svg'));
-  cacheItem(u1119, resolvePath('unicons/sort-amount-up.svg'));
-  cacheItem(u1120, resolvePath('unicons/square-shape.svg'));
-  cacheItem(u1121, resolvePath('unicons/star.svg'));
-  cacheItem(u1122, resolvePath('unicons/step-backward.svg'));
-  cacheItem(u1123, resolvePath('unicons/sync.svg'));
-  cacheItem(u1124, resolvePath('unicons/stopwatch.svg'));
-  cacheItem(u1125, resolvePath('unicons/table.svg'));
-  cacheItem(u1126, resolvePath('unicons/tag-alt.svg'));
-  cacheItem(u1127, resolvePath('unicons/times.svg'));
-  cacheItem(u1128, resolvePath('unicons/trash-alt.svg'));
-  cacheItem(u1129, resolvePath('unicons/unlock.svg'));
-  cacheItem(u1130, resolvePath('unicons/upload.svg'));
-  cacheItem(u1131, resolvePath('unicons/user.svg'));
-  cacheItem(u1132, resolvePath('unicons/users-alt.svg'));
-  cacheItem(u1133, resolvePath('unicons/wrap-text.svg'));
-  cacheItem(u1134, resolvePath('unicons/cloud-upload.svg'));
-  cacheItem(u1135, resolvePath('unicons/credit-card.svg'));
-  cacheItem(u1136, resolvePath('unicons/file-copy-alt.svg'));
-  cacheItem(u1137, resolvePath('unicons/fire.svg'));
-  cacheItem(u1138, resolvePath('unicons/hourglass.svg'));
-  cacheItem(u1139, resolvePath('unicons/layer-group.svg'));
-  cacheItem(u1140, resolvePath('unicons/layers-alt.svg'));
-  cacheItem(u1141, resolvePath('unicons/line-alt.svg'));
-  cacheItem(u1142, resolvePath('unicons/list-ui-alt.svg'));
-  cacheItem(u1143, resolvePath('unicons/message.svg'));
-  cacheItem(u1144, resolvePath('unicons/palette.svg'));
-  cacheItem(u1145, resolvePath('unicons/percentage.svg'));
-  cacheItem(u1146, resolvePath('unicons/shield-exclamation.svg'));
-  cacheItem(u1147, resolvePath('unicons/plus-square.svg'));
-  cacheItem(u1148, resolvePath('unicons/x.svg'));
-  cacheItem(u1149, resolvePath('unicons/capture.svg'));
-  cacheItem(u1150, resolvePath('custom/gf-grid.svg'));
-  cacheItem(u1151, resolvePath('custom/gf-landscape.svg'));
-  cacheItem(u1152, resolvePath('custom/gf-layout-simple.svg'));
-  cacheItem(u1153, resolvePath('custom/gf-portrait.svg'));
-  cacheItem(u1154, resolvePath('custom/gf-show-context.svg'));
-  cacheItem(u1155, resolvePath('custom/gf-bar-alignment-after.svg'));
-  cacheItem(u1156, resolvePath('custom/gf-bar-alignment-before.svg'));
-  cacheItem(u1157, resolvePath('custom/gf-bar-alignment-center.svg'));
-  cacheItem(u1158, resolvePath('custom/gf-interpolation-linear.svg'));
-  cacheItem(u1159, resolvePath('custom/gf-interpolation-smooth.svg'));
-  cacheItem(u1160, resolvePath('custom/gf-interpolation-step-after.svg'));
-  cacheItem(u1161, resolvePath('custom/gf-interpolation-step-before.svg'));
-  cacheItem(u1162, resolvePath('custom/gf-logs.svg'));
-  cacheItem(u1163, resolvePath('custom/gf-movepane-left.svg'));
-  cacheItem(u1164, resolvePath('custom/gf-movepane-right.svg'));
-  cacheItem(u1165, resolvePath('mono/favorite.svg'));
-  cacheItem(u1166, resolvePath('mono/grafana.svg'));
-  cacheItem(u1167, resolvePath('mono/heart.svg'));
-  cacheItem(u1168, resolvePath('mono/heart-break.svg'));
-  cacheItem(u1169, resolvePath('mono/panel-add.svg'));
-  cacheItem(u1170, resolvePath('mono/library-panel.svg'));
-  cacheItem(u1171, resolvePath('unicons/record-audio.svg'));
+  cacheItem(u1026, resolvePath('unicons/bookmark.svg'));
+  cacheItem(u1027, resolvePath('unicons/book-open.svg'));
+  cacheItem(u1028, resolvePath('unicons/brackets-curly.svg'));
+  cacheItem(u1029, resolvePath('unicons/bug.svg'));
+  cacheItem(u1030, resolvePath('unicons/building.svg'));
+  cacheItem(u1031, resolvePath('unicons/calculator-alt.svg'));
+  cacheItem(u1032, resolvePath('unicons/calendar-alt.svg'));
+  cacheItem(u1033, resolvePath('unicons/calendar-slash.svg'));
+  cacheItem(u1034, resolvePath('unicons/camera.svg'));
+  cacheItem(u1035, resolvePath('unicons/channel-add.svg'));
+  cacheItem(u1036, resolvePath('unicons/chart-line.svg'));
+  cacheItem(u1037, resolvePath('unicons/check.svg'));
+  cacheItem(u1038, resolvePath('unicons/check-circle.svg'));
+  cacheItem(u1039, resolvePath('unicons/circle.svg'));
+  cacheItem(u1040, resolvePath('unicons/clipboard-alt.svg'));
+  cacheItem(u1041, resolvePath('unicons/clock-nine.svg'));
+  cacheItem(u1042, resolvePath('unicons/cloud.svg'));
+  cacheItem(u1043, resolvePath('unicons/cloud-download.svg'));
+  cacheItem(u1044, resolvePath('unicons/code-branch.svg'));
+  cacheItem(u1045, resolvePath('unicons/cog.svg'));
+  cacheItem(u1046, resolvePath('unicons/columns.svg'));
+  cacheItem(u1047, resolvePath('unicons/comment-alt.svg'));
+  cacheItem(u1048, resolvePath('unicons/comment-alt-share.svg'));
+  cacheItem(u1049, resolvePath('unicons/comments-alt.svg'));
+  cacheItem(u1050, resolvePath('unicons/compass.svg'));
+  cacheItem(u1051, resolvePath('unicons/copy.svg'));
+  cacheItem(u1052, resolvePath('unicons/corner-down-right-alt.svg'));
+  cacheItem(u1053, resolvePath('unicons/cube.svg'));
+  cacheItem(u1054, resolvePath('unicons/dashboard.svg'));
+  cacheItem(u1055, resolvePath('unicons/database.svg'));
+  cacheItem(u1056, resolvePath('unicons/document-info.svg'));
+  cacheItem(u1057, resolvePath('unicons/download-alt.svg'));
+  cacheItem(u1058, resolvePath('unicons/draggabledots.svg'));
+  cacheItem(u1059, resolvePath('unicons/edit.svg'));
+  cacheItem(u1060, resolvePath('unicons/ellipsis-v.svg'));
+  cacheItem(u1061, resolvePath('unicons/ellipsis-h.svg'));
+  cacheItem(u1062, resolvePath('unicons/envelope.svg'));
+  cacheItem(u1063, resolvePath('unicons/exchange-alt.svg'));
+  cacheItem(u1064, resolvePath('unicons/exclamation-circle.svg'));
+  cacheItem(u1065, resolvePath('unicons/exclamation-triangle.svg'));
+  cacheItem(u1066, resolvePath('unicons/external-link-alt.svg'));
+  cacheItem(u1067, resolvePath('unicons/eye.svg'));
+  cacheItem(u1068, resolvePath('unicons/eye-slash.svg'));
+  cacheItem(u1069, resolvePath('unicons/file-alt.svg'));
+  cacheItem(u1070, resolvePath('unicons/file-blank.svg'));
+  cacheItem(u1071, resolvePath('unicons/filter.svg'));
+  cacheItem(u1072, resolvePath('unicons/folder.svg'));
+  cacheItem(u1073, resolvePath('unicons/folder-open.svg'));
+  cacheItem(u1074, resolvePath('unicons/folder-plus.svg'));
+  cacheItem(u1075, resolvePath('unicons/folder-upload.svg'));
+  cacheItem(u1076, resolvePath('unicons/forward.svg'));
+  cacheItem(u1077, resolvePath('unicons/graph-bar.svg'));
+  cacheItem(u1078, resolvePath('unicons/history.svg'));
+  cacheItem(u1079, resolvePath('unicons/history-alt.svg'));
+  cacheItem(u1080, resolvePath('unicons/home-alt.svg'));
+  cacheItem(u1081, resolvePath('unicons/import.svg'));
+  cacheItem(u1082, resolvePath('unicons/info.svg'));
+  cacheItem(u1083, resolvePath('unicons/info-circle.svg'));
+  cacheItem(u1084, resolvePath('unicons/k6.svg'));
+  cacheItem(u1085, resolvePath('unicons/key-skeleton-alt.svg'));
+  cacheItem(u1086, resolvePath('unicons/keyboard.svg'));
+  cacheItem(u1087, resolvePath('unicons/link.svg'));
+  cacheItem(u1088, resolvePath('unicons/list-ul.svg'));
+  cacheItem(u1089, resolvePath('unicons/lock.svg'));
+  cacheItem(u1090, resolvePath('unicons/minus.svg'));
+  cacheItem(u1091, resolvePath('unicons/minus-circle.svg'));
+  cacheItem(u1092, resolvePath('unicons/mobile-android.svg'));
+  cacheItem(u1093, resolvePath('unicons/monitor.svg'));
+  cacheItem(u1094, resolvePath('unicons/pause.svg'));
+  cacheItem(u1095, resolvePath('unicons/pen.svg'));
+  cacheItem(u1096, resolvePath('unicons/play.svg'));
+  cacheItem(u1097, resolvePath('unicons/plug.svg'));
+  cacheItem(u1098, resolvePath('unicons/plus.svg'));
+  cacheItem(u1099, resolvePath('unicons/plus-circle.svg'));
+  cacheItem(u1100, resolvePath('unicons/power.svg'));
+  cacheItem(u1101, resolvePath('unicons/presentation-play.svg'));
+  cacheItem(u1102, resolvePath('unicons/process.svg'));
+  cacheItem(u1103, resolvePath('unicons/question-circle.svg'));
+  cacheItem(u1104, resolvePath('unicons/repeat.svg'));
+  cacheItem(u1105, resolvePath('unicons/rocket.svg'));
+  cacheItem(u1106, resolvePath('unicons/rss.svg'));
+  cacheItem(u1107, resolvePath('unicons/save.svg'));
+  cacheItem(u1108, resolvePath('unicons/search.svg'));
+  cacheItem(u1109, resolvePath('unicons/search-minus.svg'));
+  cacheItem(u1110, resolvePath('unicons/search-plus.svg'));
+  cacheItem(u1111, resolvePath('unicons/share-alt.svg'));
+  cacheItem(u1112, resolvePath('unicons/shield.svg'));
+  cacheItem(u1113, resolvePath('unicons/signal.svg'));
+  cacheItem(u1114, resolvePath('unicons/signin.svg'));
+  cacheItem(u1115, resolvePath('unicons/signout.svg'));
+  cacheItem(u1116, resolvePath('unicons/sitemap.svg'));
+  cacheItem(u1117, resolvePath('unicons/slack.svg'));
+  cacheItem(u1118, resolvePath('unicons/sliders-v-alt.svg'));
+  cacheItem(u1119, resolvePath('unicons/sort-amount-down.svg'));
+  cacheItem(u1120, resolvePath('unicons/sort-amount-up.svg'));
+  cacheItem(u1121, resolvePath('unicons/square-shape.svg'));
+  cacheItem(u1122, resolvePath('unicons/star.svg'));
+  cacheItem(u1123, resolvePath('unicons/step-backward.svg'));
+  cacheItem(u1124, resolvePath('unicons/sync.svg'));
+  cacheItem(u1125, resolvePath('unicons/stopwatch.svg'));
+  cacheItem(u1126, resolvePath('unicons/table.svg'));
+  cacheItem(u1127, resolvePath('unicons/tag-alt.svg'));
+  cacheItem(u1128, resolvePath('unicons/times.svg'));
+  cacheItem(u1129, resolvePath('unicons/trash-alt.svg'));
+  cacheItem(u1130, resolvePath('unicons/unlock.svg'));
+  cacheItem(u1131, resolvePath('unicons/upload.svg'));
+  cacheItem(u1132, resolvePath('unicons/user.svg'));
+  cacheItem(u1133, resolvePath('unicons/users-alt.svg'));
+  cacheItem(u1134, resolvePath('unicons/wrap-text.svg'));
+  cacheItem(u1135, resolvePath('unicons/cloud-upload.svg'));
+  cacheItem(u1136, resolvePath('unicons/credit-card.svg'));
+  cacheItem(u1137, resolvePath('unicons/file-copy-alt.svg'));
+  cacheItem(u1138, resolvePath('unicons/fire.svg'));
+  cacheItem(u1139, resolvePath('unicons/hourglass.svg'));
+  cacheItem(u1140, resolvePath('unicons/layer-group.svg'));
+  cacheItem(u1141, resolvePath('unicons/layers-alt.svg'));
+  cacheItem(u1142, resolvePath('unicons/line-alt.svg'));
+  cacheItem(u1143, resolvePath('unicons/list-ui-alt.svg'));
+  cacheItem(u1144, resolvePath('unicons/message.svg'));
+  cacheItem(u1145, resolvePath('unicons/palette.svg'));
+  cacheItem(u1146, resolvePath('unicons/percentage.svg'));
+  cacheItem(u1147, resolvePath('unicons/shield-exclamation.svg'));
+  cacheItem(u1148, resolvePath('unicons/plus-square.svg'));
+  cacheItem(u1149, resolvePath('unicons/x.svg'));
+  cacheItem(u1150, resolvePath('unicons/capture.svg'));
+  cacheItem(u1151, resolvePath('custom/gf-grid.svg'));
+  cacheItem(u1152, resolvePath('custom/gf-landscape.svg'));
+  cacheItem(u1153, resolvePath('custom/gf-layout-simple.svg'));
+  cacheItem(u1154, resolvePath('custom/gf-portrait.svg'));
+  cacheItem(u1155, resolvePath('custom/gf-show-context.svg'));
+  cacheItem(u1156, resolvePath('custom/gf-bar-alignment-after.svg'));
+  cacheItem(u1157, resolvePath('custom/gf-bar-alignment-before.svg'));
+  cacheItem(u1158, resolvePath('custom/gf-bar-alignment-center.svg'));
+  cacheItem(u1159, resolvePath('custom/gf-interpolation-linear.svg'));
+  cacheItem(u1160, resolvePath('custom/gf-interpolation-smooth.svg'));
+  cacheItem(u1161, resolvePath('custom/gf-interpolation-step-after.svg'));
+  cacheItem(u1162, resolvePath('custom/gf-interpolation-step-before.svg'));
+  cacheItem(u1163, resolvePath('custom/gf-logs.svg'));
+  cacheItem(u1164, resolvePath('custom/gf-movepane-left.svg'));
+  cacheItem(u1165, resolvePath('custom/gf-movepane-right.svg'));
+  cacheItem(u1166, resolvePath('mono/favorite.svg'));
+  cacheItem(u1167, resolvePath('mono/grafana.svg'));
+  cacheItem(u1168, resolvePath('mono/heart.svg'));
+  cacheItem(u1169, resolvePath('mono/heart-break.svg'));
+  cacheItem(u1170, resolvePath('mono/panel-add.svg'));
+  cacheItem(u1171, resolvePath('mono/library-panel.svg'));
+  cacheItem(u1172, resolvePath('unicons/record-audio.svg'));
+  cacheItem(u1173, resolvePath('solid/bookmark.svg'));
   // do not edit this list directly
   // the list of icons live here: @grafana/ui/components/Icon/cached.json
 }
diff --git a/scripts/webpack/webpack.common.js b/scripts/webpack/webpack.common.js
index 599c4a1fb41..684b2ea1407 100644
--- a/scripts/webpack/webpack.common.js
+++ b/scripts/webpack/webpack.common.js
@@ -106,7 +106,7 @@ module.exports = {
       },
       // for pre-caching SVGs as part of the JS bundles
       {
-        test: /(unicons|mono|custom)[\\/].*\.svg$/,
+        test: /(unicons|mono|custom|solid)[\\/].*\.svg$/,
         type: 'asset/source',
       },
       {