diff --git a/extensions/resource-deployment/images/sql_server.svg b/extensions/resource-deployment/images/sql_server.svg
deleted file mode 100644
index 03cff4d932..0000000000
--- a/extensions/resource-deployment/images/sql_server.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#212121;}.cls-2{fill:#fff;}</style></defs><title>sql_server</title><path id="iconBg" class="cls-1" d="M6.72,12.14H5.58V6.71H8.84v.83A4.85,4.85,0,0,1,9.93,7v-.3H11v.05a5,5,0,0,1,.54-.05,4.83,4.83,0,0,1,1.63.3V2.63c0-1.27-3.35-2.5-6.76-2.5S.15,1.31.15,2.53V13c0,1.32,3.57,2.5,6.94,2.5.49,0,1,0,1.41-.07A4.86,4.86,0,0,1,6.72,12.14ZM6.64,1.21C9,1.21,11,1.75,11,2.43S9,3.65,6.64,3.65,2.29,3.1,2.29,2.43,4.24,1.21,6.64,1.21ZM4.5,7.79H2.32V8.88H4.5v3.26H1.24V11.05H3.41V10H1.24V6.71H4.5Zm2.23,3.26H6.67V7.79H7.76v.76A4.84,4.84,0,0,0,6.72,11.05Zm7.79,1.26a3.06,3.06,0,0,1-.36.86L15,14.24a4.32,4.32,0,0,1-.77.77l-1.07-.83a3,3,0,0,1-.86.36l-.17,1.34a4.17,4.17,0,0,1-.55.06,4.14,4.14,0,0,1-.55-.06l-.17-1.34a3,3,0,0,1-.86-.36L8.91,15a4.32,4.32,0,0,1-.77-.77L9,13.18a3,3,0,0,1-.36-.86l-1.34-.17a4,4,0,0,1-.06-.55A4.14,4.14,0,0,1,7.27,11l1.34-.17A3,3,0,0,1,9,10L8.14,8.95a4.32,4.32,0,0,1,.77-.77L10,9a3,3,0,0,1,.86-.36L11,7.31a4.14,4.14,0,0,1,.55-.06,4.14,4.14,0,0,1,.55.06l.17,1.34a3,3,0,0,1,.86.36l1.07-.83a4.32,4.32,0,0,1,.77.77L14.15,10a3,3,0,0,1,.36.86l1.34.17a4.14,4.14,0,0,1,.06.55,4.14,4.14,0,0,1-.06.55ZM11.56,9.42a2.17,2.17,0,1,0,2.17,2.17,2.17,2.17,0,0,0-2.17-2.17Zm0,1.09a1.09,1.09,0,1,0,1.09,1.09A1.09,1.09,0,0,0,11.56,10.51Z"/><g id="iconFg"><path class="cls-2" d="M9.93,6.71H11v.05A4.87,4.87,0,0,0,9.93,7ZM6.64,3.65C9,3.65,11,3.1,11,2.43S9,1.2,6.64,1.2s-4.34.55-4.34,1.22S4.24,3.65,6.64,3.65ZM1.24,6.71V10H3.41v1.09H1.24v1.09H4.5V8.88H2.32V7.79H4.5V6.71ZM6.67,11.6a5,5,0,0,1,.05-.54H6.67V7.79H7.76v.76a4.92,4.92,0,0,1,1.09-1V6.71H5.58v5.43H6.72A5,5,0,0,1,6.67,11.6Z"/></g></svg>
\ No newline at end of file
diff --git a/extensions/resource-deployment/images/sql_server_container.svg b/extensions/resource-deployment/images/sql_server_container.svg
new file mode 100644
index 0000000000..55fa302537
--- /dev/null
+++ b/extensions/resource-deployment/images/sql_server_container.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2048 2048" width="16" height="16">
+  <path d="M780 848v149h-14V848h14zm-53 0v149h-14V848h14zm-197-57V641h15v150h-15zm144-150v150h-15V641h15zM504 791V641h14v150h-14zm-27 0V641h15v150h-15zm-26 0V641h14v150h-14zm303 57v149h-15V848h15zm-54 0v149h-14V848h14zm0-207v150h-14V641h14zm54 0v150h-15V641h15zm-27 0v150h-14V641h14zm-53 207v149h-15V848h15zm106-207v150h-14V641h14zm27 207v149h-14V848h14zM270 997V848h15v149h-15zm-26 0V848h14v149h-14zm53 0V848h14v149h-14zm260-206V641h14v150h-14zM377 997V848h14v149h-14zm207 0V848h14v149h-14zm-260 0V848h14v149h-14zm26 0V848h15v149h-15zm101 0V848h14v149h-14zm133-206V641h14v150h-14zM477 997V848h15v149h-15zm80 0V848h14v149h-14zm-27 0V848h15v149h-15zm-26 0V848h14v149h-14zm303-356v150h-14V641h14zm129-207v150h-14V434h14zm-27 0v150h-14V434h14zm-26 207v150h-15V641h15zm0-207v150h-15V434h15zm133 0v150h-15V434h15zm-53 0v150h-15V434h15zm26 0v150h-14V434h14zm236 414v149h-15V848h15zm-107 0v149h-14V848h14zm-26 0v149h-15V848h15zm106 0v149h-14V848h14zm-53 0v149h-15V848h15zm26 0v149h-14V848h14zm-262 0v149h-14V848h14zm27 0v149h-14V848h14zm27 0v149h-15V848h15zm-80 0v149h-15V848h15zm26-207v150h-14V641h14zm107 0v150h-15V641h15zm-27 207v149h-14V848h14zm27 0v149h-15V848h15zm-27-207v150h-14V641h14zm-26 0v150h-15V641h15zm-27 0v150h-14V641h14zm-324 678q-7 5-7 13 0 6 4 10t10 5q10 0 13-8 3 6 3 14 0 15-10 25t-26 11q-15 0-25-10t-11-26q0-15 10-25t26-11q5 0 13 2zm1435-454l-16 29q-22 40-52 67t-66 45-76 24-83 8h-13q-6 0-14-1-69 169-175 292t-243 205-297 120-338 39q-134 0-256-39t-216-114-148-186-55-254q0-23 1-45t6-45h191V803h209V596h415V389h244v414h207v207h105q57 0 112-14t105-42q-27-34-39-76t-12-86q0-60 17-105t58-90q28 23 54 47t48 52 36 60 19 71q23-8 47-11t50-3q52 0 91 13t84 39zM438 629v174h174V629H438zm211 724q0-21-14-35t-36-15q-21 0-35 14t-15 36q0 20 15 35t35 15q20 0 35-15t15-35zM438 836v174h174V836H438zm-207 0v174h175V836H231zm444 826h28q14 0 29-2-77-36-136-90t-94-133q-40 11-81 16t-83 8l-2 1q-25 1-49 1t-49 1q-19 0-37-1t-38-2q55 54 112 92t121 63 132 35 147 11zm146-652V836H647v174h174zm0-207V629H647v174h174zm209 207V836H856v174h174zm0-207V629H856v174h174zm0-207V422H856v174h174zm209 414V836h-174v174h174z" />
+</svg>
\ No newline at end of file
diff --git a/extensions/resource-deployment/images/sql_server_container_inverse.svg b/extensions/resource-deployment/images/sql_server_container_inverse.svg
new file mode 100644
index 0000000000..849a6a0f2a
--- /dev/null
+++ b/extensions/resource-deployment/images/sql_server_container_inverse.svg
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.4, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" style="enable-background:new 0 0 16 16;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+</style>
+<path class="st0" d="M6.1,6.6v1.2H6V6.6H6.1z M5.7,6.6v1.2H5.6V6.6H5.7z M4.1,6.2V5h0.1v1.2H4.1z M5.3,5v1.2H5.1V5H5.3z M3.9,6.2V5
+	H4v1.2H3.9z M3.7,6.2V5h0.1v1.2H3.7z M3.5,6.2V5h0.1v1.2H3.5z M5.9,6.6v1.2H5.8V6.6H5.9z M5.5,6.6v1.2H5.4V6.6H5.5z M5.5,5v1.2H5.4
+	V5H5.5z M5.9,5v1.2H5.8V5H5.9z M5.7,5v1.2H5.6V5H5.7z M5.3,6.6v1.2H5.1V6.6H5.3z M6.1,5v1.2H6V5H6.1z M6.3,6.6v1.2H6.2V6.6H6.3z
+	 M2.1,7.8V6.6h0.1v1.2H2.1z M1.9,7.8V6.6H2v1.2H1.9z M2.3,7.8V6.6h0.1v1.2H2.3z M4.4,6.2V5h0.1v1.2H4.4z M2.9,7.8V6.6h0.1v1.2H2.9z
+	 M4.6,7.8V6.6h0.1v1.2H4.6z M2.5,7.8V6.6h0.1v1.2H2.5z M2.7,7.8V6.6h0.1v1.2H2.7z M3.5,7.8V6.6h0.1v1.2H3.5z M4.6,6.2V5h0.1v1.2H4.6
+	z M3.7,7.8V6.6h0.1v1.2H3.7z M4.4,7.8V6.6h0.1v1.2H4.4z M4.1,7.8V6.6h0.1v1.2H4.1z M3.9,7.8V6.6H4v1.2H3.9z M6.3,5v1.2H6.2V5H6.3z
+	 M7.3,3.4v1.2H7.2V3.4H7.3z M7.1,3.4v1.2H7V3.4H7.1z M6.9,5v1.2H6.8V5H6.9z M6.9,3.4v1.2H6.8V3.4H6.9z M7.9,3.4v1.2H7.8V3.4H7.9z
+	 M7.5,3.4v1.2H7.4V3.4H7.5z M7.7,3.4v1.2H7.6V3.4H7.7z M9.6,6.6v1.2H9.5V6.6H9.6z M8.7,6.6v1.2H8.6V6.6H8.7z M8.5,6.6v1.2H8.4V6.6
+	H8.5z M9.4,6.6v1.2H9.2V6.6H9.4z M8.9,6.6v1.2H8.8V6.6H8.9z M9.1,6.6v1.2H9V6.6H9.1z M7.1,6.6v1.2H7V6.6H7.1z M7.3,6.6v1.2H7.2V6.6
+	H7.3z M7.5,6.6v1.2H7.4V6.6H7.5z M6.9,6.6v1.2H6.8V6.6H6.9z M7.1,5v1.2H7V5H7.1z M7.9,5v1.2H7.8V5H7.9z M7.7,6.6v1.2H7.6V6.6H7.7z
+	 M7.9,6.6v1.2H7.8V6.6H7.9z M7.7,5v1.2H7.6V5H7.7z M7.5,5v1.2H7.4V5H7.5z M7.3,5v1.2H7.2V5H7.3z M4.8,10.3c0,0-0.1,0.1-0.1,0.1
+	c0,0,0,0.1,0,0.1s0,0,0.1,0c0.1,0,0.1,0,0.1-0.1c0,0,0,0.1,0,0.1c0,0.1,0,0.1-0.1,0.2s-0.1,0.1-0.2,0.1c-0.1,0-0.1,0-0.2-0.1
+	s-0.1-0.1-0.1-0.2c0-0.1,0-0.1,0.1-0.2s0.1-0.1,0.2-0.1C4.7,10.3,4.7,10.3,4.8,10.3z M16,6.8L15.9,7c-0.1,0.2-0.2,0.4-0.4,0.5
+	s-0.3,0.3-0.5,0.4S14.6,8,14.4,8s-0.4,0.1-0.6,0.1h-0.1c0,0-0.1,0-0.1,0c-0.4,0.9-0.8,1.6-1.4,2.3s-1.2,1.2-1.9,1.6
+	s-1.5,0.7-2.3,0.9s-1.7,0.3-2.6,0.3c-0.7,0-1.4-0.1-2-0.3S2.1,12.4,1.6,12s-0.9-0.9-1.2-1.5S0,9.3,0,8.6c0-0.1,0-0.2,0-0.4
+	S0,8,0,7.9h1.5V6.3h1.6V4.7h3.2V3h1.9v3.2h1.6v1.6h0.8c0.3,0,0.6,0,0.9-0.1s0.6-0.2,0.8-0.3c-0.1-0.2-0.2-0.4-0.3-0.6
+	s-0.1-0.4-0.1-0.7c0-0.3,0-0.6,0.1-0.8s0.2-0.5,0.5-0.7c0.1,0.1,0.3,0.2,0.4,0.4s0.3,0.3,0.4,0.4s0.2,0.3,0.3,0.5s0.1,0.4,0.1,0.6
+	c0.1,0,0.2-0.1,0.4-0.1s0.3,0,0.4,0c0.3,0,0.5,0,0.7,0.1S15.8,6.6,16,6.8z M3.4,4.9v1.4h1.4V4.9H3.4z M5.1,10.6c0-0.1,0-0.2-0.1-0.3
+	s-0.2-0.1-0.3-0.1c-0.1,0-0.2,0-0.3,0.1s-0.1,0.2-0.1,0.3c0,0.1,0,0.2,0.1,0.3S4.6,11,4.7,11s0.2,0,0.3-0.1S5.1,10.7,5.1,10.6z
+	 M3.4,6.5v1.4h1.4V6.5H3.4z M1.8,6.5v1.4h1.4V6.5H1.8z M5.3,13h0.2c0.1,0,0.1,0,0.2,0c-0.4-0.2-0.8-0.4-1.1-0.7s-0.6-0.6-0.7-1
+	c-0.2,0.1-0.4,0.1-0.6,0.1s-0.4,0-0.6,0.1l0,0c-0.1,0-0.3,0-0.4,0s-0.3,0-0.4,0c-0.1,0-0.2,0-0.3,0s-0.2,0-0.3,0
+	c0.3,0.3,0.6,0.5,0.9,0.7s0.6,0.4,0.9,0.5s0.7,0.2,1,0.3S4.9,13,5.3,13z M6.4,7.9V6.5H5.1v1.4H6.4z M6.4,6.3V4.9H5.1v1.4H6.4z
+	 M8,7.9V6.5H6.7v1.4H8z M8,6.3V4.9H6.7v1.4H8z M8,4.7V3.3H6.7v1.4H8z M9.7,7.9V6.5H8.3v1.4H9.7z"/>
+</svg>
diff --git a/extensions/resource-deployment/images/sql_server_inverse.svg b/extensions/resource-deployment/images/sql_server_inverse.svg
deleted file mode 100644
index 1ce3f48b39..0000000000
--- a/extensions/resource-deployment/images/sql_server_inverse.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#fff;}</style></defs><title>sql_server_inverse</title><path id="iconBg" class="cls-1" d="M6.43.14C3,.14.15,1.31.15,2.53V13c0,1.32,3.58,2.49,6.94,2.49a12.79,12.79,0,0,0,1.41-.07,4.86,4.86,0,0,1-1.77-3.24H5.59V6.71H8.85v.82A4.88,4.88,0,0,1,9.93,7v-.3H11v0a4.94,4.94,0,0,1,.54,0,4.86,4.86,0,0,1,1.63.3V2.63C13.19,1.36,9.84.14,6.43.14ZM4.5,7.79H2.33V8.88H4.5v3.26H1.24V11H3.41V10H1.24V6.71H4.5ZM6.64,3.65c-2.4,0-4.34-.55-4.34-1.22S4.24,1.21,6.64,1.21,11,1.75,11,2.43,9,3.65,6.64,3.65Zm0,4.14V11h.06a4.87,4.87,0,0,1,1-2.49V7.79Zm4.89,2.72a1.09,1.09,0,1,0,1.09,1.09A1.08,1.08,0,0,0,11.56,10.51Zm0,0a1.09,1.09,0,1,0,1.09,1.09A1.08,1.08,0,0,0,11.56,10.51Zm0,0a1.09,1.09,0,1,0,1.09,1.09A1.08,1.08,0,0,0,11.56,10.51Zm0,0a1.09,1.09,0,1,0,1.09,1.09A1.08,1.08,0,0,0,11.56,10.51Zm4.29,1.63a3.18,3.18,0,0,0,.06-.54,3.3,3.3,0,0,0-.06-.55l-1.34-.17a2.85,2.85,0,0,0-.36-.86L15,8.95a4.79,4.79,0,0,0-.78-.78L13.14,9a2.85,2.85,0,0,0-.86-.36l-.17-1.34a3.31,3.31,0,0,0-.55-.06,3.31,3.31,0,0,0-.54.06l-.17,1.34A2.85,2.85,0,0,0,10,9L8.91,8.17a4.74,4.74,0,0,0-.77.78L9,10a3.13,3.13,0,0,0-.36.86L7.27,11a4.89,4.89,0,0,0,0,.55,5.12,5.12,0,0,0,0,.55l1.35.16a2.77,2.77,0,0,0,.36.87l-.84,1.07a4,4,0,0,0,.77.77L10,14.19a3.13,3.13,0,0,0,.86.36L11,15.89a5,5,0,0,0,.54.06,4.86,4.86,0,0,0,.55-.06l.17-1.34a3.13,3.13,0,0,0,.86-.36l1.07.83a4.37,4.37,0,0,0,.78-.77l-.84-1.07a3,3,0,0,0,.36-.87Zm-4.29,1.63a2.17,2.17,0,1,1,2.18-2.17A2.17,2.17,0,0,1,11.56,13.77Zm0-3.26a1.09,1.09,0,1,0,1.09,1.09A1.08,1.08,0,0,0,11.56,10.51Zm0,0a1.09,1.09,0,1,0,1.09,1.09A1.08,1.08,0,0,0,11.56,10.51Zm0,0a1.09,1.09,0,1,0,1.09,1.09A1.08,1.08,0,0,0,11.56,10.51Zm0,0a1.09,1.09,0,1,0,1.09,1.09A1.08,1.08,0,0,0,11.56,10.51Zm0,0a1.09,1.09,0,1,0,1.09,1.09A1.08,1.08,0,0,0,11.56,10.51Z"/></svg>
\ No newline at end of file
diff --git a/extensions/resource-deployment/images/sql_server_on_windows.svg b/extensions/resource-deployment/images/sql_server_on_windows.svg
new file mode 100644
index 0000000000..3ea0b4a7ae
--- /dev/null
+++ b/extensions/resource-deployment/images/sql_server_on_windows.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2048 2048" width="16" height="16">
+  <path d="M0 268l768-107v735H0V268zM1920 0v896H896V143L1920 0zM896 1024h1024v896L896 1777v-753zm-896 0h768v735L0 1652v-628z" />
+</svg>
\ No newline at end of file
diff --git a/extensions/resource-deployment/images/sql_server_on_windows_inverse.svg b/extensions/resource-deployment/images/sql_server_on_windows_inverse.svg
new file mode 100644
index 0000000000..6520afc988
--- /dev/null
+++ b/extensions/resource-deployment/images/sql_server_on_windows_inverse.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="0.222in" height="0.222in" viewBox="0 0 16 16">
+  <title>SQL_server_on_Windows_16px_dark</title>
+  <path d="M0,2.094l6-.836V7H0ZM15,0V7H7V1.117ZM7,8h8v7L7,13.883ZM0,8H6v5.742l-6-.836Z" fill="#fff"/>
+</svg>
diff --git a/extensions/resource-deployment/package.json b/extensions/resource-deployment/package.json
index 403fe38212..c945f2f3a2 100644
--- a/extensions/resource-deployment/package.json
+++ b/extensions/resource-deployment/package.json
@@ -80,8 +80,8 @@
           "linux"
         ],
         "icon": {
-          "light": "./images/sql_server.svg",
-          "dark": "./images/sql_server_inverse.svg"
+          "light": "./images/sql_server_container.svg",
+          "dark": "./images/sql_server_container_inverse.svg"
         },
         "options": [
           {
@@ -323,8 +323,8 @@
           "win32"
         ],
         "icon": {
-          "light": "./images/sql_server.svg",
-          "dark": "./images/sql_server_inverse.svg"
+          "light": "./images/sql_server_on_windows.svg",
+          "dark": "./images/sql_server_on_windows_inverse.svg"
         },
         "options": [
           {
diff --git a/src/sql/workbench/browser/modelComponents/card.component.html b/src/sql/workbench/browser/modelComponents/card.component.html
index 43c1f0ec6a..420c164c77 100644
--- a/src/sql/workbench/browser/modelComponents/card.component.html
+++ b/src/sql/workbench/browser/modelComponents/card.component.html
@@ -13,7 +13,6 @@
 					<div [class]="iconClass" [style.width]="iconWidth" [style.height]="iconHeight"></div>
 				</div>
 				<h4 class="card-label">{{label}}</h4>
-				<hr />
 				<div *ngIf="descriptions.length > 0" class="model-card-description-container">
 					<div *ngFor="let desc of descriptions">
 						<div *ngIf="desc.label; else separator" [style.font-weight]="desc.fontWeight" class="model-card-list-item-description">