diff --git a/core/webapp/_images/batch_light.svg b/core/webapp/_images/batch_light.svg
index dd283a68960..5363b627400 100644
--- a/core/webapp/_images/batch_light.svg
+++ b/core/webapp/_images/batch_light.svg
@@ -1,19 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Light" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="64" height="64"
-	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFFFFF;}
-	.st1{fill:none;stroke:#FFFFFF;stroke-width:3;stroke-linecap:round;stroke-miterlimit:10;}
-	.st2{fill:none;stroke:#96C3E5;stroke-width:3;stroke-linecap:round;stroke-miterlimit:10;}
-</style>
-<g>
-	<path class="st0" d="M17.5,27h30c0.6,0,1,0.4,1,1v27c0,0.6-0.4,1-1,1h-30c-0.6,0-1-0.4-1-1V28C16.5,27.4,17,27,17.5,27z"/>
-	<path class="st1" d="M16.6,54.3c0,0.5,0.4,1,0.9,1h30.1c0.5,0,0.9-0.5,0.9-1v-44c0-0.5-0.4-1-0.9-1H12.9c-0.6,0-1,0.5-0.9,1
-		c0,0.2,0.1,0.4,0.2,0.6l4.1,8.3c0.1,0.1,0.1,0.3,0.1,0.4L16.6,54.3z"/>
-	<line class="st2" x1="36.5" y1="34" x2="44.5" y2="34"/>
-	<line class="st2" x1="36.5" y1="46" x2="44.5" y2="46"/>
-	<line class="st2" x1="36.5" y1="40" x2="44.5" y2="40"/>
-</g>
+<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M49.5293 55.6667H19.5293C18.9773 55.6667 18.5293 55.2187 18.5293 54.6667V27.6667C18.5293 27.1147 18.9773 26.6667 19.5293 26.6667H49.5293C50.0823 26.6667 50.5293 27.1147 50.5293 27.6667V54.6667C50.5293 55.2187 50.0823 55.6667 49.5293 55.6667Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M18.5593 54.0002C18.5593 54.5522 18.9813 55.0002 19.5003 55.0002H49.6183C50.1383 55.0002 50.5593 54.5522 50.5593 54.0002V10.0002C50.5593 9.44821 50.1383 9.00021 49.6183 9.00021H14.9433C14.1623 9.00021 13.7203 9.95221 14.1973 10.6102L18.2643 18.9162C18.3303 19.0512 18.3663 19.2002 18.3663 19.3502L18.5593 54.0002Z" stroke="#99C9E8" stroke-width="2" stroke-linecap="round"/>
+<path d="M38.5293 33.6667H46.5293" stroke="#99C9E8" stroke-width="2" stroke-linecap="round"/>
+<path d="M38.5293 45.6667H46.5293" stroke="#99C9E8" stroke-width="2" stroke-linecap="round"/>
+<path d="M38.5293 39.6667H46.5293" stroke="#99C9E8" stroke-width="2" stroke-linecap="round"/>
 </svg>
diff --git a/core/webapp/_images/chemistry_light.svg b/core/webapp/_images/chemistry_light.svg
index 3a6b8933b33..7b0d4ad21c9 100644
--- a/core/webapp/_images/chemistry_light.svg
+++ b/core/webapp/_images/chemistry_light.svg
@@ -1,49 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 22.1.0, 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"
-	 width="64" height="64"
-	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFFFFF;}
-</style>
-<g id="External">
-	<path class="st0" d="M5.3,36.5H7c0.5,0,1,0.4,1,0.9v0.1v11.3c0,0.5-0.4,1-0.9,1H7H5.3c-0.5,0-1-0.4-1-0.9v-0.1V37.5
-		C4.3,37,4.7,36.5,5.3,36.5L5.3,36.5z"/>
-	<path class="st0" d="M6.5,52l0.8-1.4c0.3-0.5,0.9-0.6,1.4-0.4l9.8,5.7c0.5,0.3,0.6,0.9,0.4,1.4l-0.8,1.4c-0.3,0.5-0.9,0.6-1.4,0.4
-		l-9.8-5.7C6.4,53.1,6.2,52.5,6.5,52L6.5,52z"/>
-	<path class="st0" d="M7.4,35.6l-0.8-1.4c-0.3-0.5-0.1-1.1,0.3-1.4c0,0,0,0,0.1,0l9.8-5.7c0.5-0.3,1.1-0.1,1.4,0.3c0,0,0,0,0,0.1
-		l0.8,1.4c0.3,0.5,0.1,1.1-0.3,1.4c0,0,0,0-0.1,0L8.8,36C8.3,36.2,7.7,36.1,7.4,35.6z"/>
-	<path class="st0" d="M31.8,36.5h1.7c0.5,0,1,0.4,1,0.9v0.1v11.3c0,0.5-0.4,1-0.9,1h-0.1h-1.7c-0.5,0-1-0.4-1-0.9v-0.1V37.5
-		C30.8,37,31.2,36.5,31.8,36.5L31.8,36.5z"/>
-	<path class="st0" d="M32.2,34.2l-0.9,1.5c-0.3,0.5-0.9,0.6-1.4,0.4l-9.8-5.7c-0.5-0.3-0.6-0.9-0.4-1.4l0.8-1.4
-		c0.3-0.5,0.9-0.6,1.4-0.4l9.8,5.7C32.2,33.1,32.4,33.6,32.2,34.2C32.2,34.1,32.2,34.2,32.2,34.2z"/>
-	<path class="st0" d="M31.3,50.6l0.8,1.4c0.3,0.5,0.1,1.1-0.3,1.4c0,0,0,0-0.1,0l-9.8,5.7c-0.5,0.3-1.1,0.1-1.4-0.3c0,0,0,0,0-0.1
-		l-0.8-1.4c-0.3-0.5-0.1-1.1,0.3-1.4c0,0,0,0,0.1,0l9.8-5.7C30.4,50,31,50.1,31.3,50.6z"/>
-	<path class="st0" d="M18.5,13.4h1.7c0.5,0,1,0.4,1,0.9v0.1v11.3c0,0.5-0.4,1-0.9,1h-0.1h-1.7c-0.5,0-1-0.4-1-0.9v-0.1V14.4
-		c0-0.5,0.4-1,0.9-1H18.5z"/>
-	<path class="st0" d="M44.5,27.5l0.8,1.4c0.3,0.5,0.1,1.1-0.3,1.4c0,0,0,0-0.1,0L35.1,36c-0.5,0.3-1.1,0.1-1.4-0.3c0,0,0,0,0-0.1
-		l-0.8-1.4c-0.3-0.5-0.1-1.1,0.3-1.4c0,0,0,0,0.1,0l9.8-5.7C43.6,26.9,44.2,27.1,44.5,27.5z"/>
-	<path class="st0" d="M20.8,12.6L20,11.2c-0.3-0.5-0.1-1.1,0.3-1.4c0,0,0,0,0.1,0l9.8-5.7c0.5-0.3,1.1-0.1,1.4,0.3c0,0,0,0,0,0.1
-		L32.3,6c0.3,0.5,0.1,1.1-0.3,1.4c0,0,0,0-0.1,0l-9.8,5.7C21.6,13.3,21,13.1,20.8,12.6z"/>
-	<path class="st0" d="M45.1,13.4h1.7c0.5,0,1,0.4,1,0.9v0.1v11.3c0,0.5-0.4,1-0.9,1h-0.1h-1.7c-0.5,0-1-0.4-1-0.9v-0.1V14.4
-		C44.1,13.8,44.5,13.4,45.1,13.4z"/>
-	<path class="st0" d="M45.6,11.1l-0.8,1.5c-0.3,0.5-0.9,0.6-1.4,0.4l-9.8-5.7C33.1,7,33,6.4,33.2,5.9L34,4.5
-		c0.3-0.5,0.9-0.6,1.4-0.4l9.8,5.7c0.5,0.2,0.7,0.7,0.5,1.2C45.6,11,45.6,11.1,45.6,11.1z"/>
-	<path class="st0" d="M58.8,34.1L58,35.5c-0.3,0.5-0.9,0.6-1.4,0.4l-9.8-5.7c-0.5-0.3-0.6-0.9-0.4-1.4l0.8-1.4
-		c0.3-0.5,0.9-0.6,1.4-0.4l9.8,5.7C58.9,33,59.1,33.6,58.8,34.1L58.8,34.1z"/>
-	<path class="st0" d="M47.3,12.7l-0.8-1.4c-0.3-0.5-0.1-1.1,0.3-1.4c0,0,0,0,0.1,0l9.8-5.7c0.5-0.3,1.1-0.1,1.4,0.3c0,0,0,0,0,0.1
-		L58.9,6c0.3,0.5,0.1,1.1-0.3,1.4c0,0,0,0-0.1,0l-9.8,5.7C48.2,13.3,47.6,13.1,47.3,12.7z"/>
-</g>
-<g id="Internal">
-	<path class="st0" d="M41.3,14.4h0.8c0.3,0,0.5,0.2,0.5,0.4c0,0,0,0,0,0.1V25c0,0.3-0.2,0.5-0.4,0.5c0,0,0,0-0.1,0h-0.8
-		c-0.3,0-0.5-0.2-0.5-0.4c0,0,0,0,0-0.1V14.9C40.8,14.6,41,14.4,41.3,14.4z"/>
-	<path class="st0" d="M28.4,38L28,38.7c-0.2,0.2-0.4,0.3-0.7,0.2l-8.8-5.1c-0.2-0.2-0.3-0.4-0.2-0.7l0.4-0.7
-		c0.2-0.2,0.4-0.3,0.7-0.2l8.8,5.1C28.5,37.4,28.5,37.7,28.4,38z"/>
-	<path class="st0" d="M23.7,15.4l-0.5-0.9c-0.1-0.2,0-0.6,0.2-0.7l8.8-5.1c0.1-0.1,0.4,0,0.6,0.2l0.5,0.9c0.1,0.2,0,0.6-0.2,0.7
-		l-8.8,5.1C24.1,15.7,23.9,15.7,23.7,15.4C23.7,15.5,23.7,15.4,23.7,15.4z"/>
-	<path class="st0" d="M28.4,47.7l0.5,0.9c0.1,0.2,0,0.6-0.2,0.7l-8.8,5.1c-0.2,0.1-0.6,0-0.7-0.2l-0.5-0.9c-0.1-0.2,0-0.6,0.2-0.7
-		l8.8-5.1C28,47.4,28.2,47.5,28.4,47.7z"/>
-	<path class="st0" d="M9.6,37.9h0.8c0.3,0,0.5,0.2,0.5,0.4c0,0,0,0,0,0.1v10.1c0,0.3-0.2,0.5-0.4,0.5c0,0,0,0-0.1,0H9.6
-		c-0.3,0-0.5-0.2-0.5-0.4c0,0,0,0,0-0.1V38.4C9.1,38.1,9.3,37.9,9.6,37.9L9.6,37.9z"/>
-</g>
+<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6 38H7.7C8.3 38 8.7 38.4 8.7 39V50.3C8.7 50.9 8.3 51.3 7.7 51.3H6C5.4 51.3 5 50.9 5 50.3V39C5 38.4 5.4 38 6 38Z" fill="#99C9E8"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7.14095 52.8966L7.94095 51.4966C8.24095 50.9966 8.84095 50.8966 9.34095 51.0966L19.141 56.7966C19.641 57.0966 19.741 57.6966 19.541 58.1966L18.741 59.5966C18.441 60.0966 17.841 60.1966 17.341 59.9966L7.54095 54.2966C7.04095 53.9966 6.84095 53.3966 7.14095 52.8966Z" fill="#99C9E8"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7.94171 36.641L7.14071 35.241C6.84071 34.741 7.04171 34.141 7.54171 33.841L17.3407 28.141C17.8407 27.841 18.4417 28.041 18.7417 28.541L19.5417 29.941C19.8407 30.441 19.6407 31.041 19.1407 31.341L9.34071 37.041C8.84071 37.241 8.24171 37.141 7.94171 36.641Z" fill="#99C9E8"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M33 38H34.7C35.3 38 35.7 38.4 35.7 39V50.3C35.7 50.9 35.3 51.3 34.7 51.3H33C32.4 51.3 32 50.9 32 50.3V39C32 38.4 32.4 38 33 38Z" fill="#99C9E8"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M32.5968 35.0966L31.6968 36.5966C31.3968 37.0966 30.7968 37.1966 30.2968 36.9966L20.4958 31.2966C19.9958 30.9966 19.8968 30.3966 20.0968 29.8966L20.8968 28.4966C21.1968 27.9966 21.7968 27.8966 22.2968 28.0966L32.0968 33.7966C32.6968 33.9966 32.7968 34.5966 32.5968 35.0966Z" fill="#99C9E8"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M31.7405 51.4966L32.5405 52.8966C32.8415 53.3966 32.6405 53.9966 32.1405 54.2966L22.3415 59.9966C21.8415 60.2966 21.2405 60.0966 20.9405 59.5966L20.1405 58.1966C19.8415 57.6966 20.0405 57.0966 20.5405 56.7966L30.3415 51.0966C30.8415 50.8966 31.4405 50.9966 31.7405 51.4966Z" fill="#99C9E8"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M19 14H20.7C21.3 14 21.7 14.4 21.7 15V26.3C21.7 26.9 21.3 27.3 20.7 27.3H19C18.4 27.3 18 26.9 18 26.3V15C18 14.4 18.4 14 19 14Z" fill="#99C9E8"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M44.741 28.4785L45.541 29.8785C45.841 30.3785 45.641 30.9785 45.141 31.2785L35.341 36.9785C34.841 37.2785 34.241 37.0785 33.941 36.5785L33.141 35.1785C32.841 34.6785 33.041 34.0785 33.541 33.7785L43.341 28.0785C43.841 27.8785 44.441 28.0785 44.741 28.4785Z" fill="#99C9E8"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M21.9407 13.641L21.1407 12.241C20.8407 11.741 21.0417 11.141 21.5417 10.841L31.3407 5.14095C31.8407 4.84095 32.4407 5.04095 32.7407 5.54095L33.4407 7.04095C33.7407 7.54095 33.5417 8.14095 33.0417 8.44095L23.2407 14.141C22.8407 14.341 22.2407 14.141 21.9407 13.641Z" fill="#99C9E8"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M46 14H47.7C48.301 14 48.7 14.4 48.7 15V26.3C48.7 26.9 48.301 27.3 47.7 27.3H46C45.4 27.3 45 26.9 45 26.3V15C45 14.4 45.5 14 46 14Z" fill="#99C9E8"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M46.4963 12.0966L45.6963 13.5966C45.3963 14.0966 44.7973 14.1966 44.2973 13.9966L34.4963 8.29657C33.9963 7.99657 33.8963 7.39657 34.0973 6.89657L34.8963 5.49657C35.1963 4.99657 35.7973 4.89657 36.2973 5.09657L46.0973 10.7966C46.5973 10.9966 46.7973 11.6966 46.4963 12.0966Z" fill="#99C9E8"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M59.4963 35.1966L58.6963 36.5966C58.3963 37.0966 57.7963 37.1966 57.2963 36.9966L47.4963 31.2966C46.9963 30.9966 46.8963 30.3966 47.0973 29.8966L47.8963 28.4966C48.1963 27.9966 48.7963 27.8966 49.2963 28.0966L59.0973 33.7966C59.5973 34.0966 59.7963 34.6966 59.4963 35.1966Z" fill="#99C9E8"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M47.9407 13.641L47.1407 12.241C46.8407 11.741 47.0417 11.141 47.5417 10.841L57.3407 5.14095C57.8407 4.84095 58.4407 5.04095 58.7407 5.54095L59.5417 6.94095C59.8407 7.44095 59.6407 8.04095 59.1407 8.34095L49.3407 14.041C48.7407 14.241 48.1407 14.041 47.9407 13.641Z" fill="#99C9E8"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M42.5 15H43.3C43.601 15 43.8 15.2 43.8 15.5V25.6C43.8 25.9 43.601 26.1 43.3 26.1H42.5C42.2 26.1 42 25.9 42 25.6V15.5C42 15.3 42.2 15 42.5 15Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M29.1398 38.8392L28.7398 39.5392C28.6398 39.7392 28.3388 39.8392 28.0388 39.7392L19.2398 34.6392C19.0388 34.5392 18.9398 34.2392 19.0388 33.9392L19.4398 33.2392C19.5388 33.0392 19.8388 32.9392 20.1398 33.0392L28.9398 38.1392C29.2398 38.2392 29.2398 38.5392 29.1398 38.8392Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24.5605 16.7392L24.0605 15.8392C23.9595 15.6392 23.9595 15.3392 24.2605 15.1392L33.0605 10.0392C33.1605 9.93923 33.4595 10.0392 33.6605 10.2392L34.1605 11.1392C34.2605 11.3392 34.2605 11.6392 33.9595 11.8392L25.1605 16.9392C24.9595 17.0392 24.6605 17.0392 24.5605 16.7392Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M28.7605 49.2392L29.2605 50.1392C29.3605 50.3392 29.3605 50.6392 29.0605 50.8392L20.2605 55.9392C20.0605 56.0392 19.7605 56.0392 19.5605 55.7392L19.0605 54.8392C18.9595 54.6392 18.9595 54.3392 19.2605 54.1392L28.0605 49.0392C28.3605 48.9392 28.6595 49.0392 28.7605 49.2392Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10.5 39H11.301C11.601 39 11.801 39.2 11.801 39.5V49.6C11.801 49.9 11.601 50.1 11.301 50.1H10.5C10.2 50.1 10 49.9 10 49.6V39.5C10 39.2 10.2 39 10.5 39Z" fill="white"/>
 </svg>
diff --git a/core/webapp/_images/compound_light.svg b/core/webapp/_images/compound_light.svg
index 20fb5b4f22d..699c6bafe9a 100644
--- a/core/webapp/_images/compound_light.svg
+++ b/core/webapp/_images/compound_light.svg
@@ -1,10 +1,10 @@
 <svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
-<line x1="33.8398" y1="23.7547" x2="42.4256" y2="15.1689" stroke="white" stroke-width="2" stroke-linecap="round"/>
-<line x1="19" y1="58.5858" x2="25.5858" y2="52" stroke="white" stroke-width="2" stroke-linecap="round"/>
-<line x1="42" y1="45.5858" x2="48.5858" y2="39" stroke="white" stroke-width="2" stroke-linecap="round"/>
-<line x1="23" y1="17" x2="23" y2="11" stroke="white" stroke-width="2" stroke-linecap="round"/>
-<path d="M22.4319 42.1714L33.8444 35.5824L45.2568 42.1714V55.3494L33.8444 61.9384L22.4319 55.3494V42.1714Z" fill="white" stroke="white" stroke-width="2"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M40.8002 9.06767C42.1909 8.86846 43.6976 9.09947 45.0649 9.88882C48.2766 11.7434 49.3737 15.8399 47.52 19.0525C46.0993 21.5122 43.3721 22.7626 40.7805 22.3595C39.9388 22.238 39.1083 21.9415 38.3573 21.5075C35.1447 19.652 34.0467 15.5555 35.9022 12.3448C36.9665 10.4986 38.8025 9.37163 40.8002 9.06767" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M27.7435 10.6368C26.1537 13.3899 22.633 14.3332 19.8799 12.7434C17.125 11.1536 16.1834 7.63287 17.7715 4.87973C19.3613 2.12659 22.882 1.18159 25.6369 2.77309C28.39 4.36117 29.3333 7.88362 27.7435 10.6368" fill="white"/>
-<path d="M11.9202 23.4468L23.3327 16.8578L34.7451 23.4468V36.6248L23.3327 43.2137L11.9202 36.6248V23.4468Z" fill="white" stroke="white" stroke-width="2"/>
+<path d="M33.8398 23.7547L42.4256 15.1689" stroke="#99C9E8" stroke-width="2" stroke-linecap="round"/>
+<path d="M19 58.5858L25.5858 52" stroke="#99C9E8" stroke-width="2" stroke-linecap="round"/>
+<path d="M42 45.5858L48.5858 39" stroke="#99C9E8" stroke-width="2" stroke-linecap="round"/>
+<path d="M23 17V11" stroke="#99C9E8" stroke-width="2" stroke-linecap="round"/>
+<path d="M22.4316 42.1715L33.8441 35.5825L45.2565 42.1715V55.3495L33.8441 61.9385L22.4316 55.3495V42.1715Z" fill="white" stroke="#99C9E8" stroke-width="2"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M40.8002 9.06767C42.1909 8.86846 43.6976 9.09947 45.0649 9.88882C48.2766 11.7434 49.3737 15.8399 47.52 19.0525C46.0993 21.5122 43.3721 22.7626 40.7805 22.3595C39.9388 22.238 39.1083 21.9415 38.3573 21.5075C35.1447 19.652 34.0467 15.5555 35.9022 12.3448C36.9665 10.4986 38.8025 9.37163 40.8002 9.06767Z" fill="#99C9E8"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M27.7435 10.6368C26.1537 13.3899 22.633 14.3332 19.8799 12.7434C17.125 11.1536 16.1834 7.63287 17.7715 4.87973C19.3613 2.12659 22.882 1.18159 25.6369 2.77309C28.39 4.36117 29.3333 7.88362 27.7435 10.6368Z" fill="white"/>
+<path d="M11.9199 23.4469L23.3324 16.8579L34.7448 23.4469V36.6249L23.3324 43.2138L11.9199 36.6249V23.4469Z" fill="white" stroke="#99C9E8" stroke-width="2"/>
 </svg>
diff --git a/core/webapp/_images/expressionsystem_light.svg b/core/webapp/_images/expressionsystem_light.svg
index cd9ec8302bc..5c12cd2c040 100644
--- a/core/webapp/_images/expressionsystem_light.svg
+++ b/core/webapp/_images/expressionsystem_light.svg
@@ -1,24 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 22.1.0, 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"
-	 width="64" height="64"
-	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:none;}
-	.st1{fill:none;stroke:#FFFFFF;stroke-width:3;stroke-miterlimit:10;}
-	.st2{fill:#FFFFFF;}
-	.st3{fill:none;stroke:#FFFFFF;stroke-width:3;stroke-linecap:round;stroke-miterlimit:10;}
-</style>
-<path class="st0" d="M59,21v25.3c0,7-5.4,12.7-12,12.7H35.1c-6.6,0-12-5.7-12-12.7V21H59z"/>
-<path class="st1" d="M35,11h12c6.6,0,12,5.4,12,12v24c0,6.6-5.4,12-12,12H35c-6.6,0-12-5.4-12-12V23C23,16.4,28.4,11,35,11z"/>
-<path class="st2" d="M59,47v-0.7c0,7-5.4,12.7-12,12.7H35.1c-6.6,0-12-5.7-12-12.7V47H59z"/>
-<line class="st3" x1="41" y1="39" x2="41.1" y2="21"/>
-<path class="st1" d="M13,39V8c0-1.7,1.3-3,3-3h22c1.7,0,3,1.3,3.1,3v13"/>
-<line class="st3" x1="36.9" y1="31" x2="44.9" y2="31"/>
-<line class="st3" x1="37" y1="25" x2="45" y2="25"/>
-<line class="st3" x1="37" y1="37" x2="45" y2="37"/>
-<path class="st2" d="M11,39h4c1.1,0,2,0.9,2,2v3.6c0,0.3,0,0.5,0.1,0.8l3.7,9.3c0.1,0.2,0.2,0.5,0.1,0.8V57c0,1.1-0.9,2-2,2h-12
-	c-1.1,0-2-0.9-2-2v-1.6c0-0.3,0-0.5,0.1-0.8l3.7-9.3c0.1-0.2,0.2-0.5,0.1-0.8V41C9,39.9,9.9,39,11,39L11,39z"/>
-<line class="st3" x1="57" y1="15" x2="60" y2="12"/>
-<line class="st3" x1="54" y1="13" x2="57" y2="10"/>
+<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M56.875 21V46.271C56.875 53.271 51.494 59 44.917 59H32.958C26.381 59 21 53.271 21 46.271V21H56.875Z" fill="#99C9E8"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M56.875 46.729V46C56.875 53 51.494 58.729 44.917 58.729H32.958C26.381 58.729 21 53 21 46V46.729H56.875Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M45 59H33C26.4 59 21 53.6 21 47V23C21 16.4 26.4 11 33 11H45C51.6 11 57 16.4 57 23V47C57 53.6 51.6 59 45 59Z" stroke="white" stroke-width="2"/>
+<path d="M39 39L39.125 21" stroke="white" stroke-width="2" stroke-linecap="round"/>
+<path d="M11 39V8C11 6.343 12.343 5 14 5H36C37.657 5 39 6.343 39 8V21V17" stroke="white" stroke-width="2"/>
+<path d="M35 31H43" stroke="white" stroke-width="2" stroke-linecap="round"/>
+<path d="M35 25H43" stroke="white" stroke-width="2" stroke-linecap="round"/>
+<path d="M35 37H43" stroke="white" stroke-width="2" stroke-linecap="round"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9 39H13C14.104 39 15 39.896 15 41V44.615C15 44.869 15.049 45.121 15.143 45.357L18.857 54.643C18.951 54.879 19 55.131 19 55.385V57C19 58.104 18.104 59 17 59H5C3.896 59 3 58.104 3 57V55.385C3 55.131 3.049 54.879 3.143 54.643L6.857 45.357C6.951 45.121 7 44.869 7 44.615V41C7 39.896 7.896 39 9 39Z" fill="#99C9E8"/>
+<path d="M55 15L58 12" stroke="white" stroke-width="2" stroke-linecap="round"/>
+<path d="M52 13L55 10" stroke="white" stroke-width="2" stroke-linecap="round"/>
 </svg>
diff --git a/core/webapp/_images/molecule_light.svg b/core/webapp/_images/molecule_light.svg
index 7c626d99270..7ee2d79601d 100644
--- a/core/webapp/_images/molecule_light.svg
+++ b/core/webapp/_images/molecule_light.svg
@@ -1,23 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 22.1.0, 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"
-	 width="64" height="64"
-	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:none;stroke:#FFFFFF;stroke-width:3;stroke-linecap:round;stroke-miterlimit:10;}
-	.st1{fill:#FFFFFF;}
-</style>
-<g id="V2">
-	<g id="V2-2">
-		<line class="st0" x1="32.6" y1="38.8" x2="25" y2="46.4"/>
-		<line class="st0" x1="25" y1="25.9" x2="30.2" y2="28"/>
-		<line class="st0" x1="44.5" y1="12.6" x2="44.5" y2="17.6"/>
-		<path class="st1" d="M30,51.8c0,5.9-4.8,10.6-10.6,10.6c-5.9,0-10.6-4.8-10.6-10.6s4.8-10.6,10.6-10.6l0,0l0,0
-			C25.2,41.1,30,45.9,30,51.8C30,51.7,30,51.7,30,51.8L30,51.8z"/>
-		<path class="st1" d="M25.8,22c0,5.9-4.7,10.6-10.6,10.6l0,0l0,0C9.3,32.6,4.6,27.9,4.6,22s4.7-10.6,10.6-10.6
-			C21,11.4,25.7,16.2,25.8,22z"/>
-		<circle class="st1" cx="44.5" cy="7.6" r="5"/>
-		<path class="st1" d="M59.5,32.6c0,8.3-6.7,15-15,15s-15-6.7-15-15s6.7-15,15-15H45C53.1,17.9,59.5,24.5,59.5,32.6z"/>
-	</g>
-</g>
+<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M33.604 38L26 45.604" stroke="#99C9E8" stroke-width="2" stroke-linecap="round"/>
+<path d="M26 25L31.25 27.125" stroke="#99C9E8" stroke-width="2" stroke-linecap="round"/>
+<path d="M45 12V17" stroke="#99C9E8" stroke-width="2" stroke-linecap="round"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M30.25 51.625C30.25 53.75 29.625 55.625 28.625 57.25C26.75 60.25 23.375 62.25 19.625 62.25C15.875 62.25 12.5 60.25 10.625 57.25C9.625 55.625 9 53.75 9 51.625C9 45.75 13.75 41 19.625 41C25.5 41 30.25 45.75 30.25 51.625Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M26.25 21.625C26.25 27.5 21.5 32.25 15.625 32.25C14.25 32.25 12.875 32 11.625 31.5C7.75 30 5 26.125 5 21.625C5 15.75 9.75 11 15.625 11C18.125 11 20.375 11.875 22.125 13.25C24.625 15.25 26.25 18.25 26.25 21.625Z" fill="#99C9E8"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M45 2C47.762 2 50 4.238 50 7C50 9.762 47.762 12 45 12C42.238 12 40 9.762 40 7C40 4.238 42.238 2 45 2Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M60 32C60 34.625 59.375 37 58.25 39.125C55.75 43.875 50.75 47 45 47C36.75 47 30 40.25 30 32C30 23.75 36.75 17 45 17H45.5C53.5 17.25 60 23.875 60 32Z" fill="white"/>
 </svg>
diff --git a/core/webapp/_images/moleculeset_light.svg b/core/webapp/_images/moleculeset_light.svg
index 4803ba6d113..12907de1e3c 100644
--- a/core/webapp/_images/moleculeset_light.svg
+++ b/core/webapp/_images/moleculeset_light.svg
@@ -1,34 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 22.1.0, 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"
-	 width="64" height="64"
-	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:none;stroke:#FFFFFF;stroke-width:3;stroke-linecap:round;stroke-miterlimit:10;}
-	.st1{fill:#FFFFFF;}
-</style>
-<g id="V2-2">
-	<line class="st0" x1="39.1" y1="40.5" x2="41" y2="47.5"/>
-	<line class="st0" x1="44.2" y1="35" x2="47.9" y2="35.5"/>
-	<line class="st0" x1="41" y1="21.2" x2="39.3" y2="24.1"/>
-	<path class="st1" d="M46.1,46.3c3.4,2,4.6,6.4,2.6,9.8c-2,3.4-6.4,4.6-9.8,2.6c-3.4-2-4.6-6.4-2.6-9.8S42.6,44.3,46.1,46.3
-		L46.1,46.3z"/>
-	<path class="st1" d="M54,29.5c3.9-0.5,7.5,2.2,8.1,6.1s-2.2,7.5-6.1,8.1s-7.5-2.2-8.1-6.1c-0.2-1.6,0.1-3.2,0.9-4.5
-		C49.9,31.1,51.8,29.8,54,29.5z"/>
-	<circle class="st1" cx="42.7" cy="18.2" r="3.4"/>
-	<path class="st1" d="M39,23.9l0.3,0.2c4.7,3,6.1,9.3,3.1,14c-2.8,4.4-8.5,6-13.2,3.6c-4.8-2.7-6.5-8.8-3.8-13.6
-		c0-0.1,0.1-0.1,0.1-0.2C28.2,23.1,34.2,21.4,39,23.9z"/>
-</g>
-<g id="V2-3">
-	<line class="st0" x1="15.7" y1="22.1" x2="11.9" y2="25.9"/>
-	<line class="st0" x1="11.9" y1="15.7" x2="14.6" y2="16.7"/>
-	<line class="st0" x1="21.7" y1="9" x2="21.7" y2="11.5"/>
-	<path class="st1" d="M14.4,28.6c0,2.9-2.4,5.3-5.3,5.3c-1.8,0-3.5-1-4.5-2.5c-1.6-2.5-0.8-5.8,1.7-7.3s5.8-0.8,7.3,1.7
-		C14.2,26.6,14.4,27.6,14.4,28.6z"/>
-	<path class="st1" d="M12.3,13.7c0,2.9-2.4,5.3-5.3,5.3c-0.7,0-1.4-0.1-2-0.4c-2.7-1.1-4.1-4.2-3-6.9s4.2-4.1,6.9-3
-		c0.5,0.2,0.9,0.5,1.4,0.8C11.5,10.5,12.3,12.1,12.3,13.7z"/>
-	<circle class="st1" cx="21.7" cy="6.5" r="2.5"/>
-	<path class="st1" d="M29.2,19c0,1.2-0.3,2.5-0.9,3.6c-1.3,2.4-3.9,4-6.6,3.9c-4.1,0-7.5-3.4-7.5-7.5s3.4-7.5,7.5-7.5h0.2
-		C26,11.7,29.2,15,29.2,19z"/>
-</g>
+<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M39 41L40.879 48.012" stroke="#99C9E8" stroke-width="2" stroke-linecap="round"/>
+<path d="M44 35L47.786 35.529" stroke="#99C9E8" stroke-width="2" stroke-linecap="round"/>
+<path d="M40.687 21L39 23.923" stroke="#99C9E8" stroke-width="2" stroke-linecap="round"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M45.7482 45.9638C49.1832 47.9458 50.3562 52.3258 48.3732 55.7608C47.6562 57.0028 46.6582 57.8878 45.5252 58.5008C43.4162 59.6208 40.7692 59.6518 38.5762 58.3858C36.3842 57.1198 35.0862 54.8128 35.0032 52.4258C34.9672 51.1378 35.2342 49.8308 35.9512 48.5888C37.9342 45.1538 42.3132 43.9818 45.7482 45.9638Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M54.2017 30.0724C55.6887 29.8594 57.2997 30.1064 58.7617 30.9504C62.1957 32.9334 63.3687 37.3134 61.3867 40.7484C59.8677 43.3784 56.9517 44.7154 54.1807 44.2844C53.2807 44.1544 52.3927 43.8374 51.5897 43.3734C48.1547 41.3894 46.9807 37.0094 48.9647 33.5764C50.1027 31.6024 52.0657 30.3974 54.2017 30.0724Z" fill="#99C9E8"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M45.2983 20.0632C44.3663 21.6772 42.3023 22.2302 40.6883 21.2982C39.0733 20.3662 38.5213 18.3022 39.4523 16.6882C40.3843 15.0742 42.4483 14.5202 44.0633 15.4532C45.6773 16.3842 46.2303 18.4492 45.2983 20.0632Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M38.9285 24.1898C39.0745 24.2738 39.1475 24.3168 39.2205 24.3588C44.0425 27.1428 45.7105 33.3668 42.9265 38.1898C40.1425 43.0118 33.9175 44.6798 29.0955 41.8958C25.7345 39.9548 23.8655 36.4408 24.0075 32.8198C24.0675 31.1988 24.5035 29.5988 25.3895 28.0648C28.1315 23.3148 34.1675 21.6358 38.9285 24.1898Z" fill="white"/>
+<path d="M15.802 22L12 25.802" stroke="#99C9E8" stroke-width="2" stroke-linecap="round"/>
+<path d="M12 16L14.625 17.062" stroke="#99C9E8" stroke-width="2" stroke-linecap="round"/>
+<path d="M22 8.99988V11.4999" stroke="#99C9E8" stroke-width="2" stroke-linecap="round"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M14.625 28.312C14.625 29.374 14.313 30.312 13.813 31.125C12.875 32.624 11.187 33.624 9.313 33.624C7.438 33.624 5.75 32.624 4.812 31.125C4.312 30.312 4 29.374 4 28.312C4 25.374 6.375 23 9.313 23C12.25 23 14.625 25.374 14.625 28.312Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.625 13.312C12.625 16.25 10.25 18.624 7.313 18.624C6.625 18.624 5.938 18.499 5.313 18.249C3.375 17.499 2 15.562 2 13.312C2 10.374 4.375 8 7.313 8C8.563 8 9.687 8.437 10.562 9.125C11.813 10.124 12.625 11.625 12.625 13.312Z" fill="#99C9E8"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M22.5 4C23.881 4 25 5.119 25 6.5C25 7.881 23.881 9 22.5 9C21.119 9 20 7.881 20 6.5C20 5.119 21.119 4 22.5 4Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M30 18.5C30 19.812 29.688 21 29.125 22.063C27.875 24.437 25.375 26 22.5 26C18.375 26 15 22.625 15 18.5C15 14.375 18.375 11 22.5 11H22.75C26.75 11.125 30 14.438 30 18.5Z" fill="white"/>
 </svg>
diff --git a/core/webapp/_images/nucsequence_light.svg b/core/webapp/_images/nucsequence_light.svg
index efa6cf736c2..da386afd8a8 100644
--- a/core/webapp/_images/nucsequence_light.svg
+++ b/core/webapp/_images/nucsequence_light.svg
@@ -1,28 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 22.1.0, 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"
-	 width="64" height="64"
-	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:none;stroke:#FFFFFF;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;}
-	.st1{fill:none;stroke:#FFFFFF;stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
-</style>
-<g id="Dark_Group">
-	<path class="st0" d="M19,6c0,0-3.2,16.2,13,26s13,26,13,26"/>
-	<line class="st1" x1="19.3" y1="14.4" x2="27.9" y2="14.4"/>
-	<line class="st1" x1="20.9" y1="18.8" x2="38.8" y2="18.8"/>
-	<line class="st1" x1="23" y1="23.1" x2="29.5" y2="23.1"/>
-	<polyline class="st1" points="34.4,49.1 45.3,49.1 40.9,49.1 	"/>
-	<line class="st1" x1="25.8" y1="44.8" x2="42.5" y2="44.8"/>
-	<line class="st1" x1="33.9" y1="40.5" x2="40.4" y2="40.5"/>
-</g>
-<g id="Light_Group">
-	<line class="st1" x1="45.3" y1="10.1" x2="23.6" y2="10.1"/>
-	<polyline class="st1" points="34.4,14.4 45.3,14.4 40.9,14.4 	"/>
-	<line class="st1" x1="40.9" y1="23.1" x2="34.4" y2="23.1"/>
-	<line class="st1" x1="38.8" y1="53.5" x2="19.3" y2="53.5"/>
-	<polyline class="st1" points="27.9,49.1 19.3,49.1 21.4,49.1 	"/>
-	<line class="st1" x1="30.1" y1="40.5" x2="23.6" y2="40.5"/>
-	<path class="st0" d="M45,6c0,0,3.2,16.2-13,26S19,58,19,58"/>
-</g>
+<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M19.0008 6C19.0008 6 15.8008 22.2 32.0008 32C48.2008 41.8 45.0008 58 45.0008 58" stroke="#99C9E8" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M19.3008 14.3999H27.9008" stroke="#99C9E8" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M20.9004 18.8H38.8004" stroke="#99C9E8" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M23 23.1001H29.5" stroke="#99C9E8" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M34.4004 49.1001H45.3004H40.9004" stroke="#99C9E8" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M25.8008 44.8H42.5008" stroke="#99C9E8" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M33.9004 40.5H40.4004" stroke="#99C9E8" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M45.3016 10.1001H23.6016" stroke="white" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M34.4004 14.3999H45.3004H40.9004" stroke="white" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M40.9004 23.1001H34.4004" stroke="white" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M38.8008 53.5H19.3008" stroke="white" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M27.9008 49.1001H19.3008H21.4008" stroke="white" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M30.1016 40.5H23.6016" stroke="white" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M45.0008 6C45.0008 6 48.2008 22.2 32.0008 32C15.8008 41.8 19.0008 58 19.0008 58" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/core/webapp/_images/protsequence_light.svg b/core/webapp/_images/protsequence_light.svg
index 0287e24045b..7e76108d13a 100644
--- a/core/webapp/_images/protsequence_light.svg
+++ b/core/webapp/_images/protsequence_light.svg
@@ -1,47 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 22.1.0, 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"
-	 width="64" height="64"
-	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFFFFF;}
-	.st1{fill:none;stroke:#FFFFFF;stroke-width:3;stroke-miterlimit:10;}
-	.st2{fill:#FFFFFF;stroke:#FFFFFF;stroke-width:2;stroke-miterlimit:10;}
-	.st3{fill:none;stroke:#FFFFFF;stroke-width:3;stroke-linecap:round;stroke-miterlimit:10;}
-</style>
-<g id="Spiral">
-	<g id="Crosses">
-		<path class="st0" d="M9.2,21.3h13.5c0.1,0,0.2,0.1,0.2,0.2V25c0,0.1-0.1,0.2-0.2,0.2H9.2C9.1,25.2,9,25.1,9,25v-3.5
-			C9,21.5,9.1,21.3,9.2,21.3z"/>
-		<path class="st0" d="M9.2,29.3h13.5c0.1,0,0.2,0.1,0.2,0.2V33c0,0.1-0.1,0.2-0.2,0.2H9.2C9.1,33.2,9,33.1,9,33v-3.5
-			C9,29.5,9.1,29.3,9.2,29.3z"/>
-		<path class="st0" d="M9.2,37.3h13.5c0.1,0,0.2,0.1,0.2,0.2V41c0,0.1-0.1,0.2-0.2,0.2H9.2C9.1,41.2,9,41.1,9,41v-3.5
-			C9,37.5,9.1,37.3,9.2,37.3z"/>
-	</g>
-	<g id="Diagonals">
-		<polygon class="st0" points="9.5,21.6 22.5,14.2 22.5,17.1 9.5,24.5 		"/>
-		<path class="st0" d="M22,15.1v1.7l-12,6.9V22L22,15.1 M22.7,13.5h-0.1L9.1,21.2C9,21.2,9,21.3,9,21.4v3.4c0,0.2,0.1,0.3,0.3,0.3
-			h0.1l13.5-7.7c0.1,0,0.1-0.1,0.1-0.2v-3.4C23,13.7,22.9,13.5,22.7,13.5L22.7,13.5z"/>
-		<polygon class="st0" points="9.5,29.6 22.5,22.2 22.5,25.1 9.5,32.5 		"/>
-		<path class="st0" d="M22,23.1v1.7l-12,6.9V30L22,23.1 M22.7,21.5h-0.1L9.1,29.2C9,29.2,9,29.3,9,29.4v3.4c0,0.2,0.1,0.3,0.3,0.3
-			h0.1l13.5-7.7c0.1,0,0.1-0.1,0.1-0.2v-3.4C23,21.7,22.9,21.5,22.7,21.5L22.7,21.5z"/>
-		<polygon class="st0" points="9.5,37.6 22.5,30.2 22.5,33.1 9.5,40.5 		"/>
-		<path class="st0" d="M22,31.1v1.7l-12,6.9V38L22,31.1 M22.7,29.5h-0.1L9.1,37.2C9,37.2,9,37.3,9,37.4v3.4c0,0.2,0.1,0.3,0.3,0.3
-			h0.1l13.5-7.7c0.1,0,0.1-0.1,0.1-0.2v-3.4C23,29.7,22.9,29.5,22.7,29.5L22.7,29.5z"/>
-		<polygon class="st0" points="9.5,45.6 22.5,38.2 22.5,41.1 9.5,48.5 		"/>
-		<path class="st0" d="M22,39.1v1.7l-12,6.9V46L22,39.1 M22.7,37.5h-0.1L9.1,45.2C9,45.2,9,45.3,9,45.4v3.4c0,0.2,0.1,0.3,0.3,0.3
-			h0.1l13.5-7.7c0.1,0,0.1-0.1,0.1-0.2v-3.4C23,37.7,22.9,37.5,22.7,37.5L22.7,37.5z"/>
-	</g>
-</g>
-<g id="Up">
-	<path id="Bottom_Arch" class="st1" d="M47.8,48.2c0,3.9-3.1,7-7,7s-7-3.1-7-7"/>
-	<path class="st2" d="M40.2,22.7l7.4-7.4c0.1-0.1,0.3-0.1,0.4,0l7.4,7.4c0.2,0.2,0,0.4-0.2,0.4H50c-0.1,0-0.2,0.1-0.2,0.2v25.5
-		c0,0.1-0.1,0.2-0.2,0.2H46c-0.1,0-0.2-0.1-0.2-0.2V23.4c0-0.1-0.1-0.2-0.2-0.2h-5.1C40.1,23.2,40,22.9,40.2,22.7z"/>
-</g>
-<g id="Down">
-	<path id="Top_Arch" class="st3" d="M33.8,16.2c0-3.9-3.1-7-7-7s-7,3.1-7,7l0,0"/>
-	<path class="st2" d="M26.2,41.6l7.4,7.4c0.1,0.1,0.3,0.1,0.4,0l7.4-7.4c0.2-0.2,0-0.4-0.2-0.4H36c-0.1,0-0.2-0.1-0.2-0.2V15.4
-		c0-0.1-0.1-0.2-0.2-0.2H32c-0.1,0-0.2,0.1-0.2,0.2v25.5c0,0.1-0.1,0.2-0.2,0.2h-5.1C26.1,41.2,26,41.4,26.2,41.6z"/>
-</g>
+<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.199 21H22.699C22.8 21 22.899 21.101 22.899 21.2V24.7C22.899 24.801 22.8 24.9 22.699 24.9H9.199C9.099 24.9 9 24.801 9 24.7V21.2C9 21.2 9.099 21 9.199 21Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.199 29H22.699C22.8 29 22.899 29.101 22.899 29.2V32.7C22.899 32.801 22.8 32.9 22.699 32.9H9.199C9.099 32.9 9 32.801 9 32.7V29.2C9 29.2 9.099 29 9.199 29Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.199 37H22.699C22.8 37 22.899 37.101 22.899 37.2V40.7C22.899 40.801 22.8 40.9 22.699 40.9H9.199C9.099 40.9 9 40.801 9 40.7V37.2C9 37.2 9.099 37 9.199 37Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M40.0995 22.475L47.4995 15.075C47.5995 14.975 47.7995 14.975 47.9005 15.075L55.2995 22.475C55.4995 22.675 55.2995 22.875 55.0995 22.875H49.9005C49.7995 22.875 49.7005 22.975 49.7005 23.075V48.575C49.7005 48.675 49.5995 48.775 49.4995 48.775H45.9005C45.7995 48.775 45.7005 48.675 45.7005 48.575V23.175C45.7005 23.075 45.5995 22.975 45.4995 22.975H40.4005C39.9995 22.975 39.9005 22.675 40.0995 22.475Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M40.0995 22.475L47.4995 15.075C47.5995 14.975 47.7995 14.975 47.9005 15.075L55.2995 22.475C55.4995 22.675 55.2995 22.875 55.0995 22.875H49.9005C49.7995 22.875 49.7005 22.975 49.7005 23.075V48.575C49.7005 48.675 49.5995 48.775 49.4995 48.775H45.9005C45.7995 48.775 45.7005 48.675 45.7005 48.575V23.175C45.7005 23.075 45.5995 22.975 45.4995 22.975H40.4005C39.9995 22.975 39.9005 22.675 40.0995 22.475Z" stroke="white" stroke-width="2"/>
+<path d="M48 48C48 51.9 44.899 55 41 55C37.1 55 34 51.9 34 48" stroke="white" stroke-width="1.65"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M22.699 13H22.599L9.099 20.7C9 20.7 9 20.8 9 20.9V24.3C9 24.4 9.099 24.601 9.3 24.601H9.399L22.899 16.9C23 16.9 23 16.8 23 16.7V13.3C23 13.101 22.899 13 22.699 13Z" fill="#99C9E8"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M22.699 21H22.599L9.099 28.7C9 28.7 9 28.8 9 28.9V32.3C9 32.4 9.099 32.601 9.3 32.601H9.399L22.899 24.9C23 24.9 23 24.8 23 24.7V21.3C23 21.101 22.899 21 22.699 21Z" fill="#99C9E8"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M22.699 29H22.599L9.099 36.7C9 36.7 9 36.8 9 36.9V40.3C9 40.4 9.099 40.601 9.3 40.601H9.399L22.899 32.9C23 32.9 23 32.8 23 32.7V29.3C23 29.101 22.899 29 22.699 29Z" fill="#99C9E8"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M22.699 37H22.599L9.099 44.7C9 44.7 9 44.8 9 44.9V48.3C9 48.4 9.099 48.601 9.3 48.601H9.399L22.899 40.9C23 40.9 23 40.8 23 40.7V37.3C23 37.101 22.899 37 22.699 37Z" fill="#99C9E8"/>
+<path d="M34 16C34 12.1 30.899 9 27 9C23.1 9 20 12.1 20 16" stroke="#99C9E8" stroke-width="1.65" stroke-linecap="round"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M26.0995 41.4L33.4995 48.799C33.5995 48.9 33.7995 48.9 33.9005 48.799L41.2995 41.4C41.4995 41.2 41.2995 41 41.0995 41H35.9005C35.7995 41 35.7005 40.9 35.7005 40.799V15.2C35.7005 15.099 35.5995 15 35.4995 15H31.9005C31.7995 15 31.7005 15.099 31.7005 15.2V40.7C31.7005 40.799 31.5995 40.9 31.4995 40.9H26.4005C25.9995 41 25.9005 41.2 26.0995 41.4Z" fill="#99C9E8" stroke="#99C9E8" stroke-width="2"/>
 </svg>
-