diff --git a/packages/dashboard/public/images/service-icons-mini/chargebee.svg b/packages/dashboard/public/images/service-icons-mini/chargebee.svg
new file mode 100644
index 0000000..e6aa845
--- /dev/null
+++ b/packages/dashboard/public/images/service-icons-mini/chargebee.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>chargebee</title>
+    <g id="chargebee" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <rect fill="#012A38" x="0" y="0" width="24" height="24"></rect>
+        <g id="Group-2" transform="translate(4.2226, 4.0543)" fill="#FF3300" fill-rule="nonzero">
+            <polygon id="Path" points="5.15485659 7.94642884 15.5548323 5.44314551 15.5548323 0 10.1618806 0"></polygon>
+            <path d="M0,7.85071087 C0,8.50191122 0.0786445058,9.13395471 0.227194944,9.73954982 L5.15412743,7.94622998 L0.186416704,6.13677596 C0.0655370439,6.68797622 0,7.26128971 0,7.84925256 L0,7.85071087 Z" id="Path"></path>
+            <path d="M1.83226989,2.78969634 L5.15281496,7.94622998 L6.68348708,0.0776795706 C4.74502593,0.352556512 3.03669224,1.34916747 1.83226989,2.78969634 Z" id="Path"></path>
+            <polygon id="Path" points="5.15485659 7.94636255 15.5548323 10.4482207 15.5548323 15.8913514 10.1618806 15.8913514"></polygon>
+            <path d="M1.8325947,13.1012125 L5.15313976,7.94470538 L6.68236021,15.8117411 C4.74389243,15.5368503 3.03556537,14.54023 1.83113639,13.0997542 L1.8325947,13.1012125 Z" id="Path"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/packages/dashboard/public/images/service-icons-mini/cloudfront.svg b/packages/dashboard/public/images/service-icons-mini/cloudfront.svg
new file mode 100644
index 0000000..c8377f0
--- /dev/null
+++ b/packages/dashboard/public/images/service-icons-mini/cloudfront.svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="75px" height="75px" viewBox="0 0 75 75" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>cloudfront copy</title>
+    <g id="cloudfront-copy" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Arch_Amazon-Simple-Email-Service_64" transform="translate(10, 9)" fill="#FFFFFF" fill-rule="nonzero">
+            <path d="M45,48.999875 C45,47.373846 43.626,45.9998214 42,45.9998214 C40.374,45.9998214 39,47.373846 39,48.999875 C39,50.625904 40.374,51.9999286 42,51.9999286 C43.626,51.9999286 45,50.625904 45,48.999875 L45,48.999875 Z M28,47.9998571 C26.374,47.9998571 25,49.3738817 25,50.9999107 C25,52.6259397 26.374,53.9999643 28,53.9999643 C29.626,53.9999643 31,52.6259397 31,50.9999107 C31,49.3738817 29.626,47.9998571 28,47.9998571 L28,47.9998571 Z M14,45.9998214 C12.374,45.9998214 11,47.373846 11,48.999875 C11,50.625904 12.374,51.9999286 14,51.9999286 C15.626,51.9999286 17,50.625904 17,48.999875 C17,47.373846 15.626,45.9998214 14,45.9998214 L14,45.9998214 Z M16.605,30.9995536 L39.395,30.9995536 L31.739,24.1104305 L28.649,26.7584778 C28.463,26.9194807 28.23,26.9994821 27.999,26.9994821 C27.768,26.9994821 27.535,26.9194807 27.349,26.7584778 L24.26,24.1104305 L16.605,30.9995536 Z M15,16.1732888 L15,29.7545313 L22.729,22.7984071 L15,16.1732888 Z M39.297,14.9992678 L16.703,14.9992678 L27.999,24.6824408 L39.297,14.9992678 Z M41,29.7545313 L41,16.1732888 L33.271,22.7974071 L41,29.7545313 Z M47,48.999875 C47,51.7099234 44.71,53.9999643 42,53.9999643 C39.29,53.9999643 37,51.7099234 37,48.999875 C37,46.6308327 38.75,44.5837961 41,44.1057876 L41,40.9997321 L29,40.9997321 L29,46.1058233 C31.25,46.5838319 33,48.6308684 33,50.9999107 C33,53.7099591 30.71,56 28,56 C25.29,56 23,53.7099591 23,50.9999107 C23,48.6308684 24.75,46.5838319 27,46.1058233 L27,40.9997321 L15,40.9997321 L15,44.1057876 C17.25,44.5837961 19,46.6308327 19,48.999875 C19,51.7099234 16.71,53.9999643 14,53.9999643 C11.29,53.9999643 9,51.7099234 9,48.999875 C9,46.6308327 10.75,44.5837961 13,44.1057876 L13,39.9997143 C13,39.4477044 13.447,38.9996964 14,38.9996964 L27,38.9996964 L27,32.9995893 L14,32.9995893 C13.447,32.9995893 13,32.5515813 13,31.9995714 L13,13.99925 C13,13.4472401 13.447,12.9992321 14,12.9992321 L42,12.9992321 C42.553,12.9992321 43,13.4472401 43,13.99925 L43,31.9995714 C43,32.5515813 42.553,32.9995893 42,32.9995893 L29,32.9995893 L29,38.9996964 L42,38.9996964 C42.553,38.9996964 43,39.4477044 43,39.9997143 L43,44.1057876 C45.25,44.5837961 47,46.6308327 47,48.999875 L47,48.999875 Z M56,27.9995 C56,33.9066055 54.177,39.5597064 50.727,44.3447919 L49.104,43.174771 C52.307,38.7316916 54,33.4845979 54,27.9995 C54,13.664244 42.337,2.0000357 28.001,2.0000357 C13.664,2.0000357 2,13.664244 2,27.9995 C2,33.4845979 3.693,38.7316916 6.896,43.174771 L5.273,44.3447919 C1.823,39.5597064 0,33.9066055 0,27.9995 C0,12.5612243 12.561,0 27.999,0 C43.438,0 56,12.5612243 56,27.9995 L56,27.9995 Z" id="Amazon-Simple-Email-Service_Icon_64_Squid"></path>
+        </g>
+        <g id="amazon-cloudfront" fill-rule="nonzero">
+            <rect id="Purple_Gradient" fill="#8C4FFF" x="0" y="0" width="75" height="75"></rect>
+            <g id="Icon_Test" transform="translate(13, 12.0025)" fill="#FFFFFF">
+                <path d="M33.64,48.167455 L31.86,47.247455 C32.8085466,45.4435257 33.5692085,43.5468974 34.13,41.587455 L36.05,42.147455 C35.4530374,44.2307058 34.645541,46.2477713 33.64,48.167455 Z M35.5,29.857455 C35.1540291,24.2580494 33.3361251,18.8491812 30.23,14.177455 L31.9,13.087455 C35.2010406,18.0471191 37.1329148,23.7909951 37.5,29.737455 L35.5,29.857455 Z M22.31,5.72745497 C20.8586523,4.64361348 19.3123696,3.69308477 17.69,2.88745497 L18.6,1.10745497 C20.3270424,1.95716863 21.9737425,2.96125403 23.52,4.10745497 L22.31,5.72745497 Z" id="Shape"></path>
+                <path d="M30.5,32.397455 C27.3435799,29.2624609 23.52758,26.8710554 19.33,25.397455 L19.95,23.497455 C24.420557,25.0665505 28.4856024,27.6114739 31.85,30.947455 L30.5,32.397455 Z" id="Path"></path>
+                <path d="M38.74,44.337455 C38.37,43.337455 37.95,42.417455 37.49,41.487455 L39.28,40.597455 C39.7732477,41.5745726 40.2171395,42.5758323 40.61,43.597455 L38.74,44.337455 Z" id="Path"></path>
+                <path d="M33.07,48.647455 L32.43,46.757455 C34.8256168,45.9501025 37.0672836,44.7430511 39.06,43.187455 L40.29,44.767455 C38.1197565,46.4593018 35.6785404,47.7712019 33.07,48.647455 L33.07,48.647455 Z" id="Path"></path>
+                <path d="M1.28,24.497455 L0.82,22.557455 C3.03738356,22.0143934 5.30759899,21.7159456 7.59,21.667455 L7.64,23.667455 C5.49607479,23.7113512 3.36338674,23.9896737 1.28,24.497455 L1.28,24.497455 Z" id="Path"></path>
+                <path d="M17.68,18.137455 L16,17.047455 C17.4679034,14.6633628 19.2771074,12.5071421 21.37,10.647455 L22.69,12.157455 C20.7356008,13.8941404 19.0475046,15.9090736 17.68,18.137455 L17.68,18.137455 Z" id="Path"></path>
+                <path d="M32.55,6.27745497 L31.87,4.39745497 C33.3751649,3.83317579 34.9235604,3.39173259 36.5,3.07745497 L36.87,5.07745497 C35.3991158,5.3565426 33.9540978,5.75793648 32.55,6.27745497 L32.55,6.27745497 Z" id="Path"></path>
+                <path d="M12.75,46.497455 C11.1156476,42.7043879 10.2424439,38.6271724 10.18,34.497455 C10.2131016,32.9061572 10.4210168,31.3233191 10.8,29.777455 C10.87,29.427455 10.95,29.067455 11.02,28.697455 L13.02,29.087455 C12.95,29.467455 12.87,29.827455 12.8,30.187455 C12.4505809,31.598769 12.2560981,33.0439771 12.22,34.497455 C12.2653426,38.3772142 13.0740528,42.2100928 14.6,45.777455 L12.75,46.497455 Z" id="Path"></path>
+                <path d="M25,49.997455 C11.1928813,49.997455 0,38.8045737 0,24.997455 C0,24.487455 0,23.997455 0.05,23.487455 C0.683098541,13.0065545 7.79789766,4.03815245 17.86,1.03745497 C24.3399371,-0.889815176 31.3241675,-0.110582851 37.22,3.19745497 C44.5362565,7.29972466 49.3077062,14.7976175 49.9253309,23.1627095 C50.5429555,31.5278016 46.9244352,39.6451559 40.29,44.777455 C35.9043639,48.1483926 30.531438,49.9827074 25,49.997455 L25,49.997455 Z M25,1.99745497 C22.7726426,2.00462961 20.5586265,2.34161836 18.43,2.99745497 C9.18277977,5.75687976 2.64145004,13.995441 2.05,23.627455 C2.05,24.097455 2,24.547455 2,24.997455 C2,37.7000042 12.2974508,47.9974823 25,47.9974823 C27.5252246,48.001378 30.0332664,47.5822444 32.42,46.757455 C34.8197452,45.9525579 37.0651,44.7453416 39.06,43.187455 C46.8368522,37.1696343 49.9277728,26.8735194 46.7511926,17.5674497 C43.5746123,8.26138003 34.8332878,2.0041426 25,1.99745497 Z" id="Shape"></path>
+                <path d="M27.43,13.4274663 C25.6373232,13.4274663 24.0213554,12.3470304 23.3362657,10.6904248 C22.6511759,9.03381921 23.0320243,7.12761517 24.3010698,5.8614344 C25.5701152,4.59525364 27.477175,4.21871397 29.1322282,4.90754572 C30.7872813,5.59637747 31.8640467,7.21478276 31.8600114,9.00745497 C31.8600114,10.1814465 31.3929533,11.3072089 30.5618784,12.1364078 C29.7308036,12.9656066 28.6039885,13.4301111 27.43,13.4274663 L27.43,13.4274663 Z M27.43,6.57745497 C26.0879481,6.57745497 25,7.66540303 25,9.00745497 C25,10.3495069 26.0879481,11.437455 27.43,11.437455 C28.7720519,11.437455 29.86,10.3495069 29.86,9.00745497 C29.86,7.66540303 28.7720519,6.57745497 27.43,6.57745497 L27.43,6.57745497 Z" id="Shape"></path>
+                <path d="M13.79,27.377455 C11.3433786,27.377455 9.36,25.3940764 9.36,22.947455 C9.36,20.5008335 11.3433786,18.517455 13.79,18.517455 C16.2366214,18.517455 18.22,20.5008335 18.22,22.947455 C18.2145009,25.391795 16.23434,27.3719559 13.79,27.377455 Z M13.79,20.517455 C12.4479481,20.517455 11.36,21.605403 11.36,22.947455 C11.36,24.2895069 12.4479481,25.377455 13.79,25.377455 C15.1320519,25.377455 16.22,24.2895069 16.22,22.947455 C16.225333,22.2995206 15.9716721,21.6762901 15.5153794,21.216242 C15.0590867,20.7561938 14.4379563,20.497455 13.79,20.497455 L13.79,20.517455 Z" id="Shape"></path>
+                <path d="M35.78,40.1974663 C33.9864187,40.2014991 32.3673821,39.1236494 31.6791388,37.467367 C30.9908955,35.8110845 31.3692715,33.9032399 32.6375282,32.6349832 C33.905785,31.3667265 35.8136296,30.9883504 37.469912,31.6765938 C39.1261944,32.3648371 40.2040442,33.9838736 40.2000113,35.777455 C40.2000113,38.2185536 38.2210986,40.1974663 35.78,40.1974663 Z M35.78,33.3474342 C34.7962569,33.3434066 33.9071262,33.9328834 33.5278555,34.8405842 C33.1485849,35.748285 33.3540098,36.7951073 34.0481914,37.4921574 C34.742373,38.1892075 35.7883392,38.3989474 36.6975963,38.0234231 C37.6068533,37.6478987 38.2,36.7612064 38.2,35.777455 C38.2,34.4392986 37.118145,33.3529618 35.78,33.3474342 L35.78,33.3474342 Z" id="Shape"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/packages/dashboard/public/images/service-icons-mini/shopify.svg b/packages/dashboard/public/images/service-icons-mini/shopify.svg
new file mode 100644
index 0000000..bbc7438
--- /dev/null
+++ b/packages/dashboard/public/images/service-icons-mini/shopify.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>shopify</title>
+    <g id="shopify" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <rect fill="#122A23" x="0" y="0" width="24" height="24"></rect>
+        <g id="Group" transform="translate(4.2297, 3.193)" fill-rule="nonzero">
+            <path d="M13.613712,3.39613641 C13.603296,3.30239241 13.519968,3.26072841 13.457472,3.25031241 C13.394976,3.23989641 12.145056,3.22948041 12.145056,3.22948041 C12.145056,3.22948041 11.09304,2.20871241 10.98888,2.10455241 C10.88472,2.00039241 10.686816,2.03164041 10.603488,2.05247241 C10.603488,2.05247241 10.405584,2.11496841 10.072272,2.21912841 C10.020192,2.04205641 9.936864,1.82332041 9.822288,1.60458441 C9.447312,0.885880415 8.90568,0.510904415 8.239056,0.510904415 C8.197392,0.510904415 8.145312,0.510904415 8.103648,0.521320415 C8.082816,0.500488415 8.061984,0.479656415 8.041152,0.448408415 C7.749504,0.135928415 7.384944,-0.00989558514 6.947472,0.000520414864 C6.09336,0.0213524149 5.249664,0.635896415 4.551792,1.73999241 C4.06224,2.51077641 3.69768,3.47946441 3.59352,4.22941641 C2.614416,4.53148041 1.92696,4.73980041 1.916544,4.75021641 C1.426992,4.90645641 1.40616,4.91687241 1.343664,5.38559241 C1.291584,5.72932041 0,15.7390964 0,15.7390964 L10.843056,17.6139764 L15.540672,16.4473844 C15.540672,16.4473844 13.624128,3.47946441 13.613712,3.39613641 Z M9.53064,2.38578441 C9.280656,2.45869641 8.999424,2.55244041 8.686944,2.64618441 C8.676528,2.21912841 8.624448,1.61500041 8.426544,1.09420041 C9.082752,1.21919241 9.395232,1.94831241 9.53064,2.38578441 Z M8.12448,2.82325641 C7.5516,3.00032841 6.937056,3.18781641 6.312096,3.38572041 C6.489168,2.71909641 6.82248,2.05247241 7.228704,1.61500041 C7.384944,1.44834441 7.593264,1.27127241 7.843248,1.16711241 C8.082816,1.65666441 8.12448,2.35453641 8.12448,2.82325641 L8.12448,2.82325641 Z M6.957888,0.573400415 C7.155792,0.573400415 7.322448,0.615064415 7.468272,0.708808415 C7.23912,0.823384415 7.009968,1.00045641 6.801648,1.22960841 C6.260016,1.81290441 5.843376,2.70868041 5.67672,3.58362441 C5.15592,3.73986441 4.655952,3.89610441 4.187232,4.04192841 C4.499712,2.66701641 5.645472,0.615064415 6.957888,0.573400415 L6.957888,0.573400415 Z" id="Shape" fill="#95BF47"></path>
+            <path d="M13.457472,3.25031241 C13.394976,3.23989641 12.145056,3.22948041 12.145056,3.22948041 C12.145056,3.22948041 11.09304,2.20871241 10.98888,2.10455241 C10.947216,2.06288841 10.895136,2.04205641 10.843056,2.04205641 L10.843056,17.6139764 L15.540672,16.4473844 C15.540672,16.4473844 13.624128,3.48988041 13.613712,3.39613641 C13.59288,3.30239241 13.519968,3.26072841 13.457472,3.25031241 Z" id="Path" fill="#5E8E3E"></path>
+            <path d="M8.239056,5.66682441 L7.697424,7.70836041 C7.697424,7.70836041 7.093296,7.42712841 6.364176,7.47920841 C5.301744,7.54170441 5.291328,8.20832841 5.301744,8.38540041 C5.36424,9.30200841 7.75992,9.49991241 7.895328,11.6351924 C7.999488,13.3225844 6.999552,14.4683444 5.562144,14.5620884 C3.833088,14.6662484 2.885232,13.6558964 2.885232,13.6558964 L3.249792,12.1039124 C3.249792,12.1039124 4.208064,12.8226164 4.968432,12.7809524 C5.4684,12.7497044 5.645472,12.3434804 5.62464,12.0518324 C5.551728,10.8644084 3.59352,10.9269044 3.468528,8.97911241 C3.364368,7.33338441 4.447632,5.66682441 6.832896,5.51058441 C7.770336,5.42725641 8.239056,5.66682441 8.239056,5.66682441 L8.239056,5.66682441 Z" id="Path" fill="#FFFFFF"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/packages/dashboard/public/images/service-icons-mini/todoist.svg b/packages/dashboard/public/images/service-icons-mini/todoist.svg
new file mode 100644
index 0000000..616db43
--- /dev/null
+++ b/packages/dashboard/public/images/service-icons-mini/todoist.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>shopify copy 2</title>
+    <g id="shopify-copy-2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <rect fill="#FAE8DA" x="0" y="0" width="24" height="24"></rect>
+        <g id="Group" transform="translate(4.9422, 4.944)" fill="#DE483A" fill-rule="nonzero">
+            <path d="M11.8576599,-4.4408921e-16 C13.1046746,-8.8817842e-16 14.1155799,1.01090522 14.1155799,2.25792 L14.1155799,11.85408 C14.1155799,13.1010948 13.1046746,14.112 11.8576599,14.112 L2.26149985,14.112 C1.01448507,14.112 0.00357985198,13.1010948 0.00357985198,11.85408 L0.00210371913,9.99586881 C0.607236259,10.3483073 2.02266782,11.1724582 2.36998585,11.368539 C2.58078385,11.487609 2.78320285,11.484963 2.98650385,11.367657 L5.79787885,9.749628 L8.69745385,8.080884 C8.81961085,8.010324 8.82578485,7.793793 8.68907485,7.715295 C8.52395053,7.6220651 8.35930834,7.52798385 8.19515485,7.433055 C8.05766112,7.35818564 7.89112974,7.36019003 7.75547785,7.438347 C7.72240285,7.45755184 6.63708854,8.0817091 5.50828857,8.73067677 L5.05684046,8.99021191 C4.00920855,9.59246404 3.04086066,10.1489464 2.97195085,10.187982 C2.78937685,10.292058 2.56358485,10.293381 2.38145185,10.187982 L0.003,8.806 L0.003,7.618 L0.127303676,7.69091103 C0.783459932,8.07301852 2.04482185,8.8070934 2.36998585,8.990667 C2.58122485,9.109737 2.78320285,9.107091 2.98650385,8.989785 L5.79390985,7.373961 L5.80449385,7.367787 L8.69745385,5.703012 C8.81961085,5.632452 8.82534385,5.415921 8.68863385,5.337864 L8.59293685,5.28318 C8.50932325,5.235552 8.41062745,5.17935096 8.32837919,5.1322945 L8.19515485,5.055624 C8.05766112,4.98075464 7.89112974,4.98275903 7.75547785,5.060916 C7.72240285,5.07990745 6.63708854,5.70395457 5.50828857,6.3528654 L5.05684046,6.61238053 C4.00920855,7.21459204 3.04086066,7.77107439 2.97195085,7.81011 C2.78900936,7.91469122 2.56439334,7.91469122 2.38145185,7.81011 C2.24714414,7.73265647 0.260782108,6.57830187 -2.14348391e-14,6.42674834 L0.003,5.24 L0.127226844,5.31304452 C0.783075772,5.6952014 2.04482185,6.429633 2.36998585,6.612795 C2.58122485,6.731865 2.78320285,6.729219 2.98650385,6.611913 L5.79743785,4.994325 L8.69745385,3.32514 C8.81961085,3.25458 8.82534385,3.03849 8.68863385,2.959992 L8.59293685,2.905308 C8.45313985,2.825928 8.27232985,2.722734 8.19515485,2.677752 C8.05766112,2.60288264 7.89112974,2.60488703 7.75547785,2.683044 C7.68712285,2.722734 3.12453685,5.345802 2.97195085,5.432679 C2.78900936,5.53726022 2.56439334,5.53726022 2.38145185,5.432679 L0.003,4.05 L0.00357985198,2.25792 C0.00357985198,1.01090522 1.01448507,4.4408921e-16 2.26149985,4.4408921e-16 L11.8576599,-4.4408921e-16 Z" id="Rectangle-2"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/packages/dashboard/public/images/service-icons/chargebee.svg b/packages/dashboard/public/images/service-icons/chargebee.svg
new file mode 100644
index 0000000..f95e443
--- /dev/null
+++ b/packages/dashboard/public/images/service-icons/chargebee.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="94px" height="94px" viewBox="0 0 94 94" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>chargebee</title>
+    <g id="chargebee" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <rect fill="#012A38" x="0" y="0" width="94" height="94"></rect>
+        <g id="Group-2" transform="translate(26.4349, 26.2496)" fill="#FF3300" fill-rule="nonzero">
+            <polygon id="Path" points="13.4535353 20.7391921 40.59618 14.2059336 40.59618 0 26.521246 0"></polygon>
+            <path d="M0,20.4893801 C0,22.1889321 0.20525239,23.8384871 0.59295058,25.4190151 L13.4516323,20.7386731 L0.48652444,16.0162229 C0.171043543,17.4547871 0,18.9510641 0,20.4855741 L0,20.4893801 Z" id="Path"></path>
+            <path d="M4.7819968,7.28076088 L13.4482069,20.7386731 L17.443071,0.202734029 C12.3839282,0.920128699 7.9253895,3.52115948 4.7819968,7.28076088 Z" id="Path"></path>
+            <polygon id="Path" points="13.4535353 20.7390191 40.59618 27.2685581 40.59618 41.4744531 26.521246 41.4744531"></polygon>
+            <path d="M4.7828445,34.1925371 L13.4490546,20.7346941 L17.44013,41.2666801 C12.3809699,40.5492491 7.9224485,37.9481941 4.7790385,34.1887311 L4.7828445,34.1925371 Z" id="Path"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/packages/dashboard/public/images/service-icons/cloudfront.svg b/packages/dashboard/public/images/service-icons/cloudfront.svg
new file mode 100644
index 0000000..fc79ddf
--- /dev/null
+++ b/packages/dashboard/public/images/service-icons/cloudfront.svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="94px" height="94px" viewBox="0 0 94 94" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>cloudfront</title>
+    <g id="cloudfront" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Arch_Amazon-Simple-Email-Service_64" transform="translate(19, 19)" fill="#FFFFFF" fill-rule="nonzero">
+            <path d="M45,48.999875 C45,47.373846 43.626,45.9998214 42,45.9998214 C40.374,45.9998214 39,47.373846 39,48.999875 C39,50.625904 40.374,51.9999286 42,51.9999286 C43.626,51.9999286 45,50.625904 45,48.999875 L45,48.999875 Z M28,47.9998571 C26.374,47.9998571 25,49.3738817 25,50.9999107 C25,52.6259397 26.374,53.9999643 28,53.9999643 C29.626,53.9999643 31,52.6259397 31,50.9999107 C31,49.3738817 29.626,47.9998571 28,47.9998571 L28,47.9998571 Z M14,45.9998214 C12.374,45.9998214 11,47.373846 11,48.999875 C11,50.625904 12.374,51.9999286 14,51.9999286 C15.626,51.9999286 17,50.625904 17,48.999875 C17,47.373846 15.626,45.9998214 14,45.9998214 L14,45.9998214 Z M16.605,30.9995536 L39.395,30.9995536 L31.739,24.1104305 L28.649,26.7584778 C28.463,26.9194807 28.23,26.9994821 27.999,26.9994821 C27.768,26.9994821 27.535,26.9194807 27.349,26.7584778 L24.26,24.1104305 L16.605,30.9995536 Z M15,16.1732888 L15,29.7545313 L22.729,22.7984071 L15,16.1732888 Z M39.297,14.9992678 L16.703,14.9992678 L27.999,24.6824408 L39.297,14.9992678 Z M41,29.7545313 L41,16.1732888 L33.271,22.7974071 L41,29.7545313 Z M47,48.999875 C47,51.7099234 44.71,53.9999643 42,53.9999643 C39.29,53.9999643 37,51.7099234 37,48.999875 C37,46.6308327 38.75,44.5837961 41,44.1057876 L41,40.9997321 L29,40.9997321 L29,46.1058233 C31.25,46.5838319 33,48.6308684 33,50.9999107 C33,53.7099591 30.71,56 28,56 C25.29,56 23,53.7099591 23,50.9999107 C23,48.6308684 24.75,46.5838319 27,46.1058233 L27,40.9997321 L15,40.9997321 L15,44.1057876 C17.25,44.5837961 19,46.6308327 19,48.999875 C19,51.7099234 16.71,53.9999643 14,53.9999643 C11.29,53.9999643 9,51.7099234 9,48.999875 C9,46.6308327 10.75,44.5837961 13,44.1057876 L13,39.9997143 C13,39.4477044 13.447,38.9996964 14,38.9996964 L27,38.9996964 L27,32.9995893 L14,32.9995893 C13.447,32.9995893 13,32.5515813 13,31.9995714 L13,13.99925 C13,13.4472401 13.447,12.9992321 14,12.9992321 L42,12.9992321 C42.553,12.9992321 43,13.4472401 43,13.99925 L43,31.9995714 C43,32.5515813 42.553,32.9995893 42,32.9995893 L29,32.9995893 L29,38.9996964 L42,38.9996964 C42.553,38.9996964 43,39.4477044 43,39.9997143 L43,44.1057876 C45.25,44.5837961 47,46.6308327 47,48.999875 L47,48.999875 Z M56,27.9995 C56,33.9066055 54.177,39.5597064 50.727,44.3447919 L49.104,43.174771 C52.307,38.7316916 54,33.4845979 54,27.9995 C54,13.664244 42.337,2.0000357 28.001,2.0000357 C13.664,2.0000357 2,13.664244 2,27.9995 C2,33.4845979 3.693,38.7316916 6.896,43.174771 L5.273,44.3447919 C1.823,39.5597064 0,33.9066055 0,27.9995 C0,12.5612243 12.561,0 27.999,0 C43.438,0 56,12.5612243 56,27.9995 L56,27.9995 Z" id="Amazon-Simple-Email-Service_Icon_64_Squid"></path>
+        </g>
+        <g id="amazon-cloudfront" fill-rule="nonzero">
+            <rect id="Purple_Gradient" fill="#8C4FFF" x="0" y="0" width="94" height="94"></rect>
+            <g id="Icon_Test" transform="translate(22, 22.0025)" fill="#FFFFFF">
+                <path d="M33.64,48.167455 L31.86,47.247455 C32.8085466,45.4435257 33.5692085,43.5468974 34.13,41.587455 L36.05,42.147455 C35.4530374,44.2307058 34.645541,46.2477713 33.64,48.167455 Z M35.5,29.857455 C35.1540291,24.2580494 33.3361251,18.8491812 30.23,14.177455 L31.9,13.087455 C35.2010406,18.0471191 37.1329148,23.7909951 37.5,29.737455 L35.5,29.857455 Z M22.31,5.72745497 C20.8586523,4.64361348 19.3123696,3.69308477 17.69,2.88745497 L18.6,1.10745497 C20.3270424,1.95716863 21.9737425,2.96125403 23.52,4.10745497 L22.31,5.72745497 Z" id="Shape"></path>
+                <path d="M30.5,32.397455 C27.3435799,29.2624609 23.52758,26.8710554 19.33,25.397455 L19.95,23.497455 C24.420557,25.0665505 28.4856024,27.6114739 31.85,30.947455 L30.5,32.397455 Z" id="Path"></path>
+                <path d="M38.74,44.337455 C38.37,43.337455 37.95,42.417455 37.49,41.487455 L39.28,40.597455 C39.7732477,41.5745726 40.2171395,42.5758323 40.61,43.597455 L38.74,44.337455 Z" id="Path"></path>
+                <path d="M33.07,48.647455 L32.43,46.757455 C34.8256168,45.9501025 37.0672836,44.7430511 39.06,43.187455 L40.29,44.767455 C38.1197565,46.4593018 35.6785404,47.7712019 33.07,48.647455 L33.07,48.647455 Z" id="Path"></path>
+                <path d="M1.28,24.497455 L0.82,22.557455 C3.03738356,22.0143934 5.30759899,21.7159456 7.59,21.667455 L7.64,23.667455 C5.49607479,23.7113512 3.36338674,23.9896737 1.28,24.497455 L1.28,24.497455 Z" id="Path"></path>
+                <path d="M17.68,18.137455 L16,17.047455 C17.4679034,14.6633628 19.2771074,12.5071421 21.37,10.647455 L22.69,12.157455 C20.7356008,13.8941404 19.0475046,15.9090736 17.68,18.137455 L17.68,18.137455 Z" id="Path"></path>
+                <path d="M32.55,6.27745497 L31.87,4.39745497 C33.3751649,3.83317579 34.9235604,3.39173259 36.5,3.07745497 L36.87,5.07745497 C35.3991158,5.3565426 33.9540978,5.75793648 32.55,6.27745497 L32.55,6.27745497 Z" id="Path"></path>
+                <path d="M12.75,46.497455 C11.1156476,42.7043879 10.2424439,38.6271724 10.18,34.497455 C10.2131016,32.9061572 10.4210168,31.3233191 10.8,29.777455 C10.87,29.427455 10.95,29.067455 11.02,28.697455 L13.02,29.087455 C12.95,29.467455 12.87,29.827455 12.8,30.187455 C12.4505809,31.598769 12.2560981,33.0439771 12.22,34.497455 C12.2653426,38.3772142 13.0740528,42.2100928 14.6,45.777455 L12.75,46.497455 Z" id="Path"></path>
+                <path d="M25,49.997455 C11.1928813,49.997455 0,38.8045737 0,24.997455 C0,24.487455 0,23.997455 0.05,23.487455 C0.683098541,13.0065545 7.79789766,4.03815245 17.86,1.03745497 C24.3399371,-0.889815176 31.3241675,-0.110582851 37.22,3.19745497 C44.5362565,7.29972466 49.3077062,14.7976175 49.9253309,23.1627095 C50.5429555,31.5278016 46.9244352,39.6451559 40.29,44.777455 C35.9043639,48.1483926 30.531438,49.9827074 25,49.997455 L25,49.997455 Z M25,1.99745497 C22.7726426,2.00462961 20.5586265,2.34161836 18.43,2.99745497 C9.18277977,5.75687976 2.64145004,13.995441 2.05,23.627455 C2.05,24.097455 2,24.547455 2,24.997455 C2,37.7000042 12.2974508,47.9974823 25,47.9974823 C27.5252246,48.001378 30.0332664,47.5822444 32.42,46.757455 C34.8197452,45.9525579 37.0651,44.7453416 39.06,43.187455 C46.8368522,37.1696343 49.9277728,26.8735194 46.7511926,17.5674497 C43.5746123,8.26138003 34.8332878,2.0041426 25,1.99745497 Z" id="Shape"></path>
+                <path d="M27.43,13.4274663 C25.6373232,13.4274663 24.0213554,12.3470304 23.3362657,10.6904248 C22.6511759,9.03381921 23.0320243,7.12761517 24.3010698,5.8614344 C25.5701152,4.59525364 27.477175,4.21871397 29.1322282,4.90754572 C30.7872813,5.59637747 31.8640467,7.21478276 31.8600114,9.00745497 C31.8600114,10.1814465 31.3929533,11.3072089 30.5618784,12.1364078 C29.7308036,12.9656066 28.6039885,13.4301111 27.43,13.4274663 L27.43,13.4274663 Z M27.43,6.57745497 C26.0879481,6.57745497 25,7.66540303 25,9.00745497 C25,10.3495069 26.0879481,11.437455 27.43,11.437455 C28.7720519,11.437455 29.86,10.3495069 29.86,9.00745497 C29.86,7.66540303 28.7720519,6.57745497 27.43,6.57745497 L27.43,6.57745497 Z" id="Shape"></path>
+                <path d="M13.79,27.377455 C11.3433786,27.377455 9.36,25.3940764 9.36,22.947455 C9.36,20.5008335 11.3433786,18.517455 13.79,18.517455 C16.2366214,18.517455 18.22,20.5008335 18.22,22.947455 C18.2145009,25.391795 16.23434,27.3719559 13.79,27.377455 Z M13.79,20.517455 C12.4479481,20.517455 11.36,21.605403 11.36,22.947455 C11.36,24.2895069 12.4479481,25.377455 13.79,25.377455 C15.1320519,25.377455 16.22,24.2895069 16.22,22.947455 C16.225333,22.2995206 15.9716721,21.6762901 15.5153794,21.216242 C15.0590867,20.7561938 14.4379563,20.497455 13.79,20.497455 L13.79,20.517455 Z" id="Shape"></path>
+                <path d="M35.78,40.1974663 C33.9864187,40.2014991 32.3673821,39.1236494 31.6791388,37.467367 C30.9908955,35.8110845 31.3692715,33.9032399 32.6375282,32.6349832 C33.905785,31.3667265 35.8136296,30.9883504 37.469912,31.6765938 C39.1261944,32.3648371 40.2040442,33.9838736 40.2000113,35.777455 C40.2000113,38.2185536 38.2210986,40.1974663 35.78,40.1974663 Z M35.78,33.3474342 C34.7962569,33.3434066 33.9071262,33.9328834 33.5278555,34.8405842 C33.1485849,35.748285 33.3540098,36.7951073 34.0481914,37.4921574 C34.742373,38.1892075 35.7883392,38.3989474 36.6975963,38.0234231 C37.6068533,37.6478987 38.2,36.7612064 38.2,35.777455 C38.2,34.4392986 37.118145,33.3529618 35.78,33.3474342 L35.78,33.3474342 Z" id="Shape"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/packages/dashboard/public/images/service-icons/shopify.svg b/packages/dashboard/public/images/service-icons/shopify.svg
new file mode 100644
index 0000000..6f0782e
--- /dev/null
+++ b/packages/dashboard/public/images/service-icons/shopify.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="94px" height="94px" viewBox="0 0 94 94" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>shopify</title>
+    <g id="shopify" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <rect fill="#122A23" x="0" y="0" width="94" height="94"></rect>
+        <g id="Group" transform="translate(26.112, 23.3253)" fill-rule="nonzero">
+            <path d="M36.596,9.12939896 C36.568,8.87739896 36.344,8.76539896 36.176,8.73739896 C36.008,8.70939896 32.648,8.68139896 32.648,8.68139896 C32.648,8.68139896 29.82,5.93739896 29.54,5.65739896 C29.26,5.37739896 28.728,5.46139896 28.504,5.51739896 C28.504,5.51739896 27.972,5.68539896 27.076,5.96539896 C26.936,5.48939896 26.712,4.90139896 26.404,4.31339896 C25.396,2.38139896 23.94,1.37339896 22.148,1.37339896 C22.036,1.37339896 21.896,1.37339896 21.784,1.40139896 C21.728,1.34539896 21.672,1.28939896 21.616,1.20539896 C20.832,0.365398965 19.852,-0.0266010353 18.676,0.00139896469 C16.38,0.0573989647 14.112,1.70939896 12.236,4.67739896 C10.92,6.74939896 9.94,9.35339896 9.66,11.369399 C7.028,12.181399 5.18,12.741399 5.152,12.769399 C3.836,13.189399 3.78,13.217399 3.612,14.477399 C3.472,15.401399 0,42.309399 0,42.309399 L29.148,47.349399 L41.776,44.213399 C41.776,44.213399 36.624,9.35339896 36.596,9.12939896 Z M25.62,6.41339896 C24.948,6.60939896 24.192,6.86139896 23.352,7.11339896 C23.324,5.96539896 23.184,4.34139896 22.652,2.94139896 C24.416,3.27739896 25.256,5.23739896 25.62,6.41339896 Z M21.84,7.58939896 C20.3,8.06539896 18.648,8.56939896 16.968,9.10139896 C17.444,7.30939896 18.34,5.51739896 19.432,4.34139896 C19.852,3.89339896 20.412,3.41739896 21.084,3.13739896 C21.728,4.45339896 21.84,6.32939896 21.84,7.58939896 L21.84,7.58939896 Z M18.704,1.54139896 C19.236,1.54139896 19.684,1.65339896 20.076,1.90539896 C19.46,2.21339896 18.844,2.68939896 18.284,3.30539896 C16.828,4.87339896 15.708,7.28139896 15.26,9.63339896 C13.86,10.053399 12.516,10.473399 11.256,10.865399 C12.096,7.16939896 15.176,1.65339896 18.704,1.54139896 L18.704,1.54139896 Z" id="Shape" fill="#95BF47"></path>
+            <path d="M36.176,8.73739896 C36.008,8.70939896 32.648,8.68139896 32.648,8.68139896 C32.648,8.68139896 29.82,5.93739896 29.54,5.65739896 C29.428,5.54539896 29.288,5.48939896 29.148,5.48939896 L29.148,47.349399 L41.776,44.213399 C41.776,44.213399 36.624,9.38139896 36.596,9.12939896 C36.54,8.87739896 36.344,8.76539896 36.176,8.73739896 Z" id="Path" fill="#5E8E3E"></path>
+            <path d="M22.148,15.233399 L20.692,20.721399 C20.692,20.721399 19.068,19.965399 17.108,20.105399 C14.252,20.273399 14.224,22.065399 14.252,22.541399 C14.42,25.005399 20.86,25.537399 21.224,31.277399 C21.504,35.813399 18.816,38.893399 14.952,39.145399 C10.304,39.425399 7.756,36.709399 7.756,36.709399 L8.736,32.537399 C8.736,32.537399 11.312,34.469399 13.356,34.357399 C14.7,34.273399 15.176,33.181399 15.12,32.397399 C14.924,29.205399 9.66,29.373399 9.324,24.137399 C9.044,19.713399 11.956,15.233399 18.368,14.813399 C20.888,14.589399 22.148,15.233399 22.148,15.233399 L22.148,15.233399 Z" id="Path" fill="#FFFFFF"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/packages/dashboard/public/images/service-icons/todoist.svg b/packages/dashboard/public/images/service-icons/todoist.svg
new file mode 100644
index 0000000..bc84874
--- /dev/null
+++ b/packages/dashboard/public/images/service-icons/todoist.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="94px" height="94px" viewBox="0 0 94 94" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>shopify copy</title>
+    <g id="shopify-copy" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <rect fill="#FAE8DA" x="0" y="0" width="94" height="94"></rect>
+        <g id="Group" transform="translate(23.5316, 23.48)" fill="#DE483A" fill-rule="nonzero">
+            <path d="M39.5162107,8.8817842e-16 C43.6729266,0 47.0426107,3.36968406 47.0426107,7.5264 L47.0426107,39.5136 C47.0426107,43.6703159 43.6729266,47.04 39.5162107,47.04 L7.52901066,47.04 C3.37229472,47.04 0.00261066107,43.6703159 0.00261066107,39.5136 L0.000446526612,33.321168 C2.01909341,34.4968584 6.7334309,37.2418248 7.89063066,37.89513 C8.59329066,38.29203 9.26802066,38.28321 9.94569066,37.89219 L19.3169407,32.49876 L28.9821907,26.93628 C29.3893807,26.70108 29.4099607,25.97931 28.9542607,25.71765 C28.4038463,25.4068837 27.855039,25.0932795 27.3078607,24.77685 C26.8495482,24.5272855 26.2944436,24.5339668 25.8422707,24.79449 C25.7266453,24.8616273 21.7531963,27.1467009 17.8006355,29.4190336 L17.1041311,29.8194473 C13.5148032,31.8828758 10.1325123,33.8266307 9.89718066,33.95994 C9.28860066,34.30686 8.53596066,34.31127 7.92885066,33.95994 L0.00175896879,29.354 L0.00175896879,25.395 L0.181605452,25.5004354 C2.2879574,26.7271499 6.76679195,29.334419 7.89063066,29.96889 C8.59476066,30.36579 9.26802066,30.35697 9.94569066,29.96595 L19.3037107,24.57987 L19.3389907,24.55929 L28.9821907,19.01004 C29.3893807,18.77484 29.4084907,18.05307 28.9527907,17.79288 L28.6338007,17.6106 C28.1692807,17.346 27.5651107,17.00202 27.3078607,16.85208 C26.8495482,16.6025155 26.2944436,16.6091968 25.8422707,16.86972 C25.6144207,17.00055 10.4058007,25.74558 9.89718066,26.0337 C9.2873757,26.3823041 8.53865563,26.3823041 7.92885066,26.0337 C7.48272258,25.7764237 0.906146597,21.9545187 -6.80282653e-15,21.4279121 L0.00175896879,17.469 L0.181472224,17.5741998 C2.28658071,18.8010017 6.76679195,21.4096016 7.89063066,22.04265 C8.59476066,22.43955 9.26802066,22.43073 9.94569066,22.03971 L19.3154707,16.64775 L19.3272307,16.6404 L28.9821907,11.0838 C29.3893807,10.8486 29.4084907,10.1283 28.9527907,9.86664 L28.6338007,9.68436 C28.1678107,9.41976 27.5651107,9.07578 27.3078607,8.92584 C26.8495482,8.67627546 26.2944436,8.68295676 25.8422707,8.94348 C25.7266453,9.01061731 21.7531963,11.2953123 17.8006355,13.5674643 L17.1041311,13.9678482 C13.5148032,16.0311349 10.1325123,17.9749406 9.89718066,18.10893 C9.2873757,18.4575341 8.53865563,18.4575341 7.92885066,18.10893 L0.00175896879,13.501 L0.00261066107,7.5264 C0.00261066107,3.36968406 3.37229472,4.4408921e-15 7.52901066,3.55271368e-15 L39.5162107,8.8817842e-16 Z" id="Rectangle-2"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/packages/dashboard/src/lib/transaction.ts b/packages/dashboard/src/lib/transaction.ts
index cc0ec37..21e0348 100644
--- a/packages/dashboard/src/lib/transaction.ts
+++ b/packages/dashboard/src/lib/transaction.ts
@@ -21,6 +21,9 @@ export const getGroupingKey = (transaction: any, extended = false) => {
 };
 
 export const getTransactionService = (transaction: any) => {
+  if (transaction.info?.httpInfo?.host === "cloudfront.amazonaws.com") {
+    return "cloudfront";
+  }
   if (
     transaction.info?.httpInfo?.host?.match(
       /\.s3\.\w+-\w+-\d+\.amazonaws\.com/,
@@ -43,9 +46,18 @@ export const getTransactionService = (transaction: any) => {
   ) {
     return "eventBridge";
   }
-  if (transaction.info?.httpInfo?.host === "hooks.slack.com") {
+  if (transaction.info?.httpInfo?.host === "hooks.slack.com" || transaction.info?.httpInfo?.host === "slack.com") {
     return "slack";
   }
+  if (transaction.info?.httpInfo?.host?.endsWith('.chargebee.com')) {
+    return "chargebee";
+  }
+  if (transaction.info?.httpInfo?.host?.endsWith('.myshopify.com')) {
+    return "shopify";
+  }
+  if (transaction.info?.httpInfo?.host === 'api.todoist.com') {
+    return "todoist";
+  }
 
   return transaction.service || transaction.spanType || transaction.type;
 };
@@ -71,9 +83,22 @@ export const getTransactionLabel = (transaction: any) => {
     return "SES";
   }
 
-  if (transaction.info?.httpInfo?.host === "hooks.slack.com") {
+  if (transaction.info?.httpInfo?.host === "cloudfront.amazonaws.com") {
+    return "CloudFront";
+  }
+
+  if (transaction.info?.httpInfo?.host === "hooks.slack.com" || transaction.info?.httpInfo?.host === "slack.com") {
     return "Slack";
   }
+  if (transaction.info?.httpInfo?.host?.endsWith('.chargebee.com')) {
+    return "Chargebee";
+  }
+  if (transaction.info?.httpInfo?.host?.endsWith('.myshopify.com')) {
+    return "Shopify";
+  }
+  if (transaction.info?.httpInfo?.host === 'api.todoist.com') {
+    return "Todoist";
+  }
 
   if (
     transaction.info?.httpInfo?.host?.match(/\.s3\.\w+-\w+-\d+\.amazonaws\.com/)