diff --git a/resources/images/filament_not_mactch.svg b/resources/images/filament_not_mactch.svg
index 35567926a7..b657c6163c 100644
--- a/resources/images/filament_not_mactch.svg
+++ b/resources/images/filament_not_mactch.svg
@@ -1,4 +1 @@
-<svg width="35" height="25" viewBox="0 0 35 25" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M26.7876 10.739L29.899 13.8505C30.0943 14.0458 30.4109 14.0458 30.6061 13.8505L33.7177 10.739" stroke="#ACACAC" stroke-linecap="round"/>
-<path d="M12 4.34668C14.1549 4.34668 16.2215 5.2027 17.7452 6.72644C19.269 8.25017 20.125 10.3168 20.125 12.4717C20.125 14.6266 19.269 16.6932 17.7452 18.2169C16.2215 19.7407 14.1549 20.5967 12 20.5967C9.84512 20.5967 7.77849 19.7407 6.25476 18.2169C4.73102 16.6932 3.875 14.6266 3.875 12.4717C3.875 10.3168 4.73102 8.25017 6.25476 6.72644C7.77849 5.2027 9.84512 4.34668 12 4.34668ZM12 22.4717C14.6522 22.4717 17.1957 21.4181 19.0711 19.5427C20.9464 17.6674 22 15.1238 22 12.4717C22 9.81951 20.9464 7.27598 19.0711 5.40061C17.1957 3.52525 14.6522 2.47168 12 2.47168C9.34784 2.47168 6.8043 3.52525 4.92893 5.40061C3.05357 7.27598 2 9.81951 2 12.4717C2 15.1238 3.05357 17.6674 4.92893 19.5427C6.8043 21.4181 9.34784 22.4717 12 22.4717ZM12 7.47168C11.4805 7.47168 11.0625 7.88965 11.0625 8.40918V12.7842C11.0625 13.3037 11.4805 13.7217 12 13.7217C12.5195 13.7217 12.9375 13.3037 12.9375 12.7842V8.40918C12.9375 7.88965 12.5195 7.47168 12 7.47168ZM13.25 16.2217C13.25 15.8902 13.1183 15.5722 12.8839 15.3378C12.6495 15.1034 12.3315 14.9717 12 14.9717C11.6685 14.9717 11.3505 15.1034 11.1161 15.3378C10.8817 15.5722 10.75 15.8902 10.75 16.2217C10.75 16.5532 10.8817 16.8711 11.1161 17.1056C11.3505 17.34 11.6685 17.4717 12 17.4717C12.3315 17.4717 12.6495 17.34 12.8839 17.1056C13.1183 16.8711 13.25 16.5532 13.25 16.2217Z" fill="#D01B1B"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" width="35" height="25" viewBox="0 0 35 25"><path d="M12,21c4.97,0,9-4.03,9-9S16.97,3,12,3,3,7.03,3,12s4.03,9,9,9Z" style="fill:#ed1c24;"/><path d="M13,14h-2v-7h2v7ZM13,15h-2v2h2v-2Z" style="fill:#e6e6e6;"/><path d="M25.5,10.5l4,3,4-3" style="fill:none; stroke:#949494; stroke-linecap:round; stroke-linejoin:round;"/></svg>
\ No newline at end of file
diff --git a/resources/images/icon_qusetion.svg b/resources/images/icon_qusetion.svg
index deef62b82c..84deed4fd2 100644
--- a/resources/images/icon_qusetion.svg
+++ b/resources/images/icon_qusetion.svg
@@ -1,3 +1 @@
-<svg width="19" height="18" viewBox="0 0 19 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M17.2722 9C17.2722 7.0606 16.5018 5.20064 15.1304 3.82928C13.7591 2.45792 11.8991 1.6875 9.95972 1.6875C8.02032 1.6875 6.16036 2.45792 4.789 3.82928C3.41764 5.20064 2.64722 7.0606 2.64722 9C2.64722 10.9394 3.41764 12.7994 4.789 14.1707C6.16036 15.5421 8.02032 16.3125 9.95972 16.3125C11.8991 16.3125 13.7591 15.5421 15.1304 14.1707C16.5018 12.7994 17.2722 10.9394 17.2722 9ZM0.959717 9C0.959717 6.61305 1.90793 4.32387 3.59576 2.63604C5.28358 0.948212 7.57277 0 9.95972 0C12.3467 0 14.6359 0.948212 16.3237 2.63604C18.0115 4.32387 18.9597 6.61305 18.9597 9C18.9597 11.3869 18.0115 13.6761 16.3237 15.364C14.6359 17.0518 12.3467 18 9.95972 18C7.57277 18 5.28358 17.0518 3.59576 15.364C1.90793 13.6761 0.959717 11.3869 0.959717 9ZM6.92925 5.81133C7.20698 5.02734 7.95229 4.5 8.7855 4.5H10.8351C12.0621 4.5 13.0535 5.49492 13.0535 6.71836C13.0535 7.51289 12.6281 8.24766 11.939 8.64492L10.8035 9.29531C10.7964 9.75234 10.4203 10.125 9.95972 10.125C9.49214 10.125 9.11597 9.74883 9.11597 9.28125V8.80664C9.11597 8.5043 9.27769 8.22656 9.54136 8.07539L11.0988 7.18242C11.264 7.0875 11.366 6.91172 11.366 6.72187C11.366 6.42656 11.1269 6.19102 10.8351 6.19102H8.7855C8.66597 6.19102 8.5605 6.26484 8.52183 6.37734L8.50776 6.41953C8.35308 6.85898 7.86792 7.0875 7.43198 6.93281C6.99604 6.77812 6.76401 6.29297 6.9187 5.85703L6.93276 5.81484L6.92925 5.81133ZM8.83472 12.375C8.83472 12.0766 8.95324 11.7905 9.16422 11.5795C9.3752 11.3685 9.66135 11.25 9.95972 11.25C10.2581 11.25 10.5442 11.3685 10.7552 11.5795C10.9662 11.7905 11.0847 12.0766 11.0847 12.375C11.0847 12.6734 10.9662 12.9595 10.7552 13.1705C10.5442 13.3815 10.2581 13.5 9.95972 13.5C9.66135 13.5 9.3752 13.3815 9.16422 13.1705C8.95324 12.9595 8.83472 12.6734 8.83472 12.375Z" fill="#909090"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18"><rect x="0" y="0" width="17" height="17" rx="8.5" ry="8.5" style="fill:#009688;"/><rect x="8" y="13" width="1" height="1" style="fill:#e6e6e6;"/><path d="M5.5,6.5c0-1.66,1.34-3,3-3s3,1.34,3,3c0,3-3,2-3,4v1" style="fill:none; stroke:#e6e6e6; stroke-linecap:round; stroke-linejoin:round;"/></svg>
\ No newline at end of file
diff --git a/resources/images/partskip_retry.svg b/resources/images/partskip_retry.svg
index ff104e9951..0e9189b040 100644
--- a/resources/images/partskip_retry.svg
+++ b/resources/images/partskip_retry.svg
@@ -1,26 +1 @@
-<svg width="200" height="200" viewBox="0 0 200 200" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_1314_965)">
-<path d="M151.1 99.8C151.1 114 145.3 126.8 136 136C126.9 145.1 114.3 150.6 100.4 150.6C86.6002 150.6 74.0002 145 64.8002 136C55.5002 126.8 49.7002 114 49.7002 99.8C49.7002 71.7 72.4002 49 100.4 49C128.4 49 151.1 71.8 151.1 99.8Z" fill="#F7F7F7"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M100.4 50C72.9538 50 50.7002 72.251 50.7002 99.8C50.7002 113.721 56.3845 126.267 65.5017 135.287C74.5247 144.113 86.8764 149.6 100.4 149.6C114.032 149.6 126.378 144.208 135.293 135.293L135.297 135.289C144.415 126.269 150.1 113.722 150.1 99.8C150.1 72.3497 127.845 50 100.4 50ZM48.7002 99.8C48.7002 71.149 71.8466 48 100.4 48C128.955 48 152.1 71.2503 152.1 99.8C152.1 114.278 146.186 127.33 136.705 136.71C127.42 145.993 114.568 151.6 100.4 151.6C86.3251 151.6 73.4777 145.888 64.1009 136.715L64.0969 136.711C54.6151 127.331 48.7002 114.278 48.7002 99.8Z" fill="#DBDBDB"/>
-<path d="M93.3692 54.2109L89.6083 67.4761L98.6108 73.7153L97.9777 88.9569L109.341 68.1032L104.063 63.8865L110.099 54.2109H116.875L137.375 76.5109L138.175 140.911C138.175 143.111 136.375 144.811 134.175 144.811H71.3751C69.175 144.811 67.375 143.011 67.375 140.911V58.111C67.375 55.9109 69.175 54.2109 71.3751 54.2109H93.3692Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M71.3751 55.2109C69.6939 55.2109 68.375 56.496 68.375 58.111V140.911C68.375 142.442 69.7108 143.811 71.3751 143.811H134.175C135.854 143.811 137.172 142.529 137.175 140.917C137.175 140.915 137.175 140.913 137.175 140.911L136.38 76.906L116.436 55.2109H110.654L105.382 63.6607L109.965 67.3219C110.344 67.6247 110.451 68.1558 110.219 68.5817L98.8558 89.4354C98.6334 89.8436 98.1589 90.0447 97.7108 89.9206C97.2627 89.7965 96.9593 89.38 96.9786 88.9154L97.5888 74.2237L89.0387 68.298C88.6874 68.0545 88.5297 67.6146 88.6463 67.2033L92.0463 55.2109H71.3751ZM66.375 58.111C66.375 55.3259 68.6561 53.2109 71.3751 53.2109H93.3692C93.6826 53.2109 93.9779 53.3579 94.1669 53.6079C94.3559 53.858 94.4168 54.1822 94.3313 54.4837L90.7654 67.0613L99.1804 72.8934C99.4621 73.0886 99.6241 73.4144 99.6099 73.7568L99.1551 84.706L108.061 68.3611L103.438 64.6677C103.042 64.351 102.946 63.7877 103.214 63.3572L109.25 53.6816C109.433 53.3889 109.754 53.2109 110.099 53.2109H116.875C117.155 53.2109 117.422 53.3282 117.611 53.5342L138.111 75.8342C138.278 76.0156 138.372 76.2521 138.375 76.4985L139.175 140.911C139.175 143.696 136.894 145.811 134.175 145.811H71.3751C68.6392 145.811 66.375 143.58 66.375 140.911V58.111Z" fill="#DBDBDB"/>
-<path d="M146.7 66.4998C148.964 66.4998 150.8 64.6642 150.8 62.3998C150.8 60.1354 148.964 58.2998 146.7 58.2998C144.435 58.2998 142.6 60.1354 142.6 62.3998C142.6 64.6642 144.435 66.4998 146.7 66.4998Z" fill="#EBEBEB"/>
-<path d="M152.7 50.4999C154.247 50.4999 155.5 49.2463 155.5 47.6999C155.5 46.1535 154.247 44.8999 152.7 44.8999C151.154 44.8999 149.9 46.1535 149.9 47.6999C149.9 49.2463 151.154 50.4999 152.7 50.4999Z" fill="#EBEBEB"/>
-<path d="M51.3 66.3998C52.8464 66.3998 54.1 65.1462 54.1 63.5998C54.1 62.0534 52.8464 60.7998 51.3 60.7998C49.7536 60.7998 48.5 62.0534 48.5 63.5998C48.5 65.1462 49.7536 66.3998 51.3 66.3998Z" fill="#EBEBEB"/>
-<path d="M34.2 120.4C37.0719 120.4 39.4 118.072 39.4 115.2C39.4 112.328 37.0719 110 34.2 110C31.3281 110 29 112.328 29 115.2C29 118.072 31.3281 120.4 34.2 120.4Z" fill="#EBEBEB"/>
-<path d="M89.2291 67.7108H77.1291C76.4291 67.7108 75.8291 67.1108 75.8291 66.4108C75.8291 65.7108 76.4291 65.1108 77.1291 65.1108H89.2291C89.9291 65.1108 90.5291 65.7108 90.5291 66.4108C90.5291 67.1108 89.9291 67.7108 89.2291 67.7108Z" fill="#DBDBDB"/>
-<path d="M88.7291 74.911H77.1291C76.4291 74.911 75.8291 74.311 75.8291 73.611C75.8291 72.911 76.4291 72.311 77.1291 72.311H88.6291C89.3291 72.311 89.9291 72.911 89.9291 73.611C89.9291 74.311 89.3291 74.911 88.7291 74.911Z" fill="#DBDBDB"/>
-<path d="M116.029 54.2109V72.0109C116.029 74.5109 118.229 76.5109 120.729 76.5109H136.529" fill="#DBDBDB"/>
-<path d="M89.9799 48.2657L86.1982 42.5732" stroke="#C2C2C2" stroke-width="2"/>
-<path d="M100.065 45.4195L100.51 31" stroke="#C2C2C2" stroke-width="2"/>
-<path d="M109.107 48.4L115.144 35.2974" stroke="#C2C2C2" stroke-width="2"/>
-<path d="M88.5713 120.379C88.1513 120.379 87.8152 120.211 87.4792 119.959C86.8911 119.371 86.8911 118.363 87.4792 117.775C91.3437 113.994 96.4685 111.894 101.929 111.894C107.39 111.894 112.515 113.994 116.38 117.775C116.968 118.363 116.968 119.371 116.38 119.959C115.791 120.547 114.783 120.547 114.195 119.959C110.919 116.682 106.55 114.918 101.929 114.918C97.3086 114.918 92.94 116.682 89.6635 119.959C89.3274 120.211 88.9914 120.379 88.5713 120.379Z" fill="#C2C2C2"/>
-<path d="M93.8641 97.8636L95.8804 95.8473C96.4685 95.2592 96.4685 94.2511 95.8804 93.663C95.2923 93.0749 94.2842 93.0749 93.6961 93.663L91.6798 95.6793L89.6635 93.663C89.0754 93.0749 88.0672 93.0749 87.4792 93.663C86.8911 94.2511 86.8911 95.2592 87.4792 95.8473L89.4955 97.8636L87.4792 99.8799C86.8911 100.468 86.8911 101.476 87.4792 102.064C87.8152 102.4 88.1513 102.484 88.5713 102.484C88.9914 102.484 89.3274 102.316 89.6635 102.064L91.6798 100.048L93.6961 102.064C94.0322 102.4 94.3682 102.484 94.7883 102.484C95.2083 102.484 95.5444 102.316 95.8804 102.064C96.4685 101.476 96.4685 100.468 95.8804 99.8799L93.8641 97.8636Z" fill="#C2C2C2"/>
-<path d="M114.279 97.8636L116.295 95.8473C116.884 95.2592 116.884 94.2511 116.295 93.663C115.707 93.0749 114.699 93.0749 114.111 93.663L112.095 95.6793L110.079 93.663C109.49 93.0749 108.482 93.0749 107.894 93.663C107.306 94.2511 107.306 95.2592 107.894 95.8473L109.91 97.8636L107.894 99.8799C107.306 100.468 107.306 101.476 107.894 102.064C108.23 102.4 108.566 102.484 108.986 102.484C109.406 102.484 109.742 102.316 110.079 102.064L112.095 100.048L114.111 102.064C114.447 102.4 114.783 102.484 115.203 102.484C115.623 102.484 115.959 102.316 116.295 102.064C116.884 101.476 116.884 100.468 116.295 99.8799L114.279 97.8636Z" fill="#C2C2C2"/>
-</g>
-<defs>
-<clipPath id="clip0_1314_965">
-<rect width="200" height="160" fill="white" transform="translate(0 20)"/>
-</clipPath>
-</defs>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" width="200" height="200" viewBox="0 0 200 200"><path d="M143,77.38v17.67h-17.67M140.32,93.38c-5.9-13.06-18.02-23.01-33.22-25.5-20.15-3.3-39.35,7.57-47.43,25.29" style="fill:none; stroke:#949494; stroke-linecap:round; stroke-linejoin:round; stroke-width:5px;"/><path d="M123,47.23c.88,0,1.71-.17,2.48-.48.15.56.24,1.15.24,1.76,0,3.71-3.01,6.72-6.72,6.72s-6.72-3.01-6.72-6.72c0-2.83,1.76-5.25,4.24-6.24.77,2.86,3.38,4.97,6.48,4.97Z" style="fill:#949494;"/><path d="M77,47.23c-.88,0-1.71-.17-2.48-.48-.15.56-.24,1.15-.24,1.76,0,3.71,3.01,6.72,6.72,6.72,3.71,0,6.72-3.01,6.72-6.72,0-2.83-1.76-5.25-4.24-6.24-.77,2.86-3.38,4.97-6.48,4.97Z" style="fill:#949494;"/><path d="M46,152h108M71,123h0c0-6.63-5.37-12-12-12h0c-6.63,0-12,5.37-12,12h0c0,6.63,5.37,12,12,12h0c6.63,0,12-5.37,12-12ZM153,123h0c0-6.63-5.37-12-12-12h0c-6.63,0-12,5.37-12,12h0c0,6.63,5.37,12,12,12h0c6.63,0,12-5.37,12-12ZM89.5,112.5l21,21M110.5,112.5l-21,21" style="fill:none; stroke:#949494; stroke-linecap:round; stroke-linejoin:round; stroke-width:5px;"/></svg>
\ No newline at end of file
diff --git a/resources/images/print_control_partskip.svg b/resources/images/print_control_partskip.svg
index 21fe0bd031..8aa601b718 100644
--- a/resources/images/print_control_partskip.svg
+++ b/resources/images/print_control_partskip.svg
@@ -1,4 +1 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M7.25 16H4.75V18.5H7.25V16ZM4.75 15C4.48478 15 4.23043 15.1054 4.04289 15.2929C3.85536 15.4804 3.75 15.7348 3.75 16V18.5C3.75 18.7652 3.85536 19.0196 4.04289 19.2071C4.23043 19.3946 4.48478 19.5 4.75 19.5H7.25C7.51522 19.5 7.76957 19.3946 7.95711 19.2071C8.14464 19.0196 8.25 18.7652 8.25 18.5V16C8.25 15.7348 8.14464 15.4804 7.95711 15.2929C7.76957 15.1054 7.51522 15 7.25 15H4.75ZM13.25 16H10.75V18.5H13.25V16ZM10.75 15C10.4848 15 10.2304 15.1054 10.0429 15.2929C9.85536 15.4804 9.75 15.7348 9.75 16V18.5C9.75 18.7652 9.85536 19.0196 10.0429 19.2071C10.2304 19.3946 10.4848 19.5 10.75 19.5H13.25C13.5152 19.5 13.7696 19.3946 13.9571 19.2071C14.1446 19.0196 14.25 18.7652 14.25 18.5V16C14.25 15.7348 14.1446 15.4804 13.9571 15.2929C13.7696 15.1054 13.5152 15 13.25 15H10.75ZM19.25 16H16.75V18.5H19.25V16ZM16.75 15C16.4848 15 16.2304 15.1054 16.0429 15.2929C15.8554 15.4804 15.75 15.7348 15.75 16V18.5C15.75 18.7652 15.8554 19.0196 16.0429 19.2071C16.2304 19.3946 16.4848 19.5 16.75 19.5H19.25C19.5152 19.5 19.7696 19.3946 19.9571 19.2071C20.1446 19.0196 20.25 18.7652 20.25 18.5V16C20.25 15.7348 20.1446 15.4804 19.9571 15.2929C19.7696 15.1054 19.5152 15 19.25 15H16.75ZM6.367 8.244C5.181 9.537 4.559 11.069 4.499 12.047C4.48654 12.2458 4.39562 12.4315 4.24624 12.5632C4.09687 12.695 3.90128 12.762 3.7025 12.7495C3.50372 12.737 3.31803 12.6461 3.18629 12.4967C3.05455 12.3474 2.98754 12.1518 3 11.953C3.087 10.563 3.894 8.719 5.26 7.23C6.646 5.72 8.673 4.5 11.25 4.5C13.823 4.5 15.886 5.717 17.29 7.226C18.671 8.71 19.5 10.572 19.5 12H18C18 11.06 17.4 9.546 16.192 8.248C15.007 6.974 13.32 6 11.25 6C9.184 6 7.535 6.97 6.367 8.244Z" fill="#262E30"/>
-<path d="M20.25 12H14.25L20.25 6V12Z" fill="#262E30"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path d="M14.5,2.96v2.54h-2.54" style="fill:none; stroke:#949494; stroke-linecap:round; stroke-linejoin:round;"/><rect x=".5" y="8.5" width="3" height="3" rx="1.5" ry="1.5" style="fill:none; stroke:#949494; stroke-linecap:round; stroke-linejoin:round;"/><rect x="12.5" y="8.5" width="3" height="3" rx="1.5" ry="1.5" style="fill:none; stroke:#949494; stroke-linecap:round; stroke-linejoin:round;"/><path d="M6.5,8.5l3,3M9.5,8.5l-3,3" style="fill:none; stroke:#949494; stroke-linecap:round; stroke-linejoin:round;"/><line x1=".5" y1="14.5" x2="15.5" y2="14.5" style="fill:none; stroke:#949494; stroke-linecap:round; stroke-linejoin:round;"/><path d="M14.14,5.5c-.9-2-2.76-3.53-5.09-3.91-3.09-.51-6.03,1.16-7.27,3.88" style="fill:none; stroke:#949494; stroke-linecap:round; stroke-linejoin:round;"/></svg>
\ No newline at end of file
diff --git a/resources/images/print_control_partskip_disable.svg b/resources/images/print_control_partskip_disable.svg
index 79d8a90432..dadad8b4a4 100644
--- a/resources/images/print_control_partskip_disable.svg
+++ b/resources/images/print_control_partskip_disable.svg
@@ -1,4 +1 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M7.25001 16H4.75001V18.5H7.25001V16ZM4.75001 15C4.48479 15 4.23044 15.1054 4.0429 15.2929C3.85537 15.4804 3.75001 15.7348 3.75001 16V18.5C3.75001 18.7652 3.85537 19.0196 4.0429 19.2071C4.23044 19.3946 4.48479 19.5 4.75001 19.5H7.25001C7.51522 19.5 7.76958 19.3946 7.95712 19.2071C8.14465 19.0196 8.25001 18.7652 8.25001 18.5V16C8.25001 15.7348 8.14465 15.4804 7.95712 15.2929C7.76958 15.1054 7.51522 15 7.25001 15H4.75001ZM13.25 16H10.75V18.5H13.25V16ZM10.75 15C10.4848 15 10.2304 15.1054 10.0429 15.2929C9.85537 15.4804 9.75001 15.7348 9.75001 16V18.5C9.75001 18.7652 9.85537 19.0196 10.0429 19.2071C10.2304 19.3946 10.4848 19.5 10.75 19.5H13.25C13.5152 19.5 13.7696 19.3946 13.9571 19.2071C14.1447 19.0196 14.25 18.7652 14.25 18.5V16C14.25 15.7348 14.1447 15.4804 13.9571 15.2929C13.7696 15.1054 13.5152 15 13.25 15H10.75ZM19.25 16H16.75V18.5H19.25V16ZM16.75 15C16.4848 15 16.2304 15.1054 16.0429 15.2929C15.8554 15.4804 15.75 15.7348 15.75 16V18.5C15.75 18.7652 15.8554 19.0196 16.0429 19.2071C16.2304 19.3946 16.4848 19.5 16.75 19.5H19.25C19.5152 19.5 19.7696 19.3946 19.9571 19.2071C20.1447 19.0196 20.25 18.7652 20.25 18.5V16C20.25 15.7348 20.1447 15.4804 19.9571 15.2929C19.7696 15.1054 19.5152 15 19.25 15H16.75ZM6.36701 8.244C5.18101 9.537 4.55901 11.069 4.49901 12.047C4.48654 12.2458 4.39562 12.4315 4.24625 12.5632C4.09688 12.695 3.90129 12.762 3.70251 12.7495C3.50373 12.737 3.31804 12.6461 3.1863 12.4967C3.05455 12.3474 2.98754 12.1518 3.00001 11.953C3.08701 10.563 3.89401 8.719 5.26001 7.23C6.64601 5.72 8.67301 4.5 11.25 4.5C13.823 4.5 15.886 5.717 17.29 7.226C18.671 8.71 19.5 10.572 19.5 12H18C18 11.06 17.4 9.546 16.192 8.248C15.007 6.974 13.32 6 11.25 6C9.18401 6 7.53501 6.97 6.36701 8.244Z" fill="#ACACAC"/>
-<path d="M20.25 12H14.25L20.25 6V12Z" fill="#ACACAC"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path d="M14.5,2.96v2.54h-2.54M3.5,10h0c0-.83-.67-1.5-1.5-1.5h0c-.83,0-1.5.67-1.5,1.5h0c0,.83.67,1.5,1.5,1.5h0c.83,0,1.5-.67,1.5-1.5ZM15.5,10h0c0-.83-.67-1.5-1.5-1.5h0c-.83,0-1.5.67-1.5,1.5h0c0,.83.67,1.5,1.5,1.5h0c.83,0,1.5-.67,1.5-1.5ZM6.5,8.5l3,3M9.5,8.5l-3,3M.5,14.5h15M14.14,5.5c-.9-2-2.76-3.53-5.09-3.91-3.09-.51-6.03,1.16-7.27,3.88" style="fill:none; opacity:.5; stroke:#949494; stroke-linecap:round; stroke-linejoin:round;"/></svg>
\ No newline at end of file
diff --git a/resources/images/print_control_partskip_hover.svg b/resources/images/print_control_partskip_hover.svg
index b41ffcc516..abd9f556be 100644
--- a/resources/images/print_control_partskip_hover.svg
+++ b/resources/images/print_control_partskip_hover.svg
@@ -1,4 +1 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M7.47995 16.1333H4.89662V18.7167H7.47995V16.1333ZM4.89662 15.1C4.62256 15.1 4.35973 15.2089 4.16594 15.4027C3.97215 15.5964 3.86328 15.8593 3.86328 16.1333V18.7167C3.86328 18.9907 3.97215 19.2536 4.16594 19.4473C4.35973 19.6411 4.62256 19.75 4.89662 19.75H7.47995C7.75401 19.75 8.01684 19.6411 8.21063 19.4473C8.40441 19.2536 8.51328 18.9907 8.51328 18.7167V16.1333C8.51328 15.8593 8.40441 15.5964 8.21063 15.4027C8.01684 15.2089 7.75401 15.1 7.47995 15.1H4.89662ZM13.68 16.1333H11.0966V18.7167H13.68V16.1333ZM11.0966 15.1C10.8226 15.1 10.5597 15.2089 10.3659 15.4027C10.1722 15.5964 10.0633 15.8593 10.0633 16.1333V18.7167C10.0633 18.9907 10.1722 19.2536 10.3659 19.4473C10.5597 19.6411 10.8226 19.75 11.0966 19.75H13.68C13.954 19.75 14.2168 19.6411 14.4106 19.4473C14.6044 19.2536 14.7133 18.9907 14.7133 18.7167V16.1333C14.7133 15.8593 14.6044 15.5964 14.4106 15.4027C14.2168 15.2089 13.954 15.1 13.68 15.1H11.0966ZM19.88 16.1333H17.2966V18.7167H19.88V16.1333ZM17.2966 15.1C17.0226 15.1 16.7597 15.2089 16.5659 15.4027C16.3722 15.5964 16.2633 15.8593 16.2633 16.1333V18.7167C16.2633 18.9907 16.3722 19.2536 16.5659 19.4473C16.7597 19.6411 17.0226 19.75 17.2966 19.75H19.88C20.154 19.75 20.4168 19.6411 20.6106 19.4473C20.8044 19.2536 20.9133 18.9907 20.9133 18.7167V16.1333C20.9133 15.8593 20.8044 15.5964 20.6106 15.4027C20.4168 15.2089 20.154 15.1 19.88 15.1H17.2966ZM6.56752 8.1188C5.34198 9.4549 4.69925 11.038 4.63725 12.0486C4.62437 12.254 4.53042 12.4458 4.37607 12.582C4.22172 12.7181 4.01961 12.7874 3.8142 12.7745C3.6088 12.7616 3.41692 12.6677 3.28078 12.5133C3.14465 12.3589 3.0754 12.1568 3.08828 11.9514C3.17818 10.5151 4.01208 8.60963 5.42362 7.071C6.85582 5.51067 8.95038 4.25 11.6133 4.25C14.2721 4.25 16.4038 5.50757 17.8546 7.06687C19.2817 8.60033 20.1383 10.5244 20.1383 12H18.5883C18.5883 11.0287 17.9683 9.4642 16.72 8.12293C15.4955 6.80647 13.7523 5.8 11.6133 5.8C9.47842 5.8 7.77445 6.80233 6.56752 8.1188Z" fill="#262E30"/>
-<path d="M20.9133 12H14.7133L20.9133 5.79999V12Z" fill="#262E30"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path d="M14.5,2.96v2.54h-2.54" style="fill:none; stroke:#949494; stroke-linecap:round; stroke-linejoin:round;"/><rect x=".5" y="8.5" width="3" height="3" rx="1.5" ry="1.5" style="fill:none; stroke:#949494; stroke-linecap:round; stroke-linejoin:round;"/><rect x="12.5" y="8.5" width="3" height="3" rx="1.5" ry="1.5" style="fill:none; stroke:#949494; stroke-linecap:round; stroke-linejoin:round;"/><path d="M6.5,8.5l3,3M9.5,8.5l-3,3" style="fill:none; stroke:#ed1c24; stroke-linecap:round; stroke-linejoin:round;"/><line x1=".5" y1="14.5" x2="15.5" y2="14.5" style="fill:none; stroke:#949494; stroke-linecap:round; stroke-linejoin:round;"/><path d="M14.14,5.5c-.9-2-2.76-3.53-5.09-3.91-3.09-.51-6.03,1.16-7.27,3.88" style="fill:none; stroke:#949494; stroke-linecap:round; stroke-linejoin:round;"/></svg>
\ No newline at end of file
diff --git a/resources/images/print_control_pause.svg b/resources/images/print_control_pause.svg
index 0cb5abaf1b..8cc8bd3d94 100644
--- a/resources/images/print_control_pause.svg
+++ b/resources/images/print_control_pause.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 14 14"><rect x="2" y="1" width="3" height="12" rx="1" style="fill:#949494"/><rect x="9" y="1" width="3" height="12" rx="1" style="fill:#949494"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><rect x="1" y="1" width="5" height="14" rx="2" ry="2" style="fill:#949494;"/><rect x="10" y="1" width="5" height="14" rx="2" ry="2" style="fill:#949494;"/></svg>
\ No newline at end of file
diff --git a/resources/images/print_control_pause_disable.svg b/resources/images/print_control_pause_disable.svg
index 57b454fdeb..d33bedbc6b 100644
--- a/resources/images/print_control_pause_disable.svg
+++ b/resources/images/print_control_pause_disable.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 14 14"><rect x="2" y="1" width="3" height="12" rx="1" style="fill:#949494;opacity:0.5"/><rect x="9" y="1" width="3" height="12" rx="1" style="fill:#949494;opacity:0.5"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><rect x="1" y="1" width="5" height="14" rx="2" ry="2" style="fill:#949494; opacity:.5;"/><rect x="10" y="1" width="5" height="14" rx="2" ry="2" style="fill:#949494; opacity:.5;"/></svg>
\ No newline at end of file
diff --git a/resources/images/print_control_pause_hover.svg b/resources/images/print_control_pause_hover.svg
index 12e35f3216..95e7582ebb 100644
--- a/resources/images/print_control_pause_hover.svg
+++ b/resources/images/print_control_pause_hover.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 14 14"><rect x="2" y="1" width="3" height="12" rx="1" style="fill:#ff6f00"/><rect x="9" y="1" width="3" height="12" rx="1" style="fill:#ff6f00"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><rect x="1" y="1" width="5" height="14" rx="2" ry="2" style="fill:#ff6f00;"/><rect x="10" y="1" width="5" height="14" rx="2" ry="2" style="fill:#ff6f00;"/></svg>
\ No newline at end of file
diff --git a/resources/images/print_control_resume.svg b/resources/images/print_control_resume.svg
index 09694a7b5c..1c63639437 100644
--- a/resources/images/print_control_resume.svg
+++ b/resources/images/print_control_resume.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 14 14"><path d="M2,12.059V1.941c0-.7.613-1.153,1.134-.841l8.433,5.059a1.034,1.034,0,0,1,0,1.682L3.134,12.9C2.613,13.212,2,12.758,2,12.059Z" style="fill:#949494"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path d="M12.58,9.73l-8.57,5c-1.33.78-3.01-.18-3.01-1.73V3c0-1.54,1.67-2.51,3.01-1.73l8.57,5c1.32.77,1.32,2.68,0,3.45Z" style="fill:#949494;"/></svg>
\ No newline at end of file
diff --git a/resources/images/print_control_resume_disable.svg b/resources/images/print_control_resume_disable.svg
index 478dc3e2e4..1e7abe1487 100644
--- a/resources/images/print_control_resume_disable.svg
+++ b/resources/images/print_control_resume_disable.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 14 14"><path d="M2,12.059V1.941c0-.7.613-1.153,1.134-.841l8.433,5.059a1.034,1.034,0,0,1,0,1.682L3.134,12.9C2.613,13.212,2,12.758,2,12.059Z" style="fill:#949494;opacity:0.5"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path d="M12.58,9.73l-8.57,5c-1.33.78-3.01-.18-3.01-1.73V3c0-1.54,1.67-2.51,3.01-1.73l8.57,5c1.32.77,1.32,2.68,0,3.45Z" style="fill:#949494; opacity:.5;"/></svg>
\ No newline at end of file
diff --git a/resources/images/print_control_resume_hover.svg b/resources/images/print_control_resume_hover.svg
index bffdd4fe2d..d1e9f5f5e6 100644
--- a/resources/images/print_control_resume_hover.svg
+++ b/resources/images/print_control_resume_hover.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 14 14"><path d="M2,12.059V1.941c0-.7.613-1.153,1.134-.841l8.433,5.059a1.034,1.034,0,0,1,0,1.682L3.134,12.9C2.613,13.212,2,12.758,2,12.059Z" style="fill:#009688"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path d="M12.58,9.73l-8.57,5c-1.33.78-3.01-.18-3.01-1.73V3c0-1.54,1.67-2.51,3.01-1.73l8.57,5c1.32.77,1.32,2.68,0,3.45Z" style="fill:#009688;"/></svg>
\ No newline at end of file
diff --git a/resources/images/print_control_stop.svg b/resources/images/print_control_stop.svg
index b8c8d36910..c2040a7ccb 100644
--- a/resources/images/print_control_stop.svg
+++ b/resources/images/print_control_stop.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 14 14"><rect x="1" y="1" width="12" height="12" rx="1" style="fill:#949494"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><rect x="1" y="1" width="14" height="14" rx="2" ry="2" style="fill:#949494;"/></svg>
\ No newline at end of file
diff --git a/resources/images/print_control_stop_disable.svg b/resources/images/print_control_stop_disable.svg
index 0f05d885d0..9ae55364ab 100644
--- a/resources/images/print_control_stop_disable.svg
+++ b/resources/images/print_control_stop_disable.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 14 14"><rect x="1" y="1" width="12" height="12" rx="1" style="fill:#949494;opacity:0.5"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><rect x="1" y="1" width="14" height="14" rx="2" ry="2" style="fill:#949494; opacity:.5;"/></svg>
\ No newline at end of file
diff --git a/resources/images/print_control_stop_hover.svg b/resources/images/print_control_stop_hover.svg
index 4136c759bf..69dc395c14 100644
--- a/resources/images/print_control_stop_hover.svg
+++ b/resources/images/print_control_stop_hover.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 14 14"><rect x="1" y="1" width="12" height="12" rx="1" style="fill:#ed1c24"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><rect x="1" y="1" width="14" height="14" rx="2" ry="2" style="fill:#ed1c24;"/></svg>
\ No newline at end of file
diff --git a/resources/web/flush/WipingDialog.html b/resources/web/flush/WipingDialog.html
index 249ee03449..ea392b6a4f 100644
--- a/resources/web/flush/WipingDialog.html
+++ b/resources/web/flush/WipingDialog.html
@@ -3,6 +3,10 @@
   <head>
     <meta charset="UTF-8" />
     <style>
+      * {
+        user-select: none;
+      }
+
         html, body {
           margin: 0px;
           padding: 0px;
diff --git a/resources/web/model/model.css b/resources/web/model/model.css
index e3cd4d7a51..46c9903b9d 100644
--- a/resources/web/model/model.css
+++ b/resources/web/model/model.css
@@ -14,7 +14,7 @@ html
 
 body
 {
-	min-width: 1280px;
+	/* min-width: 1280px; ORCA fixes scrollbar appear on welcome screen */
 	height: 100%;
 	display:flex;
 	flex-direction: column;
@@ -28,7 +28,7 @@ body
 
 #EmptyArea
 {
-	min-width: 1280px;
+	/* min-width: 1280px; ORCA fixes scrollbar appear on welcome screen */
 	display: flex;
 	flex-direction: column;
 	align-items: center;
@@ -39,6 +39,7 @@ body
 
 #WholeArea
 {
+	min-width: 1280px; /* ORCA fix scrollbar appears on welcome screen */
 	height:  100%;
 	position: relative;
 	overflow-y: hidden;
diff --git a/src/slic3r/GUI/CalibrationPanel.cpp b/src/slic3r/GUI/CalibrationPanel.cpp
index 12162615aa..76c545f912 100644
--- a/src/slic3r/GUI/CalibrationPanel.cpp
+++ b/src/slic3r/GUI/CalibrationPanel.cpp
@@ -475,7 +475,7 @@ void CalibrationPanel::init_tabpanel() {
 
     m_tabpanel = new Tabbook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, sizer_side_tools, wxNB_LEFT | wxTAB_TRAVERSAL | wxNB_NOPAGETHEME);
     m_side_tools->set_table_panel(m_tabpanel);
-    m_tabpanel->SetBackgroundColour(*wxWHITE);
+    m_tabpanel->SetBackgroundColour(wxColour("#FEFFFF")); // ORCA match sidebar background color
 
     m_cali_panels[0] = new PressureAdvanceWizard(m_tabpanel);
     m_cali_panels[1] = new FlowRateWizard(m_tabpanel);
@@ -491,11 +491,12 @@ void CalibrationPanel::init_tabpanel() {
             selected);
     }
 
-    for (int i = 0; i < (int)CALI_MODE_COUNT; i++)
-        m_tabpanel->SetPageImage(i, "");
+    // ORCA use standard paddings and keep arrow icon for consistent look between sidebars
+    //for (int i = 0; i < (int)CALI_MODE_COUNT; i++)
+    //    m_tabpanel->SetPageImage(i, "");
 
-    auto padding_size = m_tabpanel->GetBtnsListCtrl()->GetPaddingSize(0);
-    m_tabpanel->GetBtnsListCtrl()->SetPaddingSize({ FromDIP(15), padding_size.y });
+    //auto padding_size = m_tabpanel->GetBtnsListCtrl()->GetPaddingSize(0);
+    //m_tabpanel->GetBtnsListCtrl()->SetPaddingSize({ FromDIP(15), padding_size.y });
 
     m_initialized = true;
 }
diff --git a/src/slic3r/GUI/CloneDialog.cpp b/src/slic3r/GUI/CloneDialog.cpp
index e6f2a61b9e..1ee3a74341 100644
--- a/src/slic3r/GUI/CloneDialog.cpp
+++ b/src/slic3r/GUI/CloneDialog.cpp
@@ -21,6 +21,11 @@ CloneDialog::CloneDialog(wxWindow *parent)
     auto count_label = new wxStaticText(this, wxID_ANY, _L("Number of copies:"), wxDefaultPosition, wxDefaultSize, 0);
     m_count_spin = new SpinInput(this, wxEmptyString, "", wxDefaultPosition, wxSize(FromDIP(120), -1), wxSP_ARROW_KEYS, 1, 1000, 1);
     m_count_spin->GetTextCtrl()->SetFocus();
+    m_count_spin->Bind(wxEVT_KILL_FOCUS, [this](wxFocusEvent &e) {
+        e.SetId(GetId());
+        ProcessEventLocally(e);
+        e.Skip();
+    });
     f_sizer->Add(count_label  , 0, wxEXPAND | wxALIGN_CENTER_VERTICAL);
     f_sizer->Add(m_count_spin, 0, wxALIGN_CENTER_VERTICAL);
 
diff --git a/src/slic3r/GUI/DailyTips.cpp b/src/slic3r/GUI/DailyTips.cpp
index 5630b2474a..d8823ebd31 100644
--- a/src/slic3r/GUI/DailyTips.cpp
+++ b/src/slic3r/GUI/DailyTips.cpp
@@ -213,7 +213,7 @@ void DailyTipsDataRenderer::render_text(const ImVec2& start_pos, const ImVec2& s
         ImVec2 link_start_pos = ImGui::GetCursorScreenPos();
         imgui.text(first_part_text);
 
-        ImColor HyperColor = ImColor(31, 142, 234, (int)(255 * m_fade_opacity)).Value;
+        ImColor HyperColor = ImColor(0, 150, 136, (int)(255 * m_fade_opacity)).Value; // ORCA match color of hyperlinks
         ImVec2 wiki_part_rect_min = ImVec2(link_start_pos.x + first_part_size.x, link_start_pos.y);
         ImVec2 wiki_part_rect_max = wiki_part_rect_min + wiki_part_size;
         ImGui::PushStyleColor(ImGuiCol_Text, HyperColor.Value);
diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp
index fe9b60ea93..61d41525cc 100644
--- a/src/slic3r/GUI/GLCanvas3D.cpp
+++ b/src/slic3r/GUI/GLCanvas3D.cpp
@@ -2166,7 +2166,7 @@ void GLCanvas3D::render(bool only_init)
     if (m_canvas_type != ECanvasType::CanvasAssembleView) {
         float right_margin = SLIDER_DEFAULT_RIGHT_MARGIN;
         float bottom_margin = SLIDER_DEFAULT_BOTTOM_MARGIN;
-        if (m_canvas_type == ECanvasType::CanvasPreview) {
+        if (m_canvas_type == ECanvasType::CanvasPreview && m_gcode_viewer.has_data()) { // ORCA only shift position of notifiations when sliders / gcode_viewer exist
             float scale_factor = get_scale();
 #ifdef WIN32
             int dpi = get_dpi_for_window(wxGetApp().GetTopWindow());
diff --git a/src/slic3r/GUI/MultiMachineManagerPage.cpp b/src/slic3r/GUI/MultiMachineManagerPage.cpp
index 5b0ca791b7..d6531cc8d4 100644
--- a/src/slic3r/GUI/MultiMachineManagerPage.cpp
+++ b/src/slic3r/GUI/MultiMachineManagerPage.cpp
@@ -494,7 +494,7 @@ MultiMachineManagerPage::MultiMachineManagerPage(wxWindow* parent)
     m_main_panel->SetSizer(m_main_sizer);
     m_main_panel->Layout();
     page_sizer = new wxBoxSizer(wxVERTICAL);
-    page_sizer->Add(m_main_panel, 1, wxALL | wxEXPAND, FromDIP(25));
+    page_sizer->Add(m_main_panel, 1, wxALL | wxEXPAND, FromDIP(10)); // ORCA match margin with other tabs
 
     SetSizer(page_sizer);
     Layout();
diff --git a/src/slic3r/GUI/MultiTaskManagerPage.cpp b/src/slic3r/GUI/MultiTaskManagerPage.cpp
index 0b0b422eb4..bca2de8761 100644
--- a/src/slic3r/GUI/MultiTaskManagerPage.cpp
+++ b/src/slic3r/GUI/MultiTaskManagerPage.cpp
@@ -718,7 +718,7 @@ LocalTaskManagerPage::LocalTaskManagerPage(wxWindow* parent)
     m_main_panel->Layout();
 
     page_sizer = new wxBoxSizer(wxVERTICAL);
-    page_sizer->Add(m_main_panel, 1, wxALL | wxEXPAND, FromDIP(25));
+    page_sizer->Add(m_main_panel, 1, wxALL | wxEXPAND, FromDIP(10)); // ORCA match margin with other tabs
 
     wxGetApp().UpdateDarkUIWin(this);
 
@@ -1184,7 +1184,7 @@ CloudTaskManagerPage::CloudTaskManagerPage(wxWindow* parent)
     m_main_panel->Layout();
 
     page_sizer = new wxBoxSizer(wxVERTICAL);
-    page_sizer->Add(m_main_panel, 1, wxALL | wxEXPAND, FromDIP(25));
+    page_sizer->Add(m_main_panel, 1, wxALL | wxEXPAND, FromDIP(10)); // ORCA match margin with other tabs
     Bind(wxEVT_TIMER, &CloudTaskManagerPage::on_timer, this);
 
     wxGetApp().UpdateDarkUIWin(this);
diff --git a/src/slic3r/GUI/ParamsPanel.cpp b/src/slic3r/GUI/ParamsPanel.cpp
index fb625a7724..a7f371a9a8 100644
--- a/src/slic3r/GUI/ParamsPanel.cpp
+++ b/src/slic3r/GUI/ParamsPanel.cpp
@@ -261,6 +261,7 @@ ParamsPanel::ParamsPanel( wxWindow* parent, wxWindowID id, const wxPoint& pos, c
 
         m_mode_icon = new ScalableButton(m_top_panel, wxID_ANY, "advanced"); // ORCA
         m_mode_icon->Bind(wxEVT_BUTTON, [this](wxCommandEvent e) {
+            if(wxGetApp().get_mode() == comDevelop) return; // prevent change on dev mode
             m_mode_view->SetValue(!m_mode_view->GetValue());
             wxCommandEvent evt(wxEVT_TOGGLEBUTTON, m_mode_view->GetId()); // ParamsPanel::OnToggled(evt)
             evt.SetEventObject(m_mode_view);
diff --git a/src/slic3r/GUI/PartSkipDialog.cpp b/src/slic3r/GUI/PartSkipDialog.cpp
index fd935f9eb8..051bb9b29c 100644
--- a/src/slic3r/GUI/PartSkipDialog.cpp
+++ b/src/slic3r/GUI/PartSkipDialog.cpp
@@ -50,18 +50,6 @@ static StateColor zoom_bg(std::pair<wxColour, int>(wxColour(255, 255, 255), Stat
 static StateColor zoom_bd(std::pair<wxColour, int>(wxColour(144, 144, 144), StateColor::Disabled), std::pair<wxColour, int>(wxColour(38, 46, 48), StateColor::Enabled));
 static StateColor zoom_text(std::pair<wxColour, int>(wxColour(144, 144, 144), StateColor::Disabled), std::pair<wxColour, int>(wxColour(38, 46, 48), StateColor::Enabled));
 
-static StateColor btn_bg_white(std::pair<wxColour, int>(wxColour(206, 206, 206), StateColor::Pressed),
-                               std::pair<wxColour, int>(wxColour(238, 238, 238), StateColor::Hovered),
-                               std::pair<wxColour, int>(*wxWHITE, StateColor::Normal));
-
-static StateColor btn_bg_gray(std::pair<wxColour, int>(wxColour(194, 194, 194), StateColor::Pressed),
-                              std::pair<wxColour, int>(wxColour(194, 194, 194), StateColor::Hovered),
-                              std::pair<wxColour, int>(wxColour(194, 194, 194), StateColor::Normal));
-
-static StateColor btn_bg_green(std::pair<wxColour, int>(wxColour(0, 137, 123), StateColor::Pressed),
-                               std::pair<wxColour, int>(wxColour(38, 166, 154), StateColor::Hovered),
-                               std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal));
-
 PartSkipDialog::PartSkipDialog(wxWindow *parent) : DPIDialog(parent, wxID_ANY, _L("Skip Objects"), wxDefaultPosition, wxDefaultSize, wxCAPTION | wxCLOSE_BOX)
 {
     std::time_t       t = std::time(0);
@@ -69,8 +57,6 @@ PartSkipDialog::PartSkipDialog(wxWindow *parent) : DPIDialog(parent, wxID_ANY, _
     buf << put_time(std::localtime(&t), "%a_%b_%d_%H_%M_%S/");
     m_timestamp = buf.str();
 
-    std::string icon_path = (boost::format("%1%/images/OrcaSlicerTitle.ico") % Slic3r::resources_dir()).str();
-    SetIcon(wxIcon(Slic3r::encode_path(icon_path.c_str()), wxBITMAP_TYPE_ICO));
     SetBackgroundColour(*wxWHITE);
 
     m_sizer = new wxBoxSizer(wxVERTICAL);
@@ -187,13 +173,7 @@ PartSkipDialog::PartSkipDialog(wxWindow *parent) : DPIDialog(parent, wxID_ANY, _
     m_tot_label->SetMinSize(wxSize(FromDIP(200), FromDIP(20)));
 
     m_apply_btn = new Button(m_book_third_panel, _L("Skip"));
-    m_apply_btn->SetBackgroundColor(btn_bg_gray);
-    m_apply_btn->SetTextColor(wxColour("#FFFFFE"));
-    // m_apply_btn->SetBorderColor(wxColour(38, 46, 48));
-    m_apply_btn->SetFont(Label::Body_14);
-    m_apply_btn->SetSize(wxSize(FromDIP(80), FromDIP(32)));
-    m_apply_btn->SetMinSize(wxSize(FromDIP(80), FromDIP(32)));
-    m_apply_btn->SetCornerRadius(FromDIP(16));
+    m_apply_btn->SetStyle(ButtonStyle::Regular, ButtonType::Choice);
     m_apply_btn->SetToolTip(wxEmptyString);
 
     m_canvas_sizer->Add(m_canvas, 0, wxLEFT | wxTOP | wxEXPAND, FromDIP(17));
@@ -251,13 +231,7 @@ PartSkipDialog::PartSkipDialog(wxWindow *parent) : DPIDialog(parent, wxID_ANY, _
     m_book_second_sizer->Add(0, 0, 1, wxEXPAND, 0);
 
     m_second_retry_btn = new Button(m_book_second_panel, _L("Retry"));
-    m_second_retry_btn->SetBackgroundColor(btn_bg_green);
-    // m_second_retry_btn->SetBorderColor(wxColour(38, 46, 48));
-    m_second_retry_btn->SetTextColor(*wxWHITE);
-    m_second_retry_btn->SetFont(Label::Body_14);
-    m_second_retry_btn->SetSize(wxSize(FromDIP(80), FromDIP(32)));
-    m_second_retry_btn->SetMinSize(wxSize(FromDIP(80), FromDIP(32)));
-    m_second_retry_btn->SetCornerRadius(FromDIP(16));
+    m_second_retry_btn->SetStyle(ButtonStyle::Confirm, ButtonType::Choice);
     m_second_retry_btn->Bind(wxEVT_BUTTON, &PartSkipDialog::OnRetryButton, this);
     m_book_second_btn_sizer->Add(m_second_retry_btn, 0, wxALL, FromDIP(24));
 
@@ -343,17 +317,12 @@ void PartSkipDialog::on_dpi_changed(const wxRect &suggested_rect)
     m_line->SetMinSize(wxSize(FromDIP(267), 1));
     m_line->SetMaxSize(wxSize(FromDIP(267), 1));
 
-    m_apply_btn->SetMinSize(wxSize(FromDIP(80), FromDIP(32)));
-    m_apply_btn->SetCornerRadius(FromDIP(16));
-    m_apply_btn->Rescale();
+    m_apply_btn->Rescale(); // ORCA no need to set size again with SetStyle
 
     m_dlg_placeholder->SetMinSize(wxSize(-1, FromDIP(15)));
     m_dlg_placeholder->SetMaxSize(wxSize(-1, FromDIP(15)));
 
-    // m_second_retry_btn->SetSize(wxSize(-1, FromDIP(32)));
-    m_second_retry_btn->SetMinSize(wxSize(FromDIP(80), FromDIP(32)));
-    m_second_retry_btn->SetCornerRadius(FromDIP(16));
-    m_second_retry_btn->Rescale();
+    m_second_retry_btn->Rescale(); // ORCA no need to set size again with SetStyle
 
     m_all_checkbox->SetMinSize(wxSize(FromDIP(18), FromDIP(18)));
     m_all_checkbox->Rescale();
@@ -883,19 +852,19 @@ void PartSkipDialog::OnAllCheckbox(wxCommandEvent &event)
 void PartSkipDialog::UpdateApplyButtonStatus()
 {
     if (IsAllCancled()) {
-        m_apply_btn->SetBackgroundColor(btn_bg_gray);
+        m_apply_btn->SetStyle(ButtonStyle::Regular, ButtonType::Choice);
         m_apply_btn->SetToolTip(_L("Nothing selected"));
         m_enable_apply_btn = false;
     } else if (m_parts_state.size() > 64) {
-        m_apply_btn->SetBackgroundColor(btn_bg_gray);
+        m_apply_btn->SetStyle(ButtonStyle::Regular, ButtonType::Choice);
         m_apply_btn->SetToolTip(_L("Over 64 objects in single plate"));
         m_enable_apply_btn = false;
     } else if (!is_model_support_partskip) {
-        m_apply_btn->SetBackgroundColor(btn_bg_gray);
+        m_apply_btn->SetStyle(ButtonStyle::Regular, ButtonType::Choice);
         m_apply_btn->SetToolTip(_L("The current print job cannot be skipped"));
         m_enable_apply_btn = false;
     } else {
-        m_apply_btn->SetBackgroundColor(btn_bg_green);
+        m_apply_btn->SetStyle(ButtonStyle::Confirm, ButtonType::Choice);
         m_apply_btn->SetToolTip(wxEmptyString);
         m_enable_apply_btn = true;
     }
@@ -955,8 +924,6 @@ int PartSkipDialog::GetAllSkippedPartsNum()
 
 PartSkipConfirmDialog::PartSkipConfirmDialog(wxWindow *parent) : DPIDialog(parent, wxID_ANY, _L("Skip Objects"), wxDefaultPosition, wxDefaultSize, wxCAPTION | wxCLOSE_BOX)
 {
-    std::string icon_path = (boost::format("%1%/images/OrcaSlicerTitle.ico") % Slic3r::resources_dir()).str();
-    SetIcon(wxIcon(Slic3r::encode_path(icon_path.c_str()), wxBITMAP_TYPE_ICO));
     SetBackgroundColour(*wxWHITE);
     SetMinSize(wxSize(FromDIP(480), FromDIP(215)));
     SetSizeHints(wxDefaultSize, wxDefaultSize);
@@ -989,20 +956,8 @@ PartSkipConfirmDialog::PartSkipConfirmDialog(wxWindow *parent) : DPIDialog(paren
     m_button_sizer->SetMinSize(wxSize(FromDIP(480), FromDIP(54)));
     m_button_sizer->Add(0, 0, 1, wxEXPAND, 0);
 
-    StateColor btn_bg_white(std::pair<wxColour, int>(wxColour(206, 206, 206), StateColor::Pressed), std::pair<wxColour, int>(wxColour(238, 238, 238), StateColor::Hovered),
-                            std::pair<wxColour, int>(*wxWHITE, StateColor::Normal));
-
-    StateColor btn_bg_green(std::pair<wxColour, int>(wxColour(27, 136, 68), StateColor::Pressed), std::pair<wxColour, int>(wxColour(61, 203, 115), StateColor::Hovered),
-                            std::pair<wxColour, int>(wxColour(0, 177, 66), StateColor::Normal));
-
     m_apply_button = new Button(this, _L("Continue"));
-    m_apply_button->SetBackgroundColor(btn_bg_green);
-    m_apply_button->SetTextColor(*wxWHITE);
-    // m_apply_button->SetBorderColor(wxColour(38, 46, 48));
-    m_apply_button->SetFont(Label::Body_14);
-    m_apply_button->SetSize(wxSize(FromDIP(80), FromDIP(32)));
-    m_apply_button->SetMinSize(wxSize(FromDIP(80), FromDIP(32)));
-    m_apply_button->SetCornerRadius(FromDIP(16));
+    m_apply_button->SetStyle(ButtonStyle::Confirm, ButtonType::Choice);
     m_apply_button->Bind(wxEVT_BUTTON, [this](auto &e) {
         EndModal(wxID_OK);
         e.Skip();
@@ -1033,9 +988,7 @@ bool PartSkipConfirmDialog::Show(bool show)
 
 void PartSkipConfirmDialog::on_dpi_changed(const wxRect &suggested_rect)
 {
-    m_apply_button->SetMinSize(wxSize(FromDIP(80), FromDIP(32)));
-    m_apply_button->SetCornerRadius(FromDIP(16));
-    m_apply_button->Rescale();
+    m_apply_button->Rescale(); // ORCA no need to set size again with SetStyle
     Layout();
     Fit();
 }
diff --git a/src/slic3r/GUI/PhysicalPrinterDialog.cpp b/src/slic3r/GUI/PhysicalPrinterDialog.cpp
index d3c6aa6caf..8134e39cf9 100644
--- a/src/slic3r/GUI/PhysicalPrinterDialog.cpp
+++ b/src/slic3r/GUI/PhysicalPrinterDialog.cpp
@@ -160,7 +160,7 @@ void PhysicalPrinterDialog::build_printhost_settings(ConfigOptionsGroup* m_optgr
             // (printer_agent is coString in config, but we need a dropdown)
             ConfigOptionDef def;
             def.type    = coEnum;
-            def.width   = Field::def_width();
+            def.width   = Field::def_width_wider();
             def.label   = L("Printer Agent");
             def.tooltip = L("Select the network agent implementation for printer communication. "
                             "Available agents are registered at startup.");
@@ -315,7 +315,7 @@ void PhysicalPrinterDialog::build_printhost_settings(ConfigOptionsGroup* m_optgr
         // For bbl printers, we build a fake option to control whether the original device tab should be used
         ConfigOptionDef def;
         def.type     = coBool;
-        def.width    = Field::def_width();
+        def.width    = Field::def_width_wider();
         def.label    = L("View print host webui in Device tab");
         def.tooltip  = L("Replace the BambuLab's device tab with print host webui");
         def.set_default_value(new ConfigOptionBool(false));
diff --git a/src/slic3r/GUI/Preferences.cpp b/src/slic3r/GUI/Preferences.cpp
index c2aedae4dc..d3a45ef116 100644
--- a/src/slic3r/GUI/Preferences.cpp
+++ b/src/slic3r/GUI/Preferences.cpp
@@ -1328,11 +1328,17 @@ void PreferencesDialog::create_items()
     auto item_auto_arrange     = create_item_checkbox(_L("Auto arrange plate after cloning"), "", "auto_arrange");
     g_sizer->Add(item_auto_arrange);
 
+    //// CONTROL > Slicing
+    g_sizer->Add(create_item_title(_L("Slicing")), 1, wxEXPAND);
+
     auto item_auto_reslice = create_item_auto_reslice(
         _L("Auto slice after changes"),
         _L("If enabled, OrcaSlicer will re-slice automatically whenever slicing-related settings change."),
         _L("Delay in seconds before auto slicing starts, allowing multiple edits to be grouped. Use 0 to slice immediately."));
     g_sizer->Add(item_auto_reslice);
+
+    auto item_mix_print_high_low_temperature = create_item_checkbox(_L("Remove mixed temperature restriction"), _L("With this option enabled, you can print materials with a large temperature difference together."), "enable_high_low_temp_mixed_printing");
+    g_sizer->Add(item_mix_print_high_low_temperature);
  
     //// CONTROL > Camera
     g_sizer->Add(create_item_title(_L("Camera")), 1, wxEXPAND);
@@ -1587,9 +1593,6 @@ void PreferencesDialog::create_items()
     auto item_ams_blacklist    = create_item_checkbox(_L("Skip AMS blacklist check"), "", "skip_ams_blacklist_check");
     g_sizer->Add(item_ams_blacklist);
 
-    auto item_mix_print_high_low_temperature = create_item_checkbox(_L("Remove mixed temperature restriction"), _L("With this option enabled, you can print materials with a large temperature difference together."), "enable_high_low_temp_mixed_printing");
-    g_sizer->Add(item_mix_print_high_low_temperature);
-
     g_sizer->Add(create_item_title(_L("Storage")), 1, wxEXPAND);
     auto item_allow_abnormal_storage = create_item_checkbox(_L("Allow Abnormal Storage"), _L("This allows the use of Storage that is marked as abnormal by the Printer.\nUse at your own risk, can cause issues!"), "allow_abnormal_storage");
     g_sizer->Add(item_allow_abnormal_storage);
diff --git a/src/slic3r/GUI/StatusPanel.cpp b/src/slic3r/GUI/StatusPanel.cpp
index 8a85e556de..f4f7a4dde3 100644
--- a/src/slic3r/GUI/StatusPanel.cpp
+++ b/src/slic3r/GUI/StatusPanel.cpp
@@ -604,7 +604,7 @@ void PrintingTaskPanel::create_panel(wxWindow* parent)
                           std::pair<wxColour, int>(wxColour(255, 255, 255), StateColor::Hovered), std::pair<wxColour, int>(wxColour(255, 255, 255), StateColor::Enabled),
                           std::pair<wxColour, int>(wxColour(255, 255, 255), StateColor::Normal));
 
-    m_button_partskip = new Button(progress_lr_panel, wxEmptyString, "print_control_partskip_disable", 0, 20, wxID_ANY);
+    m_button_partskip = new Button(progress_lr_panel, wxEmptyString, "print_control_partskip_disable", 0, 16, wxID_ANY); // ORCA match icon size
     m_button_partskip->Enable(false);
     m_button_partskip->Hide();
     m_button_partskip->SetBackgroundColor(white_bg);
diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp
index 2e7ea637d2..2d248e7beb 100644
--- a/src/slic3r/GUI/Tab.cpp
+++ b/src/slic3r/GUI/Tab.cpp
@@ -389,6 +389,7 @@ void Tab::create_preset_tab()
         m_mode_icon = new ScalableButton(m_top_panel, wxID_ANY, "advanced"); // ORCA
         m_mode_icon->SetToolTip(_L("Show/Hide advanced parameters"));
         m_mode_icon->Bind(wxEVT_BUTTON, [this](wxCommandEvent e) {
+            if(wxGetApp().get_mode() == comDevelop) return; // prevent change on dev mode
             m_mode_view->SetValue(!m_mode_view->GetValue());
             wxCommandEvent evt(wxEVT_TOGGLEBUTTON, m_mode_view->GetId()); // ParamsPanel::OnToggled(evt)
             evt.SetEventObject(m_mode_view);
@@ -7142,7 +7143,7 @@ void Page::activate(ConfigOptionMode mode, std::function<void()> throw_if_cancel
     for (auto group : m_optgroups) {
         if (!group->activate(throw_if_canceled))
             continue;
-        m_vsizer->Add(group->sizer, 0, wxEXPAND | (group->is_legend_line() ? (wxLEFT|wxTOP) : wxALL), 10);
+        m_vsizer->Add(group->sizer, 0, wxEXPAND | (group->is_legend_line() ? (wxLEFT|wxTOP) : wxALL), m_parent->FromDIP(5)); // ORCA use less margin on parameters section
         group->update_visibility(mode);
 #if HIDE_FIRST_SPLIT_LINE
         if (first) group->stb->Hide();
diff --git a/src/slic3r/GUI/TabButton.cpp b/src/slic3r/GUI/TabButton.cpp
index 49c153c286..11da9db069 100644
--- a/src/slic3r/GUI/TabButton.cpp
+++ b/src/slic3r/GUI/TabButton.cpp
@@ -20,7 +20,7 @@ const static wxColour TAB_BUTTON_BG    = wxColour("#FEFFFF");
 const static wxColour TAB_BUTTON_SEL   = wxColour("#BFE1DE"); // ORCA
 
 TabButton::TabButton()
-    : paddingSize(43, 16)
+    : paddingSize(18, 16) // ORCA reduce / match left margin buttons on sidebars
     , text_color(*wxBLACK)
 {
     background_color = StateColor(
@@ -163,7 +163,7 @@ void TabButton::render(wxDC &dc)
 
     auto text = GetLabel();
     if (!text.IsEmpty()) {
-        pt.x = paddingSize.x;
+        pt.x = FromDIP(paddingSize.x); // ORCA match padding on scaling
         pt.y = rcContent.y + (rcContent.height - textSize.y) / 2;
         dc.SetFont(GetFont());
         dc.SetTextForeground(text_color.colorForStates(states));
diff --git a/src/slic3r/GUI/Tabbook.cpp b/src/slic3r/GUI/Tabbook.cpp
index db8cd3ba10..40ced79d13 100644
--- a/src/slic3r/GUI/Tabbook.cpp
+++ b/src/slic3r/GUI/Tabbook.cpp
@@ -204,7 +204,7 @@ void TabButtonsListCtrl::SetFooterText(const wxString& text)
         m_footer_text->SetForegroundColour(wxColour(128, 128, 128));
         m_footer_text->SetFont(Label::Body_10);
         int em = em_unit(this);
-        m_sizer->Add(m_footer_text, 0, wxALIGN_CENTER_HORIZONTAL | wxBOTTOM, em / 2);
+        m_sizer->Add(m_footer_text, 0, wxALL, FromDIP(18)); // ORCA reduce / match left margin buttons on sidebars
     } else {
         m_footer_text->SetLabel(text);
     }