diff --git a/src/components/Icon/IconsMap.ts b/src/components/Icon/IconsMap.ts
index 886f81b0..adfc290c 100644
--- a/src/components/Icon/IconsMap.ts
+++ b/src/components/Icon/IconsMap.ts
@@ -8,6 +8,11 @@ import { ReactComponent as QUERY_SERVICE } from '../assets/icons/query-service.s
 import { ReactComponent as SALESFORCE } from '../assets/icons/salesforce.svg'
 import { ReactComponent as ZOOM } from '../assets/icons/zoom.svg'
 
+/*
+NOTE: When you add an svg, make sure it doesn't have a predefined height and width. The viewbox property dissapears if you try to set the dimensions outside storybook. https://github.com/gregberge/svgr/issues/500
+
+TODO: Find a better rollup plugin that handles importing images as ReactComponent's. 
+*/
 const Icons = {
 	appStore: APP_STORE,
 	aws: AWS,
diff --git a/src/components/assets/icons/app-store.svg b/src/components/assets/icons/app-store.svg
index 10ad03f1..c73b5d3e 100644
--- a/src/components/assets/icons/app-store.svg
+++ b/src/components/assets/icons/app-store.svg
@@ -1,10 +1,4 @@
-<svg
-	width="24"
-	height="24"
-	viewBox="0 0 24 24"
-	fill="#7E8083"
-	xmlns="http://www.w3.org/2000/svg"
->
+<svg viewBox="0 0 24 24" fill="#7E8083" xmlns="http://www.w3.org/2000/svg">
 	<path
 		d="M10.875 3.375H3.75C3.54375 3.375 3.375 3.54375 3.375 3.75V10.875C3.375 11.0813 3.54375 11.25 3.75 11.25H10.875C11.0813 11.25 11.25 11.0813 11.25 10.875V3.75C11.25 3.54375 11.0813 3.375 10.875 3.375ZM9.65625 9.65625H4.96875V4.96875H9.65625V9.65625ZM20.25 3.375H13.125C12.9187 3.375 12.75 3.54375 12.75 3.75V10.875C12.75 11.0813 12.9187 11.25 13.125 11.25H20.25C20.4563 11.25 20.625 11.0813 20.625 10.875V3.75C20.625 3.54375 20.4563 3.375 20.25 3.375ZM19.0312 9.65625H14.3438V4.96875H19.0312V9.65625ZM10.875 12.75H3.75C3.54375 12.75 3.375 12.9187 3.375 13.125V20.25C3.375 20.4563 3.54375 20.625 3.75 20.625H10.875C11.0813 20.625 11.25 20.4563 11.25 20.25V13.125C11.25 12.9187 11.0813 12.75 10.875 12.75ZM9.65625 19.0312H4.96875V14.3438H9.65625V19.0312ZM20.25 12.75H13.125C12.9187 12.75 12.75 12.9187 12.75 13.125V20.25C12.75 20.4563 12.9187 20.625 13.125 20.625H20.25C20.4563 20.625 20.625 20.4563 20.625 20.25V13.125C20.625 12.9187 20.4563 12.75 20.25 12.75ZM19.0312 19.0312H14.3438V14.3438H19.0312V19.0312Z"
 	/>
diff --git a/src/components/assets/icons/aws.svg b/src/components/assets/icons/aws.svg
index 2bd4c1a1..6ce522da 100644
--- a/src/components/assets/icons/aws.svg
+++ b/src/components/assets/icons/aws.svg
@@ -1,10 +1,4 @@
-<svg
-	width="100"
-	height="100"
-	viewBox="0 0 100 100"
-	fill="none"
-	xmlns="http://www.w3.org/2000/svg"
->
+<svg viewBox="0 0 100 100" fill="none" xmlns="http://www.w3.org/2000/svg">
 	<g id="App icon/logo">
 		<g id="aws">
 			<path
diff --git a/src/components/assets/icons/azure.svg b/src/components/assets/icons/azure.svg
index a3eafd72..c1958928 100644
--- a/src/components/assets/icons/azure.svg
+++ b/src/components/assets/icons/azure.svg
@@ -1,10 +1,4 @@
-<svg
-	width="100"
-	height="100"
-	viewBox="0 0 100 100"
-	fill="none"
-	xmlns="http://www.w3.org/2000/svg"
->
+<svg viewBox="0 0 100 100" fill="none" xmlns="http://www.w3.org/2000/svg">
 	<g id="App icon/logo">
 		<g id="azure" clip-path="url(#clip0)">
 			<path
diff --git a/src/components/assets/icons/dassana.svg b/src/components/assets/icons/dassana.svg
index 5d268c4a..916ec744 100644
--- a/src/components/assets/icons/dassana.svg
+++ b/src/components/assets/icons/dassana.svg
@@ -1,10 +1,4 @@
-<svg
-	width="44"
-	height="44"
-	viewBox="0 0 44 44"
-	fill="#7E8083"
-	xmlns="http://www.w3.org/2000/svg"
->
+<svg viewBox="0 0 44 44" fill="#7E8083" xmlns="http://www.w3.org/2000/svg">
 	<path
 		d="M29.2732 41.5745L28.9277 40.6361L28.9263 40.6366L29.2732 41.5745ZM36.8537 36.6364L36.1487 35.9271L36.1408 35.9351L36.8537 36.6364ZM7.14634 7.10909L7.8513 7.81834L7.8513 7.81834L7.14634 7.10909ZM7.14634 36.6364L6.44139 37.3456L6.44139 37.3456L7.14634 36.6364ZM15.7381 42.894C16.27 43.0427 16.8217 42.732 16.9704 42.2001C17.1191 41.6682 16.8084 41.1165 16.2765 40.9678L15.7381 42.894ZM22.4741 42.0007C21.9222 42.0218 21.4919 42.4862 21.5129 43.0381C21.5339 43.59 21.9984 44.0203 22.5503 43.9993L22.4741 42.0007ZM23.4613 11.9488C23.4632 11.3965 23.0169 10.9473 22.4647 10.9455C21.9124 10.9436 21.4632 11.3898 21.4613 11.9421L23.4613 11.9488ZM22.4101 27.32L21.4101 27.3167V27.32H22.4101ZM21.4613 42.8539C21.465 43.4062 21.9157 43.8509 22.468 43.8472C23.0203 43.8436 23.465 43.3929 23.4613 42.8406L21.4613 42.8539ZM15.0175 26.5044C14.6233 26.1176 13.9902 26.1236 13.6033 26.5178C13.2165 26.912 13.2225 27.5451 13.6167 27.9319L15.0175 26.5044ZM21.8118 26.3008C21.4176 26.6876 21.4116 27.3208 21.7985 27.715C22.1853 28.1091 22.8184 28.1151 23.2126 27.7283L21.8118 26.3008ZM31.3056 19.7865C31.6998 19.3996 31.7058 18.7665 31.319 18.3723C30.9321 17.9781 30.299 17.9722 29.9048 18.359L31.3056 19.7865ZM29.6186 42.513C32.5249 41.4431 35.2108 39.7323 37.5665 37.3377L36.1408 35.9351C33.9892 38.1223 31.5532 39.6696 28.9277 40.6361L29.6186 42.513ZM37.5586 37.3456C41.8451 33.0851 44 27.8917 44 21.8727H42C42 27.3592 40.0574 32.0421 36.1487 35.9271L37.5586 37.3456ZM44 21.8727C44 15.8015 41.8441 10.6594 37.5586 6.39984L36.1487 7.81834C40.0583 11.7043 42 16.3366 42 21.8727H44ZM37.5586 6.39984C33.2724 2.13958 28.0501 0 22 0V2C27.5255 2 32.2398 3.93314 36.1487 7.81834L37.5586 6.39984ZM22 0C15.9499 0 10.7276 2.13958 6.44139 6.39984L7.8513 7.81834C11.7602 3.93314 16.4745 2 22 2V0ZM6.44139 6.39984C2.15494 10.6603 0 15.8538 0 21.8727H2C2 16.3862 3.94262 11.7033 7.8513 7.81834L6.44139 6.39984ZM0 21.8727C0 27.8917 2.15494 33.0851 6.44139 37.3456L7.8513 35.9271C3.94262 32.0421 2 27.3592 2 21.8727H0ZM6.44139 37.3456C9.16323 40.051 12.2805 41.9274 15.7381 42.894L16.2765 40.9678C13.178 40.1016 10.3538 38.4145 7.8513 35.9271L6.44139 37.3456ZM22.5503 43.9993C24.8754 43.9107 27.5997 43.2597 29.62 42.5125L28.9263 40.6366C27.0537 41.3292 24.5406 41.922 22.4741 42.0007L22.5503 43.9993ZM21.4613 11.9421L21.4101 27.3167L23.4101 27.3233L23.4613 11.9488L21.4613 11.9421ZM23.4101 35.16V27.32H21.4101V35.16H23.4101ZM23.4613 42.8406L23.4101 35.1533L21.4101 35.1667L21.4613 42.8539L23.4613 42.8406ZM23.1105 34.4463L15.0175 26.5044L13.6167 27.9319L21.7097 35.8737L23.1105 34.4463ZM23.2126 27.7283L31.3056 19.7865L29.9048 18.359L21.8118 26.3008L23.2126 27.7283ZM24.5854 11.6909C24.5854 12.8199 23.6629 13.7455 22.5122 13.7455V15.7455C24.756 15.7455 26.5854 13.9359 26.5854 11.6909H24.5854ZM22.5122 13.7455C21.3615 13.7455 20.439 12.8199 20.439 11.6909H18.439C18.439 13.9359 20.2684 15.7455 22.5122 15.7455V13.7455ZM20.439 11.6909C20.439 10.5619 21.3615 9.63636 22.5122 9.63636V7.63636C20.2684 7.63636 18.439 9.44592 18.439 11.6909H20.439ZM22.5122 9.63636C23.6629 9.63636 24.5854 10.5619 24.5854 11.6909H26.5854C26.5854 9.44592 24.756 7.63636 22.5122 7.63636V9.63636ZM32.7805 19.3273C32.7805 20.4562 31.858 21.3818 30.7073 21.3818V23.3818C32.9511 23.3818 34.7805 21.5723 34.7805 19.3273H32.7805ZM30.7073 21.3818C29.5566 21.3818 28.6341 20.4562 28.6341 19.3273H26.6341C26.6341 21.5723 28.4635 23.3818 30.7073 23.3818V21.3818ZM28.6341 19.3273C28.6341 18.1983 29.5566 17.2727 30.7073 17.2727V15.2727C28.4635 15.2727 26.6341 17.0823 26.6341 19.3273H28.6341ZM30.7073 17.2727C31.858 17.2727 32.7805 18.1983 32.7805 19.3273H34.7805C34.7805 17.0823 32.9511 15.2727 30.7073 15.2727V17.2727ZM16.3902 26.9636C16.3902 28.0926 15.4678 29.0182 14.3171 29.0182V31.0182C16.5609 31.0182 18.3902 29.2086 18.3902 26.9636H16.3902ZM14.3171 29.0182C13.1664 29.0182 12.2439 28.0926 12.2439 26.9636H10.2439C10.2439 29.2086 12.0733 31.0182 14.3171 31.0182V29.0182ZM12.2439 26.9636C12.2439 25.8347 13.1664 24.9091 14.3171 24.9091V22.9091C12.0733 22.9091 10.2439 24.7186 10.2439 26.9636H12.2439ZM14.3171 24.9091C15.4678 24.9091 16.3902 25.8347 16.3902 26.9636H18.3902C18.3902 24.7186 16.5609 22.9091 14.3171 22.9091V24.9091Z"
 	/>
diff --git a/src/components/assets/icons/github.svg b/src/components/assets/icons/github.svg
index 0f169bdb..31e6eb64 100644
--- a/src/components/assets/icons/github.svg
+++ b/src/components/assets/icons/github.svg
@@ -1,10 +1,4 @@
-<svg
-	width="100"
-	height="100"
-	viewBox="0 0 100 100"
-	fill="none"
-	xmlns="http://www.w3.org/2000/svg"
->
+<svg viewBox="0 0 100 100" fill="none" xmlns="http://www.w3.org/2000/svg">
 	<g id="App icon/logo">
 		<g id="github">
 			<path
diff --git a/src/components/assets/icons/google-cloud-platform.svg b/src/components/assets/icons/google-cloud-platform.svg
index 553ef21e..70c3c883 100644
--- a/src/components/assets/icons/google-cloud-platform.svg
+++ b/src/components/assets/icons/google-cloud-platform.svg
@@ -1,10 +1,4 @@
-<svg
-	width="100"
-	height="100"
-	viewBox="0 0 100 100"
-	fill="none"
-	xmlns="http://www.w3.org/2000/svg"
->
+<svg viewBox="0 0 100 100" fill="none" xmlns="http://www.w3.org/2000/svg">
 	<g id="cards">
 		<g id="App icon/logo">
 			<g id="GCP" clip-path="url(#clip0)">
diff --git a/src/components/assets/icons/query-service.svg b/src/components/assets/icons/query-service.svg
index a1562f25..df0096d5 100644
--- a/src/components/assets/icons/query-service.svg
+++ b/src/components/assets/icons/query-service.svg
@@ -1,10 +1,4 @@
-<svg
-	width="24"
-	height="24"
-	viewBox="0 0 24 24"
-	fill="#7E8083"
-	xmlns="http://www.w3.org/2000/svg"
->
+<svg viewBox="0 0 24 24" fill="#7E8083" xmlns="http://www.w3.org/2000/svg">
 	<path
 		d="M17.3438 3.77344C15.8953 3.77344 14.7188 4.95 14.7188 6.39844C14.7188 7.57266 15.4945 8.56875 16.5586 8.90391V11.1516L7.5 14.1187V7.45547C8.53594 7.10391 9.28125 6.12187 9.28125 4.96875C9.28125 3.52031 8.10469 2.34375 6.65625 2.34375C5.20781 2.34375 4.03125 3.52031 4.03125 4.96875C4.03125 6.12187 4.77656 7.10156 5.8125 7.45547V16.5469C4.77656 16.8984 4.03125 17.8805 4.03125 19.0336C4.03125 20.482 5.20781 21.6586 6.65625 21.6586C8.10469 21.6586 9.28125 20.482 9.28125 19.0336C9.28125 17.8805 8.53594 16.9008 7.5 16.5469V15.8953L17.4258 12.6445C17.6641 12.567 17.8718 12.4159 18.0187 12.2129C18.1657 12.0099 18.2445 11.7655 18.2438 11.5148V8.86406C19.2492 8.49375 19.9688 7.52812 19.9688 6.39844C19.9688 4.95 18.7922 3.77344 17.3438 3.77344ZM5.53125 4.96875C5.53726 4.67436 5.65843 4.39405 5.86875 4.18798C6.07907 3.9819 6.3618 3.86648 6.65625 3.86648C6.9507 3.86648 7.23343 3.9819 7.44375 4.18798C7.65407 4.39405 7.77524 4.67436 7.78125 4.96875C7.77524 5.26314 7.65407 5.54345 7.44375 5.74952C7.23343 5.9556 6.9507 6.07102 6.65625 6.07102C6.3618 6.07102 6.07907 5.9556 5.86875 5.74952C5.65843 5.54345 5.53726 5.26314 5.53125 4.96875V4.96875ZM7.78125 19.0312C7.77524 19.3256 7.65407 19.6059 7.44375 19.812C7.23343 20.0181 6.9507 20.1335 6.65625 20.1335C6.3618 20.1335 6.07907 20.0181 5.86875 19.812C5.65843 19.6059 5.53726 19.3256 5.53125 19.0312C5.53726 18.7369 5.65843 18.4565 5.86875 18.2505C6.07907 18.0444 6.3618 17.929 6.65625 17.929C6.9507 17.929 7.23343 18.0444 7.44375 18.2505C7.65407 18.4565 7.77524 18.7369 7.78125 19.0312ZM17.3438 7.52344C17.0494 7.51743 16.769 7.39626 16.563 7.18594C16.3569 6.97561 16.2415 6.69289 16.2415 6.39844C16.2415 6.10398 16.3569 5.82126 16.563 5.61094C16.769 5.40061 17.0494 5.27945 17.3438 5.27344C17.6381 5.27945 17.9185 5.40061 18.1245 5.61094C18.3306 5.82126 18.446 6.10398 18.446 6.39844C18.446 6.69289 18.3306 6.97561 18.1245 7.18594C17.9185 7.39626 17.6381 7.51743 17.3438 7.52344V7.52344Z"
 	/>
diff --git a/src/components/assets/icons/salesforce.svg b/src/components/assets/icons/salesforce.svg
index c3a7d9a1..086a0108 100644
--- a/src/components/assets/icons/salesforce.svg
+++ b/src/components/assets/icons/salesforce.svg
@@ -1,10 +1,4 @@
-<svg
-	width="100"
-	height="100"
-	viewBox="0 0 100 100"
-	fill="none"
-	xmlns="http://www.w3.org/2000/svg"
->
+<svg viewBox="0 0 100 100" fill="none" xmlns="http://www.w3.org/2000/svg">
 	<g id="App icon/logo">
 		<g id="salesforce" clip-path="url(#clip0)">
 			<path
diff --git a/src/components/assets/icons/zoom.svg b/src/components/assets/icons/zoom.svg
index 287cccf8..cce59507 100644
--- a/src/components/assets/icons/zoom.svg
+++ b/src/components/assets/icons/zoom.svg
@@ -1,10 +1,4 @@
-<svg
-	width="100"
-	height="100"
-	viewBox="0 0 100 100"
-	fill="none"
-	xmlns="http://www.w3.org/2000/svg"
->
+<svg viewBox="0 0 100 100" fill="none" xmlns="http://www.w3.org/2000/svg">
 	<g id="App icon/logo">
 		<g id="zoom" clip-path="url(#clip0)">
 			<path