diff --git a/src/sql/workbench/electron-browser/modelComponents/media/collapsed.svg b/src/sql/workbench/electron-browser/modelComponents/media/collapsed.svg
new file mode 100644
index 0000000000..3a63808c35
--- /dev/null
+++ b/src/sql/workbench/electron-browser/modelComponents/media/collapsed.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path fill="#646465" d="M6 4v8l4-4-4-4zm1 2.414L8.586 8 7 9.586V6.414z"/></svg>
\ No newline at end of file
diff --git a/src/sql/workbench/electron-browser/modelComponents/media/collapsed_inverse.svg b/src/sql/workbench/electron-browser/modelComponents/media/collapsed_inverse.svg
new file mode 100644
index 0000000000..cf5c3641aa
--- /dev/null
+++ b/src/sql/workbench/electron-browser/modelComponents/media/collapsed_inverse.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path fill="#E8E8E8" d="M6 4v8l4-4-4-4zm1 2.414L8.586 8 7 9.586V6.414z"/></svg>
\ No newline at end of file
diff --git a/src/sql/workbench/electron-browser/modelComponents/media/expanded.svg b/src/sql/workbench/electron-browser/modelComponents/media/expanded.svg
new file mode 100644
index 0000000000..75f73adbb0
--- /dev/null
+++ b/src/sql/workbench/electron-browser/modelComponents/media/expanded.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path fill="#646465" d="M11 10H5.344L11 4.414V10z"/></svg>
\ No newline at end of file
diff --git a/src/sql/workbench/electron-browser/modelComponents/media/expanded_inverse.svg b/src/sql/workbench/electron-browser/modelComponents/media/expanded_inverse.svg
new file mode 100644
index 0000000000..73d41e6399
--- /dev/null
+++ b/src/sql/workbench/electron-browser/modelComponents/media/expanded_inverse.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path fill="#E8E8E8" d="M11 10H5.344L11 4.414V10z"/></svg>
\ No newline at end of file
diff --git a/src/sql/workbench/electron-browser/modelComponents/media/groupLayout.css b/src/sql/workbench/electron-browser/modelComponents/media/groupLayout.css
index a4727ad631..6b1c0ae2bf 100644
--- a/src/sql/workbench/electron-browser/modelComponents/media/groupLayout.css
+++ b/src/sql/workbench/electron-browser/modelComponents/media/groupLayout.css
@@ -28,24 +28,24 @@
 }
 
 .vs .modelview-group-header-collapsible.expanded {
-	background-image: url("../../media/icons/expanded.svg");
+	background-image: url("expanded.svg");
 }
 
 .vs-dark .modelview-group-header-collapsible.expanded,
 .hc-black .modelview-group-header-collapsible.expanded {
-	background-image: url("../../media/icons/expanded_inverse.svg");
+	background-image: url("expanded_inverse.svg");
 }
 
 .vs .modelview-group-header-collapsible.collapsed {
-	background-image: url("../../media/icons/collapsed.svg");
+	background-image: url("collapsed.svg");
 }
 
 .vs-dark .modelview-group-header-collapsible.collapsed,
 .hc-black .modelview-group-header-collapsible.collapsed {
-	background-image: url("../../media/icons/collapsed_inverse.svg");
+	background-image: url("collapsed_inverse.svg");
 }
 
 .modelview-group-cell {
 	padding-bottom: 5px;
 	display: table-cell;
-}
\ No newline at end of file
+}
diff --git a/src/sql/workbench/parts/jobManagement/electron-browser/media/edit.svg b/src/sql/workbench/parts/jobManagement/electron-browser/media/edit.svg
new file mode 100644
index 0000000000..ecde924084
--- /dev/null
+++ b/src/sql/workbench/parts/jobManagement/electron-browser/media/edit.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><style type="text/css">.icon-canvas-transparent{opacity:0;fill:#F6F6F6;} .icon-vs-out{fill:#F6F6F6;} .icon-vs-bg{fill:#424242;}</style><path class="icon-canvas-transparent" d="M16 16h-16v-16h16v16z" id="canvas"/><path class="icon-vs-out" d="M16 4.28l-11.673 11.72h-4.327v-4.406l11.477-11.594h.308l4.215 4.237v.043z" id="outline" style="display: none;"/><path class="icon-vs-bg" d="M14.598 4.25l-1.688 1.75-3-3 1.688-1.75 3 3zm-5.688-.25l-7 7 3 3 7-7-3-3zm-7.91 8.09v2.91h2.91l-2.91-2.91z" id="iconBg"/></svg>
\ No newline at end of file
diff --git a/src/sql/workbench/parts/jobManagement/electron-browser/media/edit_inverse.svg b/src/sql/workbench/parts/jobManagement/electron-browser/media/edit_inverse.svg
new file mode 100644
index 0000000000..da956cb2c6
--- /dev/null
+++ b/src/sql/workbench/parts/jobManagement/electron-browser/media/edit_inverse.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><style type="text/css">.icon-canvas-transparent{opacity:0;fill:#2d2d30;} .icon-vs-out{fill:#2d2d30;} .icon-vs-bg{fill:#c5c5c5;}</style><path class="icon-canvas-transparent" d="M16 16h-16v-16h16v16z" id="canvas"/><path class="icon-vs-out" d="M16 4.28l-11.673 11.72h-4.327v-4.406l11.477-11.594h.308l4.215 4.237v.043z" id="outline" style="display: none;"/><path class="icon-vs-bg" d="M14.598 4.25l-1.688 1.75-3-3 1.688-1.75 3 3zm-5.688-.25l-7 7 3 3 7-7-3-3zm-7.91 8.09v2.91h2.91l-2.91-2.91z" id="iconBg"/></svg>
\ No newline at end of file
diff --git a/src/sql/workbench/parts/jobManagement/electron-browser/media/jobHistory.css b/src/sql/workbench/parts/jobManagement/electron-browser/media/jobHistory.css
index b2540f1f95..011e0071ae 100644
--- a/src/sql/workbench/parts/jobManagement/electron-browser/media/jobHistory.css
+++ b/src/sql/workbench/parts/jobManagement/electron-browser/media/jobHistory.css
@@ -110,7 +110,7 @@ input#accordion:checked ~ .accordion-content {
 }
 
 .all-jobs > .back-button-icon {
-	content: url('../common/media/back.svg');
+	content: url('back.svg');
 	width: 20px;
 	margin-right: 10px;
 	float: left;
@@ -121,25 +121,25 @@ input#accordion:checked ~ .accordion-content {
 
 .vs-dark.monaco-shell .all-jobs >.back-button-icon,
 .hc-black.monaco-shell .all-jobs >.back-button-icon {
-	content: url('../common/media/back_inverse.svg');
+	content: url('back_inverse.svg');
 }
 
 .vs .action-label.icon.newStepIcon {
-	background-image: url('../common/media/new.svg');
+	background-image: url('new.svg');
 }
 
 .vs-dark .action-label.icon.newStepIcon,
 .hc-black .action-label.icon.newStepIcon {
-	background-image: url('../common/media/new_inverse.svg');
+	background-image: url('new_inverse.svg');
 }
 
 jobhistory-component .hc-black .icon.edit,
 jobhistory-component .vs-dark .icon.edit {
-	background-image: url('../../../media/icons/edit_inverse.svg');
+	background-image: url('edit_inverse.svg');
 }
 
 jobhistory-component .vs .icon.edit {
-	background-image: url('../../../media/icons/edit.svg');
+	background-image: url('edit.svg');
 }
 
 jobhistory-component .actions-container .icon.edit {
@@ -290,4 +290,4 @@ jobhistory-component .step-table.prev-run-list .monaco-tree-wrapper .monaco-tree
 
 jobhistory-component .agent-actionbar-container > .monaco-toolbar.carbon-taskbar {
 	margin: 10px 0px 5px 0px;
-}
\ No newline at end of file
+}
diff --git a/src/sql/workbench/parts/jobManagement/electron-browser/media/jobStepsView.css b/src/sql/workbench/parts/jobManagement/electron-browser/media/jobStepsView.css
index bff5448e0e..085d46cf5a 100644
--- a/src/sql/workbench/parts/jobManagement/electron-browser/media/jobStepsView.css
+++ b/src/sql/workbench/parts/jobManagement/electron-browser/media/jobStepsView.css
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 .steps-tree .list-row .status-icon.step-passed {
-	content: url("../common/media/success_complete.svg");
+	content: url("success_complete.svg");
 	height: 100%;
 }
 
 .steps-tree .list-row .status-icon.step-failed {
-	content: url("../common/media/failed.svg");
+	content: url("failed.svg");
 	height: 100%;
 }
 
@@ -67,11 +67,11 @@
 
 .vs-dark .steps-header > .steps-icon,
 .hc-black .steps-header > .steps-icon {
-	content: url("../common/media/step_inverse.svg");
+	content: url("step_inverse.svg");
 }
 
 .steps-header > .steps-icon {
-	content: url("../common/media/step.svg");
+	content: url("step.svg");
 }
 
 jobstepsview-component {
@@ -107,4 +107,4 @@ jobstepsview-component .steps-tree .monaco-tree-wrapper .monaco-tree-row.step-co
 	background: #dcdcdc !important;
 	cursor: none;
 	padding-left: 0px;
-}
\ No newline at end of file
+}