diff --git a/packages/grafana-ui/src/types/icon.ts b/packages/grafana-ui/src/types/icon.ts
index bdd6f051bcc..77642fabba7 100644
--- a/packages/grafana-ui/src/types/icon.ts
+++ b/packages/grafana-ui/src/types/icon.ts
@@ -11,20 +11,20 @@ export const getAvailableIcons = () =>
     'angle-right',
     'angle-up',
     'apps',
+    'arrow',
     'arrow-down',
     'arrow-from-right',
     'arrow-left',
     'arrow-random',
     'arrow-right',
     'arrow-up',
-    'arrow',
     'arrows-h',
     'bars',
-    'bell-slash',
     'bell',
+    'bell-slash',
     'bolt',
-    'book-open',
     'book',
+    'book-open',
     'brackets-curly',
     'bug',
     'calculator-alt',
@@ -32,14 +32,14 @@ export const getAvailableIcons = () =>
     'camera',
     'channel-add',
     'chart-line',
-    'check-circle',
     'check',
+    'check-circle',
     'circle',
     'clipboard-alt',
     'clock-nine',
+    'cloud',
     'cloud-download',
     'cloud-upload',
-    'cloud',
     'code-branch',
     'cog',
     'columns',
@@ -58,28 +58,32 @@ export const getAvailableIcons = () =>
     'exchange-alt',
     'exclamation-triangle',
     'external-link-alt',
-    'eye-slash',
     'eye',
+    'eye-slash',
     'fa fa-spinner',
     'favorite',
     'file-alt',
     'file-blank',
     'file-copy-alt',
     'filter',
+    'folder',
     'folder-open',
     'folder-plus',
     'folder-upload',
-    'folder',
     'forward',
+    'gf-grid',
     'gf-interpolation-linear',
     'gf-interpolation-smooth',
     'gf-interpolation-step-after',
     'gf-interpolation-step-before',
+    'gf-landscape',
+    'gf-layout-simple',
     'gf-logs',
+    'gf-portrait',
     'grafana',
     'graph-bar',
-    'heart-break',
     'heart',
+    'heart-break',
     'history',
     'home-alt',
     'import',
@@ -87,12 +91,14 @@ export const getAvailableIcons = () =>
     'key-skeleton-alt',
     'keyboard',
     'layer-group',
+    'library-panel',
     'line-alt',
     'link',
+    'list-ui-alt',
     'list-ul',
     'lock',
-    'minus-circle',
     'minus',
+    'minus-circle',
     'mobile-android',
     'monitor',
     'palette',
@@ -102,18 +108,17 @@ export const getAvailableIcons = () =>
     'percentage',
     'play',
     'plug',
+    'plus',
     'plus-circle',
     'plus-square',
-    'plus',
     'power',
     'question-circle',
     'repeat',
-    'library-panel',
     'rocket',
     'save',
+    'search',
     'search-minus',
     'search-plus',
-    'search',
     'share-alt',
     'shield',
     'shield-exclamation',
diff --git a/public/img/icons/custom/gf-grid.svg b/public/img/icons/custom/gf-grid.svg
new file mode 100644
index 00000000000..cd064809dcb
--- /dev/null
+++ b/public/img/icons/custom/gf-grid.svg
@@ -0,0 +1,7 @@
+<svg viewBox="0 0 15 15" fill="black" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M1.92009 1.43307C1.70105 1.43307 1.4906 1.64169 1.4906 1.86641C1.4906 1.94501 1.46966 2.01873 1.43307 2.08229V13.1331C1.43307 13.3578 1.64353 13.5664 1.86257 13.5664H13.1369C13.356 13.5664 13.5664 13.3578 13.5664 13.1331V1.86641C13.5664 1.64169 13.356 1.43307 13.1369 1.43307H1.92009ZM0.65095 1.60921C0.597816 1.68115 0.566406 1.77011 0.566406 1.86641V13.1331C0.566406 13.8328 1.16126 14.4331 1.86257 14.4331H13.1369C13.8382 14.4331 14.4331 13.8328 14.4331 13.1331V1.86641C14.4331 1.16667 13.8382 0.566406 13.1369 0.566406H1.92009C1.3066 0.566406 0.774569 1.02576 0.65095 1.60921Z" fill="inherit"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.10938 3.59935C3.10938 3.36003 3.30338 3.16602 3.54271 3.16602H6.48938C6.7287 3.16602 6.92271 3.36003 6.92271 3.59935V6.54602C6.92271 6.78534 6.7287 6.97935 6.48938 6.97935H3.54271C3.30338 6.97935 3.10938 6.78534 3.10938 6.54602V3.59935ZM3.97604 4.03268V6.11268H6.05604V4.03268H3.97604Z" fill="inherit"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.10938 8.51146C3.10938 8.27213 3.30338 8.07812 3.54271 8.07812H6.48938C6.7287 8.07812 6.92271 8.27213 6.92271 8.51146V11.4581C6.92271 11.6974 6.7287 11.8915 6.48938 11.8915H3.54271C3.30338 11.8915 3.10938 11.6974 3.10938 11.4581V8.51146ZM3.97604 8.94479V11.0248H6.05604V8.94479H3.97604Z" fill="inherit"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8.13672 3.59935C8.13672 3.36003 8.33073 3.16602 8.57005 3.16602H11.5167C11.756 3.16602 11.9501 3.36003 11.9501 3.59935V6.54602C11.9501 6.78534 11.756 6.97935 11.5167 6.97935H8.57005C8.33073 6.97935 8.13672 6.78534 8.13672 6.54602V3.59935ZM9.00339 4.03268V6.11268H11.0834V4.03268H9.00339Z" fill="inherit"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8.13672 8.51146C8.13672 8.27213 8.33073 8.07812 8.57005 8.07812H11.5167C11.756 8.07812 11.9501 8.27213 11.9501 8.51146V11.4581C11.9501 11.6974 11.756 11.8915 11.5167 11.8915H8.57005C8.33073 11.8915 8.13672 11.6974 8.13672 11.4581V8.51146ZM9.00339 8.94479V11.0248H11.0834V8.94479H9.00339Z" fill="inherit"/>
+</svg>
diff --git a/public/img/icons/custom/gf-landscape.svg b/public/img/icons/custom/gf-landscape.svg
new file mode 100644
index 00000000000..a91a3611bb9
--- /dev/null
+++ b/public/img/icons/custom/gf-landscape.svg
@@ -0,0 +1,7 @@
+<svg viewBox="0 0 15 12" fill="black" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M2 4.45081C2 3.62394 2.69242 3 3.50281 3C4.27653 3 5.00562 3.53584 5.00562 4.39617C5.00562 5.22304 4.3132 5.84698 3.50281 5.84698C2.80424 5.84698 2 5.32631 2 4.45081ZM3.50281 3.93452C3.16259 3.93452 2.93452 4.18485 2.93452 4.45081C2.93452 4.66815 3.16583 4.91246 3.50281 4.91246C3.84303 4.91246 4.0711 4.66214 4.0711 4.39617C4.0711 4.16367 3.8797 3.93452 3.50281 3.93452Z" fill="inherit"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7 3.45C7 3.20147 7.20147 3 7.45 3H11.5913C11.8398 3 12.0413 3.20147 12.0413 3.45C12.0413 3.69853 11.8398 3.9 11.5913 3.9H7.45C7.20147 3.9 7 3.69853 7 3.45Z" fill="inherit"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7 5.25078C7 5.00225 7.20147 4.80078 7.45 4.80078H11.5913C11.8398 4.80078 12.0413 5.00225 12.0413 5.25078C12.0413 5.49931 11.8398 5.70078 11.5913 5.70078H7.45C7.20147 5.70078 7 5.49931 7 5.25078Z" fill="inherit"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.2066 6.15027C13.3817 6.33986 13.3699 6.63548 13.1803 6.81055L11.1092 8.72301C11.0733 8.75616 11.0324 8.78347 10.9881 8.80395C10.9706 8.812 10.9541 8.82063 10.93 8.83342C10.9282 8.83443 10.9261 8.83551 10.924 8.83666C10.903 8.84789 10.87 8.86552 10.8358 8.88129C10.7455 8.92296 10.6326 8.95948 10.4876 8.95948C10.2456 8.95948 10.0113 8.85713 9.86606 8.72301L8.88009 7.81256C8.86722 7.80589 8.85576 7.7998 8.84596 7.79458C8.84105 7.79196 8.8367 7.78965 8.83282 7.78759L6.78426 9.67924C6.59466 9.85431 6.29904 9.84254 6.12397 9.65295C5.9489 9.46336 5.96068 9.16774 6.15027 8.99267L8.22137 7.0802C8.36661 6.94609 8.60093 6.84374 8.84293 6.84374C8.98787 6.84374 9.10085 6.88026 9.19109 6.92192C9.22526 6.9377 9.25827 6.95533 9.27928 6.96656C9.28144 6.96771 9.28346 6.96879 9.28535 6.96979C9.30936 6.98259 9.32594 6.99122 9.34337 6.99927C9.38773 7.01975 9.42861 7.04706 9.4645 7.0802L10.4775 8.01563C10.4814 8.01357 10.4857 8.01126 10.4907 8.00864C10.5005 8.00342 10.5119 7.99732 10.5248 7.99066L12.5463 6.12397C12.7359 5.9489 13.0315 5.96068 13.2066 6.15027Z" fill="inherit"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.8 1H1.2C1.08954 1 1 1.08954 1 1.2V10.8C1 10.9105 1.08954 11 1.2 11H13.8C13.9105 11 14 10.9105 14 10.8V1.2C14 1.08954 13.9105 1 13.8 1ZM1.2 0C0.537258 0 0 0.537258 0 1.2V10.8C0 11.4627 0.537258 12 1.2 12H13.8C14.4627 12 15 11.4627 15 10.8V1.2C15 0.537258 14.4627 0 13.8 0H1.2Z" fill="inherit"/>
+</svg>
diff --git a/public/img/icons/custom/gf-layout-simple.svg b/public/img/icons/custom/gf-layout-simple.svg
new file mode 100644
index 00000000000..aad4b31beb5
--- /dev/null
+++ b/public/img/icons/custom/gf-layout-simple.svg
@@ -0,0 +1,6 @@
+<svg fill="black" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M1.92086 1.43071C1.70007 1.43071 1.48823 1.64074 1.48823 1.86718V1.86937H1.48822L1.43071 13.1338C1.43071 13.1341 1.43071 13.1344 1.43071 13.1347C1.43126 13.3608 1.64284 13.5703 1.86334 13.5703H13.1377C13.3585 13.5703 13.5703 13.3603 13.5703 13.1338V1.86718C13.5703 1.64074 13.3585 1.43071 13.1377 1.43071H1.92086ZM0.627835 1.86596C0.628524 1.16847 1.2217 0.570312 1.92086 0.570312H13.1377C13.8372 0.570312 14.4307 1.16916 14.4307 1.86718V13.1338C14.4307 13.8319 13.8372 14.4307 13.1377 14.4307H1.86334C1.16378 14.4307 0.570312 13.8319 0.570312 13.1338L0.570318 13.1316L0.627835 1.86718C0.627835 1.86677 0.627835 1.86636 0.627835 1.86596Z" fill="inherit"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M2.59961 2.99961C2.59961 2.7787 2.7787 2.59961 2.99961 2.59961H11.9996C12.2205 2.59961 12.3996 2.7787 12.3996 2.99961V4.59961C12.3996 4.82052 12.2205 4.99961 11.9996 4.99961H2.99961C2.7787 4.99961 2.59961 4.82052 2.59961 4.59961V2.99961ZM3.39961 3.39961V4.19961H11.5996V3.39961H3.39961Z" fill="inherit"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M2.59961 6.59922C2.59961 6.3783 2.7787 6.19922 2.99961 6.19922H11.9996C12.2205 6.19922 12.3996 6.3783 12.3996 6.59922V8.19922C12.3996 8.42013 12.2205 8.59922 11.9996 8.59922H2.99961C2.7787 8.59922 2.59961 8.42013 2.59961 8.19922V6.59922ZM3.39961 6.99922V7.79922H11.5996V6.99922H3.39961Z" fill="inherit"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M2.59961 10.1988C2.59961 9.97791 2.7787 9.79883 2.99961 9.79883H11.9996C12.2205 9.79883 12.3996 9.97791 12.3996 10.1988V11.7988C12.3996 12.0197 12.2205 12.1988 11.9996 12.1988H2.99961C2.7787 12.1988 2.59961 12.0197 2.59961 11.7988V10.1988ZM3.39961 10.5988V11.3988H11.5996V10.5988H3.39961Z" fill="inherit"/>
+</svg>
diff --git a/public/img/icons/custom/gf-portrait.svg b/public/img/icons/custom/gf-portrait.svg
new file mode 100644
index 00000000000..5494958b439
--- /dev/null
+++ b/public/img/icons/custom/gf-portrait.svg
@@ -0,0 +1,7 @@
+<svg viewBox="0 0 13 15" fill="black" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5 3.45081C5 2.62394 5.69242 2 6.50281 2C7.27653 2 8.00562 2.53584 8.00562 3.39617C8.00562 4.22304 7.3132 4.84698 6.50281 4.84698C5.80424 4.84698 5 4.32631 5 3.45081ZM6.50281 2.93452C6.16259 2.93452 5.93452 3.18485 5.93452 3.45081C5.93452 3.66815 6.16583 3.91246 6.50281 3.91246C6.84303 3.91246 7.0711 3.66214 7.0711 3.39617C7.0711 3.16367 6.8797 2.93452 6.50281 2.93452Z" fill="inherit"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M4 6.29766C4 6.04913 4.20147 5.84766 4.45 5.84766H8.59132C8.83985 5.84766 9.04132 6.04913 9.04132 6.29766C9.04132 6.54618 8.83985 6.74766 8.59132 6.74766H4.45C4.20147 6.74766 4 6.54618 4 6.29766Z" fill="inherit"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M4 8.09844C4 7.84991 4.20147 7.64844 4.45 7.64844H8.59132C8.83985 7.64844 9.04132 7.84991 9.04132 8.09844C9.04132 8.34697 8.83985 8.54844 8.59132 8.54844H4.45C4.20147 8.54844 4 8.34697 4 8.09844Z" fill="inherit"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10.2066 9.69714C10.3817 9.88674 10.3699 10.1824 10.1803 10.3574L8.1092 12.2699C8.0733 12.303 8.03243 12.3303 7.98807 12.3508C7.97063 12.3589 7.95406 12.3675 7.93004 12.3803C7.92816 12.3813 7.92613 12.3824 7.92398 12.3835C7.90296 12.3948 7.86996 12.4124 7.83578 12.4282C7.74555 12.4698 7.63256 12.5064 7.48763 12.5064C7.24563 12.5064 7.01131 12.404 6.86606 12.2699L5.88009 11.3594C5.86722 11.3528 5.85576 11.3467 5.84596 11.3415C5.84105 11.3388 5.8367 11.3365 5.83282 11.3345L3.78426 13.2261C3.59466 13.4012 3.29904 13.3894 3.12397 13.1998C2.9489 13.0102 2.96068 12.7146 3.15027 12.5395L5.22137 10.6271C5.36661 10.493 5.60093 10.3906 5.84293 10.3906C5.98787 10.3906 6.10085 10.4271 6.19109 10.4688C6.22526 10.4846 6.25827 10.5022 6.27928 10.5134C6.28144 10.5146 6.28346 10.5157 6.28535 10.5167C6.30936 10.5295 6.32594 10.5381 6.34337 10.5461C6.38773 10.5666 6.42861 10.5939 6.4645 10.6271L7.47752 11.5625C7.4814 11.5604 7.48575 11.5581 7.49066 11.5555C7.50045 11.5503 7.51192 11.5442 7.52479 11.5375L9.54631 9.67085C9.7359 9.49578 10.0315 9.50755 10.2066 9.69714Z" fill="inherit"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.7419 0.9375H1.25806C1.14226 0.9375 1.04839 1.02145 1.04839 1.125V13.875C1.04839 13.9786 1.14226 14.0625 1.25806 14.0625H11.7419C11.8577 14.0625 11.9516 13.9786 11.9516 13.875V1.125C11.9516 1.02145 11.8577 0.9375 11.7419 0.9375ZM1.25806 0C0.563255 0 0 0.503679 0 1.125V13.875C0 14.4963 0.563255 15 1.25806 15H11.7419C12.4367 15 13 14.4963 13 13.875V1.125C13 0.50368 12.4367 0 11.7419 0H1.25806Z" fill="inherit"/>
+</svg>