diff --git a/Resources/Public/Icons/Extension.svg b/Resources/Public/Icons/Extension.svg
index 405b815e..278e903c 100644
--- a/Resources/Public/Icons/Extension.svg
+++ b/Resources/Public/Icons/Extension.svg
@@ -1,19 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 256 256" style="enable-background:new 0 0 256 256;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#8C2828;}
-	.st1{opacity:0.3;}
-	.st2{fill:#FFFFFF;}
-</style>
-<rect class="st0" width="256" height="256"/>
-<title>EXT:container</title>
-<g class="st1">
-	<rect x="101.7" y="35" class="st2" width="52.6" height="186"/>
-	<rect x="35" y="35" class="st2" width="52.6" height="186"/>
-	<rect x="168.5" y="35" class="st2" width="52.6" height="186"/>
-</g>
-<path class="st2" d="M215,41v40.6H41V41H215 M221,35H35v52.6h186V35L221,35z"/>
-<path class="st2" d="M148.3,107.7V215H41V107.7H148.3 M154.3,101.7H35V221h119.3V101.7L154.3,101.7z"/>
-<path class="st2" d="M215,107.7V215h-40.6V107.7H215 M221,101.7h-52.6V221H221V101.7L221,101.7z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256" fill="#fff">
+  <path fill="#8c2828" d="M0 0h256v256H0z"/>
+  <g opacity=".3">
+    <path d="M35 35h53v186h-53z"/>
+    <path d="M101 35h53v186h-53z"/>
+    <path d="M168 35h53v186h-53z"/>
+  </g>
+  <path d="M215 82H41V41h174Zm6-47H35v53h186z"/>
+  <path d="M148 215H41V108h107zm6-113H35v119h119z"/>
+  <path d="M215 215h-41V108h41Zm6-113h-53v119h53Z"/>
+</svg>
\ No newline at end of file
diff --git a/Resources/Public/Icons/container-1col.svg b/Resources/Public/Icons/container-1col.svg
index 8e00efa1..54941ba6 100644
--- a/Resources/Public/Icons/container-1col.svg
+++ b/Resources/Public/Icons/container-1col.svg
@@ -1 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 283.46 283.46"><path d="M17.78,18h248V266h-248Z" fill="#fff"/><path d="M17.78,18V266h248V18Zm17.7,17.7H248.05V248.25H35.48Z" fill="#999"/><path d="M52.68,35.68H230.85V248.35H52.68Z" fill="#b9b9b9"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 284 284" fill="#b9b9b9">
+  <path fill="#fff" stroke="#999" stroke-width="17" d="M27 27h230v230H27Z"/>
+  <path d="M53 35.5h178v213H53Z"/>
+</svg>
\ No newline at end of file
diff --git a/Resources/Public/Icons/container-2col-left.svg b/Resources/Public/Icons/container-2col-left.svg
index 1bf4fd3d..06947a3d 100644
--- a/Resources/Public/Icons/container-2col-left.svg
+++ b/Resources/Public/Icons/container-2col-left.svg
@@ -1,8 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="758.3 -1158.3 283.5 283.5" enable-background="new 758.3 -1158.3 283.5 283.5" xml:space="preserve">
-<rect x="776.5" y="-1140" fill="#FFFFFF" width="247" height="247"/>
-<path fill="#999999" d="M776-1140.5v248h248v-248H776z M1006.3-910.3H793.7v-212.6h212.6V-910.3z"/>
-<path fill="#B9B9B9" d="M921-910.4H812.9v-212.4H921V-910.4z"/>
-<path fill="#B9B9B9" d="M987.9-910.3h-47.4v-212.6h47.3L987.9-910.3L987.9-910.3z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 284 284" fill="#b9b9b9">
+  <path fill="#fff" stroke="#999" stroke-width="17" d="M27 27h230v230H27Z"/>
+  <path d="M53 35.5h110v213H53Z"/>
+  <path d="M182 35.5h47.4v213H182Z"/>
+</svg>
\ No newline at end of file
diff --git a/Resources/Public/Icons/container-2col-right.svg b/Resources/Public/Icons/container-2col-right.svg
index bfbeaffd..a95244c3 100644
--- a/Resources/Public/Icons/container-2col-right.svg
+++ b/Resources/Public/Icons/container-2col-right.svg
@@ -1,8 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="1158.3 -1158.3 283.5 283.5" enable-background="new 1158.3 -1158.3 283.5 283.5" xml:space="preserve">
-<rect x="1176" y="-1140" fill="#FFFFFF" width="247" height="247"/>
-<path fill="#999999" d="M1176-1140.5v248h248v-248H1176z M1193.7-1122.8h212.6v212.6h-212.6V-1122.8z"/>
-<path fill="#B9B9B9" d="M1280.1-1122.7H1388v212.4h-107.8V-1122.7z"/>
-<path fill="#B9B9B9" d="M1212.9-1122.9h47.2v212.7h-47.2V-1122.9z"/>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 284 284" fill="#b9b9b9">
+  <path fill="#fff" stroke="#999" stroke-width="17" d="M27 27h230v230H27Z"/>
+  <path d="M53 35.5h47.4v213H53Z"/>
+  <path d="M119 35.5h110v213H119Z"/>
 </svg>
\ No newline at end of file
diff --git a/Resources/Public/Icons/container-2col.svg b/Resources/Public/Icons/container-2col.svg
index 481fcb63..a16ea09f 100644
--- a/Resources/Public/Icons/container-2col.svg
+++ b/Resources/Public/Icons/container-2col.svg
@@ -1,9 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="358.8 -1158.3 282.5 283.5" enable-background="new 358.8 -1158.3 282.5 283.5" xml:space="preserve">
-<rect x="376.5" y="-1140" fill="#FFFFFF" width="247" height="247"/>
-<path fill="#FFFFFF" d="M376-1140.5h248v248H376V-1140.5z"/>
-<path fill="#999999" d="M376-1140.5v248h248v-248H376z M393.7-1122.8h212.6v212.6H393.7C393.7-910.4,393.7-1122.8,393.7-1122.8z"/>
-<path fill="#B9B9B9" d="M510.7-1122.7h77.5v212.4h-77.5V-1122.7z"/>
-<path fill="#B9B9B9" d="M413.2-1122.8h77.5v212.7h-77.5V-1122.8z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 284 284" fill="#b9b9b9">
+  <path fill="#fff" stroke="#999" stroke-width="17" d="M27 27h230v230H27Z"/>
+  <path d="M53 35.5h77.5v213H53Z"/>
+  <path d="M152 35.5h77.5v213H152Z"/>
+</svg>
\ No newline at end of file
diff --git a/Resources/Public/Icons/container-3col.svg b/Resources/Public/Icons/container-3col.svg
index 310f1945..9ff6db8b 100644
--- a/Resources/Public/Icons/container-3col.svg
+++ b/Resources/Public/Icons/container-3col.svg
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="1558.3 -1158.3 283.5 283.5" enable-background="new 1558.3 -1158.3 283.5 283.5" xml:space="preserve">
-<rect x="1576" y="-1140" fill="#FFFFFF" width="247" height="247"/>
-<path fill="#999999" d="M1576-1140.5v248h248v-248H1576L1576-1140.5z M1806.3-910.3h-212.6v-212.6h212.6V-910.3z"/>
-<path fill="#B9B9B9" d="M1787.4-910.3h-45.9v-212.7h45.8L1787.4-910.3L1787.4-910.3z"/>
-<path fill="#B9B9B9" d="M1658.1-910.3h-45.8v-212.7h45.8V-910.3z"/>
-<path fill="#B9B9B9" d="M1722.7-910.3h-45.8v-212.7h45.8V-910.3z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 284 284" fill="#b9b9b9">
+  <path fill="#fff" stroke="#999" stroke-width="17" d="M27 27h230v230H27Z"/>
+  <path d="M53 35.5h45.8v213H53Z"/>
+  <path d="M119 35.5h45.8v213H119Z"/>
+  <path d="M184 35.5h45.8v213H184Z"/>
+</svg>
\ No newline at end of file
diff --git a/Resources/Public/Icons/container-4col.svg b/Resources/Public/Icons/container-4col.svg
index 4d9c67b2..3ed45523 100644
--- a/Resources/Public/Icons/container-4col.svg
+++ b/Resources/Public/Icons/container-4col.svg
@@ -1,10 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="1958.3 -1158.3 283.5 283.5" enable-background="new 1958.3 -1158.3 283.5 283.5" xml:space="preserve">
-<rect x="1976.5" y="-1140" fill="#FFFFFF" width="247" height="247"/>
-<path fill="#999999" d="M1976-1140.5v248h248v-248H1976z M1993.7-1122.8h212.6v212.6h-212.6V-1122.8z"/>
-<path fill="#B9B9B9" d="M2061.2-1122.7h29.7v212.4h-29.7V-1122.7z"/>
-<path fill="#B9B9B9" d="M2012.9-1122.9h29.7v212.7h-29.7V-1122.9z"/>
-<path fill="#B9B9B9" d="M2157.9-1122.7h29.7v212.4h-29.7V-1122.7z"/>
-<path fill="#B9B9B9" d="M2109.6-1122.8h29.7v212.7h-29.7V-1122.8z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 284 284" fill="#b9b9b9">
+  <path fill="#fff" stroke="#999" stroke-width="17" d="M27 27h230v230H27Z"/>
+  <path d="M53 35.5h29.7v213H53Z"/>
+  <path d="M102 35.5h29.7v213H102Z"/>
+  <path d="M152 35.5h29.7v213H152Z"/>
+  <path d="M201 35.5h29.7v213H201Z"/>
+</svg>
\ No newline at end of file