diff --git a/CMakeLists.txt b/CMakeLists.txt
index f2fe7fd414..162763621c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -346,7 +346,7 @@ if(WIN32)
         if (DEFINED ENV{WindowsSdkDir} AND DEFINED ENV{WindowsSDKVersion})
             set(WIN10SDK_INCLUDE_PATH "$ENV{WindowsSdkDir}/Include/$ENV{WindowsSDKVersion}")
         else ()
-            set(WIN10SDK_INCLUDE_PATH "C:/Program Files (x86)/Windows Kits/10/Include/10.0.22000.0")
+            set(WIN10SDK_INCLUDE_PATH "C:/Program Files (x86)/Windows Kits/10/Include/10.0.26100.0")
         endif ()
         if (NOT EXISTS "${WIN10SDK_INCLUDE_PATH}/winrt/windows.graphics.printing3d.h")
             message("${WIN10SDK_INCLUDE_PATH}/winrt/windows.graphics.printing3d.h was not found")
diff --git a/README.md b/README.md
index b70b7cc431..59fb76034b 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,7 @@ If you come across any of these in search results, please <b>report them</b> as
   Use varied infill [patterns](https://github.com/OrcaSlicer/OrcaSlicer/wiki/strength_settings_patterns) and accurate hole shapes for improved clarity.
 - **[Overhang](https://github.com/OrcaSlicer/OrcaSlicer/wiki/quality_settings_overhangs) and [Support Optimization](https://github.com/OrcaSlicer/OrcaSlicer/wiki#support-settings)**  
   Modify geometry for printable overhangs with precise support placement.
-- **[Granular Controls](https://github.com/OrcaSlicer/OrcaSlicer/wiki#process-settings and Customization)**  
+- **[Granular Controls and Customization](https://github.com/OrcaSlicer/OrcaSlicer/wiki#process-settings)**  
   Fine-tune print speed, layer height, pressure, and temperature with precision.
 - **Network Printer Support**  
   Seamless integration with Klipper, PrusaLink, and OctoPrint for remote control.
diff --git a/deps/CGAL/0001-clang19.patch b/deps/CGAL/0001-clang19.patch
deleted file mode 100644
index 92a0293735..0000000000
--- a/deps/CGAL/0001-clang19.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- a/BGL/include/CGAL/boost/graph/iterator.h	2022-10-07 19:04:41 UTC
-+++ b/BGL/include/CGAL/boost/graph/iterator.h
-@@ -213,18 +213,7 @@ class Halfedge_around_source_iterator { (public)
-   {}
- 
- #ifndef DOXYGEN_RUNNING
--  // design patter: "safe bool"
--  // will be replaced by explicit operator bool with C++11
--  typedef void (Halfedge_around_source_iterator::*bool_type)() const;
- 
--  void this_type_does_not_support_comparisons() const {}
--
--  operator bool_type() const
--  {
--    return (! (this->base() == nullptr)) ?
--      &Halfedge_around_source_iterator::this_type_does_not_support_comparisons : 0;
--  }
--
-   bool operator==( const Self& i) const {
-     CGAL_assertion( anchor == anchor);
-     return  ( g == i.g) && ( pos == i.pos) && ( winding == i.winding);
-@@ -313,18 +302,7 @@ class Halfedge_around_target_iterator { (public)
-   {}
- 
- #ifndef DOXYGEN_RUNNING
--  // design patter: "safe bool"
--  // will be replaced by explicit operator bool with C++11
--  typedef void (Halfedge_around_target_iterator::*bool_type)() const;
- 
--  void this_type_does_not_support_comparisons() const {}
--
--  operator bool_type() const
--  {
--    return (! (this->base() == nullptr)) ?
--      &Halfedge_around_target_iterator::this_type_does_not_support_comparisons : 0;
--  }
--
-   bool operator==( const Self& i) const {
-     CGAL_assertion( anchor == anchor);
-     return  ( g == i.g) && ( pos == i.pos) && ( winding == i.winding);
-@@ -411,18 +389,6 @@ class Halfedge_around_face_iterator { (public)
-   const value_type& operator *  ( ) const { return  pos; }
-   pointer           operator -> ( )       { return &pos; }
-   const value_type* operator -> ( ) const { return &pos; }
--
--  // design patter: "safe bool"
--  // will be replaced by explicit operator bool with C++11
--  typedef void (Halfedge_around_face_iterator::*bool_type)() const;
--
--  void this_type_does_not_support_comparisons() const {}
--
--  operator bool_type() const
--  {
--    return (! (this->base() == nullptr)) ?
--      &Halfedge_around_face_iterator::this_type_does_not_support_comparisons : 0;
--  }
- 
-   bool operator==( const Self& i) const {
-     CGAL_assertion( anchor == anchor);
diff --git a/deps/CGAL/CGAL.cmake b/deps/CGAL/CGAL.cmake
index 73eee6701b..ec77e0ebae 100644
--- a/deps/CGAL/CGAL.cmake
+++ b/deps/CGAL/CGAL.cmake
@@ -5,11 +5,10 @@ endif ()
 orcaslicer_add_cmake_project(
     CGAL
     # GIT_REPOSITORY https://github.com/CGAL/cgal.git
-    # GIT_TAG        bec70a6d52d8aacb0b3d82a7b4edc3caa899184b # releases/CGAL-5.0
+    # GIT_TAG        3654f780ae0c64675cabaef0e5ddaf904c48b4b7 # releases/CGAL-5.6.3
     # For whatever reason, this keeps downloading forever (repeats downloads if finished)
-    URL      https://github.com/CGAL/cgal/archive/refs/tags/v5.4.zip
-    URL_HASH SHA256=d7605e0a5a5ca17da7547592f6f6e4a59430a0bc861948974254d0de43eab4c0
-    PATCH_COMMAND git apply ${CGAL_DIRECTORY_FLAG} --verbose --ignore-space-change --whitespace=fix ${CMAKE_CURRENT_LIST_DIR}/0001-clang19.patch
+    URL      https://github.com/CGAL/cgal/releases/download/v5.6.3/CGAL-5.6.3.zip
+    URL_HASH SHA256=5d577acb4a9918ccb960491482da7a3838f8d363aff47e14d703f19fd84733d4
     DEPENDS dep_Boost dep_GMP dep_MPFR
 )
 
diff --git a/localization/i18n/en/OrcaSlicer_en.po b/localization/i18n/en/OrcaSlicer_en.po
index 0cc2afa02e..647f62ee13 100644
--- a/localization/i18n/en/OrcaSlicer_en.po
+++ b/localization/i18n/en/OrcaSlicer_en.po
@@ -14346,7 +14346,7 @@ msgid ""
 "\n"
 "Using a non-zero value is useful if the printer is set up to print without a "
 "prime line.\n"
-"Final number of loops is not taking into account while arranging or "
+"Final number of loops is not taken into account while arranging or "
 "validating objects distance. Increase loop number in such case."
 msgstr ""
 
diff --git a/localization/i18n/pt_BR/OrcaSlicer_pt_BR.po b/localization/i18n/pt_BR/OrcaSlicer_pt_BR.po
index d52a68ee1b..73fcdb50ea 100644
--- a/localization/i18n/pt_BR/OrcaSlicer_pt_BR.po
+++ b/localization/i18n/pt_BR/OrcaSlicer_pt_BR.po
@@ -2057,7 +2057,7 @@ msgid "Replace the selected part with new STL"
 msgstr "Substituir a peça selecionada por novo STL"
 
 msgid "Replace all with STL"
-msgstr ""
+msgstr "Substituir tudo por STL"
 
 msgid "Replace all selected parts with STL from folder"
 msgstr "Substituir todas peças selecionadas com STL da pasta"
@@ -3406,7 +3406,7 @@ msgid "Step"
 msgstr "Passo"
 
 msgid "Unmapped"
-msgstr ""
+msgstr "Não mapeado"
 
 msgid ""
 "Upper half area:  Original\n"
@@ -4267,7 +4267,7 @@ msgid "Auto Check: Material"
 msgstr "Verificação Automática: Material"
 
 msgid "Live View Camera Calibration"
-msgstr ""
+msgstr "Calibração da Câmera ao Vivo"
 
 msgid "Waiting for heatbed to reach target temperature"
 msgstr "Aguardando mesa aquecida atingir a temperatura desejada"
@@ -6785,7 +6785,7 @@ msgid "Monitor if the waste is piled up in the purge chute."
 msgstr "Verifique se os resíduos estão se acumulando na calha de purga."
 
 msgid "Nozzle Clumping Detection"
-msgstr "Detecção de acúmulo no bico"
+msgstr "Detecção de Aglomeração no Bico"
 
 msgid "Check if the nozzle is clumping by filaments or other foreign objects."
 msgstr ""
@@ -8037,10 +8037,12 @@ msgid "All"
 msgstr "Todos"
 
 msgid "Auto flush after changing..."
-msgstr ""
+msgstr "Auto purga depois da troca..."
 
 msgid "Auto calculate flushing volumes when selected values changed"
 msgstr ""
+"Calcula automaticamente os volumes de purga quando os valores selecionados "
+"são alterados"
 
 msgid "Auto arrange plate after cloning"
 msgstr "Organizar automaticamente a placa após a clonagem"
@@ -8100,7 +8102,7 @@ msgid "If enabled, reverses the direction of zoom with mouse wheel."
 msgstr "Se ativo, inverte a direção de zoom com a roda do mouse."
 
 msgid "Clear my choice on..."
-msgstr ""
+msgstr "Limpar minha escolha em..."
 
 msgid "Unsaved projects"
 msgstr "Projetos não salvos"
@@ -8158,7 +8160,7 @@ msgid "Update built-in Presets automatically."
 msgstr "Atualizar automaticamente Predefinições integradas."
 
 msgid "Network plugin"
-msgstr ""
+msgstr "Plugin de rede"
 
 msgid "Enable network plugin"
 msgstr "Ativar plugin de rede"
@@ -8882,15 +8884,20 @@ msgid ""
 "You have selected both external and AMS filaments for an extruder. You will "
 "need to manually switch the external filament during printing."
 msgstr ""
+"Você selecionou filamentos externos e AMS para uma extrusora. Será "
+"necessário trocar manualmente o filamento externo durante a impressão."
 
 msgid ""
 "TPU 90A/TPU 85A is too soft and does not support automatic Flow Dynamics "
 "calibration."
-msgstr ""
+msgstr "TPU 90A/TPU 85A é muito mole e não suporta calibração automática de "
+"Dinâmica de Fluxo."
 
 msgid ""
 "Set dynamic flow calibration to 'OFF' to enable custom dynamic flow value."
 msgstr ""
+"Desative a calibração de fluxo dinâmico para habilitar o valor de fluxo "
+"dinâmico personalizado."
 
 msgid "This printer does not support printing all plates."
 msgstr "Esta impressora não suporta a imprimir todas as placas."
@@ -8899,6 +8906,9 @@ msgid ""
 "Please cold pull before printing TPU to avoid clogging. You may use cold "
 "pull maintenance on the printer."
 msgstr ""
+"Recomenda-se realizar um processo de 'cold pull' antes de imprimir em TPU "
+"para evitar entupimentos. Você pode utilizar esse processo de manutenção na "
+"impressora."
 
 msgid "High chamber temperature is required. Please close the door."
 msgstr "É necessária uma temperatura elevada na câmara. Feche a porta."
@@ -8916,8 +8926,9 @@ msgid "click to retry"
 msgstr "clique para tentar novamente"
 
 msgid "Upload file timeout, please check if the firmware version supports it."
-msgstr "Limite de tempo de envio exedido, verifique se a versão do firmware "
-"tem suporte."
+msgstr ""
+"Limite de tempo de envio de arquivo excedido, verifique se a versão do "
+"firmware tem suporte."
 
 msgid ""
 "No available external storage was obtained. Please confirm and try again."
@@ -8936,6 +8947,8 @@ msgid ""
 "Please check the network and try again, You can restart or update the "
 "printer if the issue persists."
 msgstr ""
+"Verifique a rede e tente novamente. Se o problema persistir, você pode "
+"reiniciar ou atualizar a impressora."
 
 msgid "Sending..."
 msgstr "Enviando…"
@@ -8952,7 +8965,7 @@ msgid "Sending failed, please try again!"
 msgstr "Falha no envio, tente novamente!"
 
 msgid "Connection failed. Click the icon to retry"
-msgstr ""
+msgstr "Falha na coexão.  Clique no icon para tentar novamente"
 
 msgid "Cannot send the print task when the upgrade is in progress"
 msgstr ""
@@ -9653,7 +9666,7 @@ msgid "Wipe tower parameters"
 msgstr "Parâmetros da torre de limpeza"
 
 msgid "Multi Filament"
-msgstr ""
+msgstr "Multi Filamento"
 
 msgid "Tool change parameters with single extruder MM printers"
 msgstr ""
@@ -9723,7 +9736,7 @@ msgid "Timelapse G-code"
 msgstr "G-code de timelapse"
 
 msgid "Clumping Detection G-code"
-msgstr ""
+msgstr "G-code para detecção de aglomeração"
 
 msgid "Change filament G-code"
 msgstr "G-code de mudança de filamento"
@@ -9862,11 +9875,11 @@ msgstr "Tem certeza de %1% a predefinição selecionada?"
 
 #, c-format, boost-format
 msgid "Left: %s"
-msgstr ""
+msgstr "Esquerda: %s"
 
 #, c-format, boost-format
 msgid "Right: %s"
-msgstr ""
+msgstr "Direita: %s"
 
 msgid "Click to reset current value and attach to the global value."
 msgstr "Clique para redefinir o valor atual e anexá-lo ao valor global."
@@ -10102,25 +10115,25 @@ msgid "The configuration is up to date."
 msgstr "A configuração está atualizada."
 
 msgid "Open Wiki for more information >"
-msgstr ""
+msgstr "Abra o Wiki para mais informações >"
 
 msgid "OBJ file import color"
 msgstr "Importar cor de arquivo Obj"
 
 msgid "Some faces don't have color defined."
-msgstr ""
+msgstr "Algumas faces não têm a cor definida."
 
 msgid "MTL file exist error, could not find the material:"
 msgstr ""
 
 msgid "Please check OBJ or MTL file."
-msgstr ""
+msgstr "Verifique o arquivo OBJ ou MTL."
 
 msgid "Specify number of colors:"
 msgstr "Especifique a quantidade de cores:"
 
 msgid "Enter or click the adjustment button to modify number again"
-msgstr ""
+msgstr "Digite ou clique no botão de ajuste para modificar o número novamente"
 
 msgid "Recommended "
 msgstr "Recomendado "
@@ -10129,10 +10142,10 @@ msgid "view"
 msgstr ""
 
 msgid "Current filament colors"
-msgstr ""
+msgstr "Cores de filamento atuais"
 
 msgid "Matching"
-msgstr ""
+msgstr "Correspondendo"
 
 msgid "Quick set"
 msgstr ""
@@ -10147,7 +10160,7 @@ msgid "Append"
 msgstr "Adicionar"
 
 msgid "Append to existing filaments"
-msgstr ""
+msgstr "Adicionar aos filamentos existentes"
 
 msgid "Reset mapped extruders."
 msgstr "Redefinir extrusoras mapeadas."
@@ -10389,6 +10402,9 @@ msgid ""
 "changed or filaments changed. You could disable the auto-calculate in Orca "
 "Slicer > Preferences"
 msgstr ""
+"O Orca recalculará seus volumes de purga toda vez que a cor dos filamentos "
+"ou os filamentos forem alterados. Você pode desativar o cálculo automático "
+"em OrcaSlicer > Preferências"
 
 msgid "Flushing volume (mm³) for each filament pair."
 msgstr "Volume de purga (mm³) para cada par de filamentos."
@@ -10405,10 +10421,10 @@ msgid "Re-calculate"
 msgstr "Recalcular"
 
 msgid "Left extruder"
-msgstr ""
+msgstr "Extrusora esquerda"
 
 msgid "Right extruder"
-msgstr ""
+msgstr "Extrusora direita"
 
 msgid "Multiplier"
 msgstr "Multiplicador"
@@ -10417,7 +10433,7 @@ msgid "Flushing volumes for filament change"
 msgstr "Volumes de purga para troca de filamento"
 
 msgid "Please choose the filament colour"
-msgstr ""
+msgstr "Escolha a cor do filamento"
 
 msgid ""
 "Windows Media Player is required for this task! Do you want to enable "
@@ -10732,19 +10748,27 @@ msgid ""
 "Try the following methods to update the connection parameters and reconnect "
 "to the printer."
 msgstr ""
+"Tente os seguintes métodos para atualizar os parâmetros de conexão e "
+"reconectar à impressora."
 
 msgid "1. Please confirm Orca Slicer and your printer are in the same LAN."
 msgstr ""
+"1. Confirme se o Orca Slicer e sua impressora estão na mesma rede local."
 
 msgid ""
 "2. If the IP and Access Code below are different from the actual values on "
 "your printer, please correct them."
 msgstr ""
+"2. Se o IP e o Código de Acesso abaixo forem diferentes dos valores reais da "
+"sua impressora, corrija-os."
 
 msgid ""
 "3. Please obtain the device SN from the printer side; it is usually found in "
 "the device information on the printer screen."
 msgstr ""
+"3. Obtenha o número de série (SN) do dispositivo na própria impressora; "
+"geralmente ele pode ser encontrado nas informações do dispositivo na tela da "
+"impressora."
 
 msgid "IP"
 msgstr "IP"
@@ -10800,7 +10824,7 @@ msgstr ""
 "por favor passe para o passo 3 para resolver problemas de rede"
 
 msgid "Connection failed! Please refer to the wiki page."
-msgstr ""
+msgstr "Falha na conexão! Consulte a página da wiki."
 
 msgid "sending failed"
 msgstr "falha no envio"
@@ -10809,9 +10833,11 @@ msgid ""
 "Failed to send. Click Retry to attempt sending again. If retrying does not "
 "work, please check the reason."
 msgstr ""
+"Falha ao enviar. Clique em Tentar Novamente para tentar enviar de novo. Se "
+"tentar novamente não funcionar, verifique o motivo."
 
 msgid "reconnect"
-msgstr ""
+msgstr "reconectar"
 
 msgid "Air Pump"
 msgstr "Bomba de Ar"
@@ -10826,7 +10852,7 @@ msgid "Cutting Module"
 msgstr "Módulo de Corte"
 
 msgid "Auto Fire Extinguishing System"
-msgstr ""
+msgstr "Sistema Automático de Extinção de Incêndio"
 
 msgid "Model:"
 msgstr "Modelo:"
@@ -10988,13 +11014,13 @@ msgid "Generating G-code: layer %1%"
 msgstr "Gerando G-code: camada %1%"
 
 msgid "Flush volumes matrix do not match to the correct size!"
-msgstr ""
+msgstr "A matriz de volumes de descarga não corresponde ao tamanho correto!"
 
 msgid "Grouping error: "
-msgstr ""
+msgstr "Erro de agrupamento: "
 
 msgid " can not be placed in the "
-msgstr ""
+msgstr " não pode ser colocado na "
 
 msgid "Inner wall"
 msgstr "Parede interna"
@@ -11162,6 +11188,8 @@ msgid ""
 " is too close to clumping detection area, there may be collisions when "
 "printing."
 msgstr ""
+" está muito perto da área de detecção de aglomeração, podendo haver colisões "
+"durante a impressão."
 
 msgid "Prime Tower"
 msgstr "Torre de Preparo"
@@ -11175,32 +11203,44 @@ msgstr " está muito perto da área de exclusão, e ocorrerão colisões.\n"
 msgid ""
 " is too close to clumping detection area, and collisions will be caused.\n"
 msgstr ""
+" está muito perto da área de detecção de aglomeração, e ocorrerão colisões.\n"
 
 msgid ""
 "Printing high-temp and low-temp filaments together may cause nozzle clogging "
 "or printer damage."
 msgstr ""
+"A impressão simultânea de filamentos de alta e baixa temperatura pode causar "
+"entupimento do bico ou danos à impressora."
 
 msgid ""
 "Printing high-temp and low-temp filaments together may cause nozzle clogging "
 "or printer damage. If you still want to print, you can enable the option in "
 "Preferences."
 msgstr ""
+"A impressão simultânea de filamentos de alta e baixa temperatura pode causar "
+"entupimento do bico ou danos à impressora. Se ainda assim desejar imprimir, "
+"você pode ativar a opção em Preferências."
 
 msgid ""
 "Printing different-temp filaments together may cause nozzle clogging or "
 "printer damage."
 msgstr ""
+"Imprimir filamentos com temperaturas diferentes simultaneamente pode causar "
+"entupimento dos bicos ou danos à impressora."
 
 msgid ""
 "Printing high-temp and mid-temp filaments together may cause nozzle clogging "
 "or printer damage."
 msgstr ""
+"A impressão simultânea de filamentos de alta e média temperatura pode causar "
+"entupimento do bico ou danos à impressora."
 
 msgid ""
 "Printing mid-temp and low-temp filaments together may cause nozzle clogging "
 "or printer damage."
 msgstr ""
+"A impressão simultânea de filamentos de temperatura média e baixa pode causar "
+"entupimento do bico ou danos à impressora."
 
 msgid "No extrusions under current settings."
 msgstr "Nenhuma extrusão com as configurações atuais."
@@ -11215,6 +11255,8 @@ msgstr ""
 msgid ""
 "Clumping detection is not supported when \"by object\" sequence is enabled."
 msgstr ""
+"A detecção de aglomeração não é suportada quando a sequência \"por objeto\" "
+"está ativada."
 
 msgid ""
 "Prime tower is required for clumping detection; otherwise, there may be "
@@ -11528,7 +11570,7 @@ msgid "Printable area"
 msgstr "Área de impressão"
 
 msgid "Extruder printable area"
-msgstr ""
+msgstr "Área de impressão da extrusora"
 
 msgid "Bed exclude area"
 msgstr "Área de exclusão da mesa"
@@ -11590,12 +11632,14 @@ msgid "Maximum printable height which is limited by mechanism of printer."
 msgstr "Altura máxima de impressão limitada pelo mecanismo da impressora."
 
 msgid "Extruder printable height"
-msgstr ""
+msgstr "Altura de impressão da extrusora"
 
 msgid ""
 "Maximum printable height of this extruder which is limited by mechanism of "
 "printer."
 msgstr ""
+"Altura máxima de impressão desta extrusora, limitada pelo mecanismo da "
+"impressora."
 
 msgid "Preferred orientation"
 msgstr "Orientação preferida"
@@ -14908,19 +14952,19 @@ msgstr ""
 "diâmetro do bico."
 
 msgid "Enable clumping detection"
-msgstr ""
+msgstr "Habilitar detecção de aglomeração"
 
 msgid "Clumping detection layers"
-msgstr ""
+msgstr "Camadas de detecção de aglomeração"
 
 msgid "Clumping detection layers."
-msgstr ""
+msgstr "Camadas de detecção de aglomeração."
 
 msgid "Probing exclude area of clumping"
-msgstr ""
+msgstr "Sondagem exclui área de aglomeração"
 
 msgid "Probing exclude area of clumping."
-msgstr ""
+msgstr "Sondagem exclui área de aglomeração."
 
 msgid "Filament to print internal sparse infill."
 msgstr "Filamento para imprimir preenchimento esparso interno."
diff --git a/resources/handy_models/calicat.stl b/resources/handy_models/calicat.stl
new file mode 100644
index 0000000000..3380af233b
Binary files /dev/null and b/resources/handy_models/calicat.stl differ
diff --git a/resources/images/advanced.svg b/resources/images/advanced.svg
index 561a15b303..ef868e36b1 100644
--- a/resources/images/advanced.svg
+++ b/resources/images/advanced.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path d="M10.2,13.8A20.875,20.875,0,0,1,6.376,8.5C4.305,4.673,3.353,1.124,4.25.572" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/><path d="M1.781,6.381A18.541,18.541,0,0,1,8,5.5c4.142,0,7.5.9,7.5,2" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/><path d="M12.017,2.314A21.814,21.814,0,0,1,9.624,8.5c-2.071,3.826-4.477,6.48-5.374,5.927" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/><path d="M15.5,7.5c0,1.1-3.358,2-7.5,2S.5,8.6.5,7.5c0-.414.472-.8,1.281-1.118" style="fill:none;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"/><path d="M4.25,14.426c-.9-.552.055-4.1,2.126-7.927S10.853.02,11.75.572c.336.207.413.835.267,1.742" style="fill:none;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"/><path d="M4.25.572c.9-.552,3.3,2.1,5.374,5.927s3.023,7.375,2.126,7.927c-.336.207-.885-.036-1.548-.624" style="fill:none;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"/><circle cx="12" cy="2.804" r="1" style="fill:#009688;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"/><circle cx="9.6" cy="13.196" r="1" style="fill:#009688;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"/><circle cx="2.5" cy="6.499" r="1" style="fill:#009688;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"/></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="M2.21,8.77c1.38.44,3.46.73,5.79.73,4.14,0,7.5-.9,7.5-2s-3.36-2-7.5-2S.5,6.4.5,7.5c0,.48.64.93,1.71,1.27" style="fill:none; stroke:#949494; stroke-linecap:round; stroke-linejoin:round; stroke-width:.8px;"/><circle cx="1.5" cy="7.5" r="1" style="fill:#009688; stroke:#009688; stroke-linecap:round; stroke-linejoin:round;"/><path d="M12,11.88c-.3-1.41-1.1-3.36-2.26-5.38C7.66,2.91,5.21.45,4.25,1s-.05,3.91,2.02,7.5,4.53,6.05,5.48,5.5c.42-.24.48-1.02.25-2.12" style="fill:none; stroke:#949494; stroke-linecap:round; stroke-linejoin:round; stroke-width:.8px;"/><circle cx="11.25" cy="13.13" r="1" style="fill:#009688; stroke:#009688; stroke-linecap:round; stroke-linejoin:round;"/><path d="M9.79,1.85c-1.07.97-2.36,2.63-3.52,4.65-2.07,3.59-2.97,6.94-2.02,7.5s3.41-1.91,5.48-5.5,2.97-6.94,2.02-7.5c-.42-.24-1.12.09-1.96.85" style="fill:none; stroke:#949494; stroke-linecap:round; stroke-linejoin:round; stroke-width:.8px;"/><circle cx="11.25" cy="1.87" r="1" style="fill:#009688; stroke:#009688; stroke-linecap:round; stroke-linejoin:round;"/></svg>
\ No newline at end of file
diff --git a/resources/images/ams_1_tray.svg b/resources/images/ams_1_tray.svg
index 6d9c7b3f28..d46cb35b07 100644
--- a/resources/images/ams_1_tray.svg
+++ b/resources/images/ams_1_tray.svg
@@ -1,5 +1 @@
-<svg width="21" height="21" viewBox="0 0 21 21" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5.88312 4.68555C5.88312 4.13326 6.33083 3.68555 6.88312 3.68555H13.5059C14.0582 3.68555 14.5059 4.13326 14.5059 4.68555V10.3887H5.88312V4.68555Z" stroke="#6B6B6B"/>
-<rect x="3.8725" y="10.3887" width="12.7037" height="7.55371" rx="1.2" stroke="#6B6B6B"/>
-<path d="M8.21991 5.65234C8.21991 5.3762 8.44377 5.15234 8.71991 5.15234H11.7288C12.005 5.15234 12.2288 5.3762 12.2288 5.65234V10.3887H8.21991V5.65234Z" stroke="#6B6B6B"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" width="44" height="44" viewBox="0 0 44 44"><rect x="19" y="15" width="1" height="14" style="fill:#009688; opacity:.5;"/><rect x="20" y="15" width="1" height="14" style="fill:#009688;"/><rect x="21" y="15" width="1" height="14" style="fill:#009688; opacity:.5;"/><rect x="22" y="15" width="1" height="14" style="fill:#009688;"/><rect x="23" y="15" width="1" height="14" style="fill:#009688; opacity:.5;"/><rect x="24" y="15" width="1" height="14" style="fill:#009688;"/><rect x="25" y="15" width="1" height="14" style="fill:#009688; opacity:.5;"/><line x1="26.5" y1="14" x2="26.5" y2="30" style="fill:none; stroke:#949494;"/><line x1="18.5" y1="14" x2="18.5" y2="30" style="fill:none; stroke:#949494;"/><path d="M28.5,23v-9.5c0-1.66-1.34-3-3-3h-6c-1.66,0-3,1.34-3,3v9.5" style="fill:none; stroke:#949494;"/><path d="M15,23v11h15v-11h-15ZM21,26v-1c0-.55.45-1,1-1h1c.55,0,1,.45,1,1v1c0,.55-.45,1-1,1h-1c-.55,0-1-.45-1-1Z" style="fill:#949494; opacity:.7;"/></svg>
\ No newline at end of file
diff --git a/resources/images/ams_4_tray.svg b/resources/images/ams_4_tray.svg
index 379dcdf991..779383ed27 100644
--- a/resources/images/ams_4_tray.svg
+++ b/resources/images/ams_4_tray.svg
@@ -1,8 +1 @@
-<svg width="21" height="21" viewBox="0 0 21 21" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.26813 4.73877C4.26813 4.18648 4.71584 3.73877 5.26813 3.73877H15.2681C15.8204 3.73877 16.2681 4.18648 16.2681 4.73877V10.4419H4.26813V4.73877Z" stroke="#6B6B6B"/>
-<rect x="2.00372" y="10.4419" width="16.5289" height="7.55371" rx="1.2" stroke="#6B6B6B"/>
-<path d="M5.95978 6.13135C5.95978 5.85521 6.18364 5.63135 6.45978 5.63135H13.9891C14.2652 5.63135 14.4891 5.85521 14.4891 6.13135V10.4413H5.95978V6.13135Z" stroke="#6B6B6B"/>
-<line x1="8.26813" y1="9.96484" x2="8.26813" y2="6.10772" stroke="#6B6B6B"/>
-<line x1="10.3477" y1="9.96484" x2="10.3477" y2="6.10772" stroke="#6B6B6B"/>
-<line x1="12.4274" y1="9.96484" x2="12.4274" y2="6.10772" stroke="#6B6B6B"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" width="44" height="44" viewBox="0 0 44 44"><rect x="5" y="15" width="1" height="14" style="fill:#009688; opacity:.5;"/><rect x="6" y="15" width="1" height="14" style="fill:#009688;"/><rect x="7" y="15" width="1" height="14" style="fill:#009688; opacity:.5;"/><rect x="8" y="15" width="1" height="14" style="fill:#009688;"/><rect x="9" y="15" width="1" height="14" style="fill:#009688; opacity:.5;"/><rect x="10" y="15" width="1" height="14" style="fill:#009688;"/><rect x="11" y="15" width="1" height="14" style="fill:#009688; opacity:.5;"/><rect x="14" y="15" width="1" height="14" style="fill:#009688; opacity:.5;"/><rect x="15" y="15" width="1" height="14" style="fill:#009688;"/><rect x="16" y="15" width="1" height="14" style="fill:#009688; opacity:.5;"/><rect x="17" y="15" width="1" height="14" style="fill:#009688;"/><rect x="18" y="15" width="1" height="14" style="fill:#009688; opacity:.5;"/><rect x="19" y="15" width="1" height="14" style="fill:#009688;"/><rect x="20" y="15" width="1" height="14" style="fill:#009688; opacity:.5;"/><rect x="23" y="15" width="1" height="14" style="fill:#009688; opacity:.5;"/><rect x="24" y="15" width="1" height="14" style="fill:#009688;"/><rect x="25" y="15" width="1" height="14" style="fill:#009688; opacity:.5;"/><rect x="26" y="15" width="1" height="14" style="fill:#009688;"/><rect x="27" y="15" width="1" height="14" style="fill:#009688; opacity:.5;"/><rect x="28" y="15" width="1" height="14" style="fill:#009688;"/><rect x="29" y="15" width="1" height="14" style="fill:#009688; opacity:.5;"/><rect x="32" y="15" width="1" height="14" style="fill:#009688; opacity:.5;"/><rect x="33" y="15" width="1" height="14" style="fill:#009688;"/><rect x="34" y="15" width="1" height="14" style="fill:#009688; opacity:.5;"/><rect x="35" y="15" width="1" height="14" style="fill:#009688;"/><rect x="36" y="15" width="1" height="14" style="fill:#009688; opacity:.5;"/><rect x="37" y="15" width="1" height="14" style="fill:#009688;"/><rect x="38" y="15" width="1" height="14" style="fill:#009688; opacity:.5;"/><line x1="39.5" y1="14" x2="39.5" y2="30" style="fill:none; stroke:#949494;"/><line x1="31.5" y1="14" x2="31.5" y2="30" style="fill:none; stroke:#949494;"/><line x1="30.5" y1="14" x2="30.5" y2="30" style="fill:none; stroke:#949494;"/><line x1="22.5" y1="14" x2="22.5" y2="30" style="fill:none; stroke:#949494;"/><line x1="21.5" y1="14" x2="21.5" y2="30" style="fill:none; stroke:#949494;"/><line x1="13.5" y1="14" x2="13.5" y2="30" style="fill:none; stroke:#949494;"/><line x1="12.5" y1="14" x2="12.5" y2="30" style="fill:none; stroke:#949494;"/><line x1="4.5" y1="14" x2="4.5" y2="30" style="fill:none; stroke:#949494;"/><path d="M41.5,23v-9.5c0-1.66-1.34-3-3-3H5.5c-1.66,0-3,1.34-3,3v9.5" style="fill:none; stroke:#949494;"/><path d="M39,23H1v11h42v-11h-4ZM7,26v-1c0-.55.45-1,1-1h1c.55,0,1,.45,1,1v1c0,.55-.45,1-1,1h-1c-.55,0-1-.45-1-1ZM16,26v-1c0-.55.45-1,1-1h1c.55,0,1,.45,1,1v1c0,.55-.45,1-1,1h-1c-.55,0-1-.45-1-1ZM25,26v-1c0-.55.45-1,1-1h1c.55,0,1,.45,1,1v1c0,.55-.45,1-1,1h-1c-.55,0-1-.45-1-1ZM34,26v-1c0-.55.45-1,1-1h1c.55,0,1,.45,1,1v1c0,.55-.45,1-1,1h-1c-.55,0-1-.45-1-1Z" style="fill:#949494; opacity:.7;"/></svg>
\ No newline at end of file
diff --git a/resources/images/custom-gcode_advanced.svg b/resources/images/custom-gcode_advanced.svg
index 561a15b303..e363a28d13 100644
--- a/resources/images/custom-gcode_advanced.svg
+++ b/resources/images/custom-gcode_advanced.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path d="M10.2,13.8A20.875,20.875,0,0,1,6.376,8.5C4.305,4.673,3.353,1.124,4.25.572" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/><path d="M1.781,6.381A18.541,18.541,0,0,1,8,5.5c4.142,0,7.5.9,7.5,2" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/><path d="M12.017,2.314A21.814,21.814,0,0,1,9.624,8.5c-2.071,3.826-4.477,6.48-5.374,5.927" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/><path d="M15.5,7.5c0,1.1-3.358,2-7.5,2S.5,8.6.5,7.5c0-.414.472-.8,1.281-1.118" style="fill:none;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"/><path d="M4.25,14.426c-.9-.552.055-4.1,2.126-7.927S10.853.02,11.75.572c.336.207.413.835.267,1.742" style="fill:none;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"/><path d="M4.25.572c.9-.552,3.3,2.1,5.374,5.927s3.023,7.375,2.126,7.927c-.336.207-.885-.036-1.548-.624" style="fill:none;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"/><circle cx="12" cy="2.804" r="1" style="fill:#009688;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"/><circle cx="9.6" cy="13.196" r="1" style="fill:#009688;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"/><circle cx="2.5" cy="6.499" r="1" style="fill:#009688;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"/></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="M2.21,8.77c1.38.44,3.46.73,5.79.73,4.14,0,7.5-.9,7.5-2s-3.36-2-7.5-2S.5,6.4.5,7.5c0,.48.64.93,1.71,1.27" style="fill:none; stroke:#949494; stroke-linecap:round; stroke-linejoin:round; stroke-width:.8px;"/><circle cx="1.5" cy="7.5" r="1" style="fill:#009688; stroke:#009688; stroke-linecap:round; stroke-linejoin:round;"/><path d="M12,11.88c-.3-1.41-1.1-3.36-2.26-5.38C7.66,2.91,5.21.45,4.25,1c-.96.55-.05,3.91,2.02,7.5s4.53,6.05,5.48,5.5c.42-.24.48-1.02.25-2.12" style="fill:none; stroke:#949494; stroke-linecap:round; stroke-linejoin:round; stroke-width:.8px;"/><circle cx="11.25" cy="13.13" r="1" style="fill:#009688; stroke:#009688; stroke-linecap:round; stroke-linejoin:round;"/><path d="M9.79,1.85c-1.07.97-2.36,2.63-3.52,4.65-2.07,3.59-2.97,6.94-2.02,7.5.95.56,3.41-1.91,5.48-5.5s2.97-6.94,2.02-7.5c-.42-.24-1.12.09-1.96.85" style="fill:none; stroke:#949494; stroke-linecap:round; stroke-linejoin:round; stroke-width:.8px;"/><circle cx="11.25" cy="1.87" r="1" style="fill:#009688; stroke:#009688; stroke-linecap:round; stroke-linejoin:round;"/></svg>
\ No newline at end of file
diff --git a/resources/images/four_slot_ams_item.svg b/resources/images/four_slot_ams_item.svg
index b42e94a6ca..8b1f7f787b 100644
--- a/resources/images/four_slot_ams_item.svg
+++ b/resources/images/four_slot_ams_item.svg
@@ -1,5 +1 @@
-<svg width="52" height="32" viewBox="0 0 52 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M4 0C1.79086 0 0 1.79086 0 4V28C0 30.2091 1.79086 32 4 32H48C50.2091 32 52 30.2091 52 28V4C52 1.79086 50.2091 0 48 0H4ZM44 8H8V24H44V8Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M36.5 16H33.5V18.2617C33.5 19.9186 32.1569 21.2617 30.5 21.2617C28.8431 21.2617 27.5 19.9186 27.5 18.2617V16H24.5V18.2617C24.5 19.9186 23.1569 21.2617 21.5 21.2617C19.8431 21.2617 18.5 19.9186 18.5 18.2617V16H15.5V18.2617C15.5 19.9186 14.1569 21.2617 12.5 21.2617C10.8432 21.2617 9.5 19.9186 9.5 18.2617V16H4V28H48V16H42.5V18.2617C42.5 19.9186 41.1569 21.2617 39.5 21.2617C37.8431 21.2617 36.5 19.9186 36.5 18.2617V16Z" fill="#CECECE"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M6 9.18382C6 6.32088 8.32088 4 11.1838 4H40.8162C43.6791 4 46 6.32088 46 9.18382V16H42.5V12.2617C42.5 10.6049 41.1569 9.26172 39.5 9.26172C37.8431 9.26172 36.5 10.6049 36.5 12.2617V16H33.5V12.2617C33.5 10.6049 32.1569 9.26172 30.5 9.26172C28.8431 9.26172 27.5 10.6049 27.5 12.2617V16H24.5V12.2617C24.5 10.6049 23.1569 9.26172 21.5 9.26172C19.8431 9.26172 18.5 10.6049 18.5 12.2617V16H15.5V12.2617C15.5 10.6049 14.1569 9.26172 12.5 9.26172C10.8432 9.26172 9.5 10.6049 9.5 12.2617V16H6V9.18382Z" fill="#EEEEEE"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" width="52" height="32" viewBox="0 0 52 32"><line x1="43.5" y1="8" x2="43.5" y2="24" style="fill:none; stroke:#949494;"/><line x1="35.5" y1="8" x2="35.5" y2="24" style="fill:none; stroke:#949494;"/><line x1="34.5" y1="8" x2="34.5" y2="24" style="fill:none; stroke:#949494;"/><line x1="26.5" y1="8" x2="26.5" y2="24" style="fill:none; stroke:#949494;"/><line x1="25.5" y1="8" x2="25.5" y2="24" style="fill:none; stroke:#949494;"/><line x1="17.5" y1="8" x2="17.5" y2="24" style="fill:none; stroke:#949494;"/><line x1="16.5" y1="8" x2="16.5" y2="24" style="fill:none; stroke:#949494;"/><line x1="8.5" y1="8" x2="8.5" y2="24" style="fill:none; stroke:#949494;"/><path d="M45.5,17V7.5c0-1.66-1.34-3-3-3H9.5c-1.66,0-3,1.34-3,3v9.5" style="fill:none; stroke:#949494;"/><path d="M43,17H5v11h42v-11h-4ZM11,20v-1c0-.55.45-1,1-1h1c.55,0,1,.45,1,1v1c0,.55-.45,1-1,1h-1c-.55,0-1-.45-1-1ZM20,20v-1c0-.55.45-1,1-1h1c.55,0,1,.45,1,1v1c0,.55-.45,1-1,1h-1c-.55,0-1-.45-1-1ZM29,20v-1c0-.55.45-1,1-1h1c.55,0,1,.45,1,1v1c0,.55-.45,1-1,1h-1c-.55,0-1-.45-1-1ZM38,20v-1c0-.55.45-1,1-1h1c.55,0,1,.45,1,1v1c0,.55-.45,1-1,1h-1c-.55,0-1-.45-1-1Z" style="fill:#949494; opacity:.7;"/></svg>
\ No newline at end of file
diff --git a/resources/images/four_slot_ams_item_dark.svg b/resources/images/four_slot_ams_item_dark.svg
index 1d788268ff..8b1f7f787b 100644
--- a/resources/images/four_slot_ams_item_dark.svg
+++ b/resources/images/four_slot_ams_item_dark.svg
@@ -1,12 +1 @@
-<svg width="52" height="32" viewBox="0 0 52 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_21155_56752)">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M4 0C1.79086 0 0 1.79086 0 4V28C0 30.2091 1.79086 32 4 32H48C50.2091 32 52 30.2091 52 28V4C52 1.79086 50.2091 0 48 0H4ZM44 8H8V24H44V8Z" fill="#2F2E33"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M36.5 16H33.5V18.2617C33.5 19.9186 32.1569 21.2617 30.5 21.2617C28.8431 21.2617 27.5 19.9186 27.5 18.2617V16H24.5V18.2617C24.5 19.9186 23.1569 21.2617 21.5 21.2617C19.8431 21.2617 18.5 19.9186 18.5 18.2617V16H15.5V18.2617C15.5 19.9186 14.1569 21.2617 12.5 21.2617C10.8432 21.2617 9.5 19.9186 9.5 18.2617V16H4V28H48V16H42.5V18.2617C42.5 19.9186 41.1569 21.2617 39.5 21.2617C37.8431 21.2617 36.5 19.9186 36.5 18.2617V16Z" fill="#767676"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M6 9.18382C6 6.32088 8.32088 4 11.1838 4H40.8162C43.6791 4 46 6.32088 46 9.18382V16H42.5V12.2617C42.5 10.6049 41.1569 9.26172 39.5 9.26172C37.8431 9.26172 36.5 10.6049 36.5 12.2617V16H33.5V12.2617C33.5 10.6049 32.1569 9.26172 30.5 9.26172C28.8431 9.26172 27.5 10.6049 27.5 12.2617V16H24.5V12.2617C24.5 10.6049 23.1569 9.26172 21.5 9.26172C19.8431 9.26172 18.5 10.6049 18.5 12.2617V16H15.5V12.2617C15.5 10.6049 14.1569 9.26172 12.5 9.26172C10.8432 9.26172 9.5 10.6049 9.5 12.2617V16H6V9.18382Z" fill="#BFBFBF"/>
-</g>
-<defs>
-<clipPath id="clip0_21155_56752">
-<rect width="52" height="32" fill="white"/>
-</clipPath>
-</defs>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" width="52" height="32" viewBox="0 0 52 32"><line x1="43.5" y1="8" x2="43.5" y2="24" style="fill:none; stroke:#949494;"/><line x1="35.5" y1="8" x2="35.5" y2="24" style="fill:none; stroke:#949494;"/><line x1="34.5" y1="8" x2="34.5" y2="24" style="fill:none; stroke:#949494;"/><line x1="26.5" y1="8" x2="26.5" y2="24" style="fill:none; stroke:#949494;"/><line x1="25.5" y1="8" x2="25.5" y2="24" style="fill:none; stroke:#949494;"/><line x1="17.5" y1="8" x2="17.5" y2="24" style="fill:none; stroke:#949494;"/><line x1="16.5" y1="8" x2="16.5" y2="24" style="fill:none; stroke:#949494;"/><line x1="8.5" y1="8" x2="8.5" y2="24" style="fill:none; stroke:#949494;"/><path d="M45.5,17V7.5c0-1.66-1.34-3-3-3H9.5c-1.66,0-3,1.34-3,3v9.5" style="fill:none; stroke:#949494;"/><path d="M43,17H5v11h42v-11h-4ZM11,20v-1c0-.55.45-1,1-1h1c.55,0,1,.45,1,1v1c0,.55-.45,1-1,1h-1c-.55,0-1-.45-1-1ZM20,20v-1c0-.55.45-1,1-1h1c.55,0,1,.45,1,1v1c0,.55-.45,1-1,1h-1c-.55,0-1-.45-1-1ZM29,20v-1c0-.55.45-1,1-1h1c.55,0,1,.45,1,1v1c0,.55-.45,1-1,1h-1c-.55,0-1-.45-1-1ZM38,20v-1c0-.55.45-1,1-1h1c.55,0,1,.45,1,1v1c0,.55-.45,1-1,1h-1c-.55,0-1-.45-1-1Z" style="fill:#949494; opacity:.7;"/></svg>
\ No newline at end of file
diff --git a/resources/images/lock_hover.svg b/resources/images/lock_hover.svg
index b25ba1cfdc..7abfb97480 100644
--- a/resources/images/lock_hover.svg
+++ b/resources/images/lock_hover.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><polyline points="0.5 2.5 0.5 5.5 3.5 5.5" style="fill:none;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"/><path d="M6.51,14.43A7,7,0,0,1,.571,8.5" style="fill:none;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"/><path d="M.79,5.5a7,7,0,0,1,13.639,1" style="fill:none;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"/><line x1="11.5" y1="14.5" x2="11.5" y2="11.5" style="fill:none;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"/><line x1="8.5" y1="9.5" x2="11.5" y2="11.5" style="fill:none;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"/><polygon points="11.5 7.5 14.5 9.5 14.5 12.5 11.5 14.5 8.5 12.5 8.5 9.5 11.5 7.5" style="fill:none;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"/><line x1="14.5" y1="9.5" x2="11.5" y2="11.5" style="fill:none;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"/></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"><polyline points="1.5 1.5 1.5 5.5 5.5 5.5" style="fill:none; stroke:#ff6f00; stroke-linecap:round; stroke-linejoin:round;"/><line x1="10.5" y1="13.5" x2="10.5" y2="10.5" style="fill:none; stroke:#ff6f00; stroke-linecap:round; stroke-linejoin:round;"/><line x1="7.5" y1="8.5" x2="10.5" y2="10.5" style="fill:none; stroke:#ff6f00; stroke-linecap:round; stroke-linejoin:round;"/><polygon points="10.5 6.5 13.5 8.5 13.5 11.5 10.5 13.5 7.5 11.5 7.5 8.5 10.5 6.5" style="fill:none; stroke:#ff6f00; stroke-linecap:round; stroke-linejoin:round;"/><line x1="13.5" y1="8.5" x2="10.5" y2="10.5" style="fill:none; stroke:#ff6f00; stroke-linecap:round; stroke-linejoin:round;"/><path d="M6.02,13.31c-2.26-.58-4.01-2.44-4.42-4.76" style="fill:none; stroke:#ff6f00; stroke-linecap:round; stroke-linejoin:round;"/><path d="M1.84,5.5c.82-2.33,3.05-4,5.66-4,2.17,0,4.07,1.15,5.13,2.88" style="fill:none; stroke:#ff6f00; stroke-linecap:round; stroke-linejoin:round;"/></svg>
\ No newline at end of file
diff --git a/resources/images/lock_normal.svg b/resources/images/lock_normal.svg
index e585aba3f6..7abfb97480 100644
--- a/resources/images/lock_normal.svg
+++ b/resources/images/lock_normal.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><polyline points="0.5 2.5 0.5 5.5 3.5 5.5" style="fill:none;stroke:#ff6f00;stroke-linecap:round;stroke-linejoin:round"/><path d="M6.51,14.43A7,7,0,0,1,.571,8.5" style="fill:none;stroke:#ff6f00;stroke-linecap:round;stroke-linejoin:round"/><path d="M.79,5.5a7,7,0,0,1,13.639,1" style="fill:none;stroke:#ff6f00;stroke-linecap:round;stroke-linejoin:round"/><line x1="11.5" y1="14.5" x2="11.5" y2="11.5" style="fill:none;stroke:#ff6f00;stroke-linecap:round;stroke-linejoin:round"/><line x1="8.5" y1="9.5" x2="11.5" y2="11.5" style="fill:none;stroke:#ff6f00;stroke-linecap:round;stroke-linejoin:round"/><polygon points="11.5 7.5 14.5 9.5 14.5 12.5 11.5 14.5 8.5 12.5 8.5 9.5 11.5 7.5" style="fill:none;stroke:#ff6f00;stroke-linecap:round;stroke-linejoin:round"/><line x1="14.5" y1="9.5" x2="11.5" y2="11.5" style="fill:none;stroke:#ff6f00;stroke-linecap:round;stroke-linejoin:round"/></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"><polyline points="1.5 1.5 1.5 5.5 5.5 5.5" style="fill:none; stroke:#ff6f00; stroke-linecap:round; stroke-linejoin:round;"/><line x1="10.5" y1="13.5" x2="10.5" y2="10.5" style="fill:none; stroke:#ff6f00; stroke-linecap:round; stroke-linejoin:round;"/><line x1="7.5" y1="8.5" x2="10.5" y2="10.5" style="fill:none; stroke:#ff6f00; stroke-linecap:round; stroke-linejoin:round;"/><polygon points="10.5 6.5 13.5 8.5 13.5 11.5 10.5 13.5 7.5 11.5 7.5 8.5 10.5 6.5" style="fill:none; stroke:#ff6f00; stroke-linecap:round; stroke-linejoin:round;"/><line x1="13.5" y1="8.5" x2="10.5" y2="10.5" style="fill:none; stroke:#ff6f00; stroke-linecap:round; stroke-linejoin:round;"/><path d="M6.02,13.31c-2.26-.58-4.01-2.44-4.42-4.76" style="fill:none; stroke:#ff6f00; stroke-linecap:round; stroke-linejoin:round;"/><path d="M1.84,5.5c.82-2.33,3.05-4,5.66-4,2.17,0,4.07,1.15,5.13,2.88" style="fill:none; stroke:#ff6f00; stroke-linecap:round; stroke-linejoin:round;"/></svg>
\ No newline at end of file
diff --git a/resources/images/obj_variable_layer_height.svg b/resources/images/obj_variable_layer_height.svg
new file mode 100644
index 0000000000..801d3e4ad2
--- /dev/null
+++ b/resources/images/obj_variable_layer_height.svg
@@ -0,0 +1 @@
+<?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"><line x1="14.5" y1="14.5" x2=".55" y2="14.48" style="fill:none; stroke:#949494; stroke-linecap:square; stroke-linejoin:round;"/><line x1="14.5" y1="8.5" x2=".55" y2="8.48" style="fill:none; stroke:#009688; stroke-linecap:square; stroke-linejoin:round;"/><line x1="14.5" y1="12.5" x2=".55" y2="12.48" style="fill:none; stroke:#009688; stroke-linecap:square; stroke-linejoin:round;"/><line x1="14.5" y1="5.5" x2=".55" y2="5.48" style="fill:none; stroke:#009688; stroke-linecap:square; stroke-linejoin:round;"/><line x1="14.5" y1="2.5" x2=".55" y2="2.48" style="fill:none; stroke:#949494; stroke-linecap:square; stroke-linejoin:round;"/><line x1="14.5" y1=".5" x2=".55" y2=".48" style="fill:none; stroke:#949494; stroke-linecap:square; stroke-linejoin:round;"/></svg>
\ No newline at end of file
diff --git a/resources/images/page_down.svg b/resources/images/page_down.svg
index 077526b5a7..7a9b362b61 100644
--- a/resources/images/page_down.svg
+++ b/resources/images/page_down.svg
@@ -1,3 +1 @@
-<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6.99984 11.7394C5.74282 11.7394 4.53729 11.2401 3.64845 10.3512C2.7596 9.46238 2.26025 8.25685 2.26025 6.99984C2.26025 5.74282 2.7596 4.53729 3.64845 3.64845C4.53729 2.7596 5.74282 2.26025 6.99984 2.26025C8.25685 2.26025 9.46238 2.7596 10.3512 3.64845C11.2401 4.53729 11.7394 5.74282 11.7394 6.99984C11.7394 8.25685 11.2401 9.46238 10.3512 10.3512C9.46238 11.2401 8.25685 11.7394 6.99984 11.7394ZM6.99984 1.1665C5.45274 1.1665 3.96901 1.78109 2.87505 2.87505C1.78109 3.96901 1.1665 5.45274 1.1665 6.99984C1.1665 8.54693 1.78109 10.0307 2.87505 11.1246C3.96901 12.2186 5.45274 12.8332 6.99984 12.8332C8.54693 12.8332 10.0307 12.2186 11.1246 11.1246C12.2186 10.0307 12.8332 8.54693 12.8332 6.99984C12.8332 5.45274 12.2186 3.96901 11.1246 2.87505C10.0307 1.78109 8.54693 1.1665 6.99984 1.1665ZM4.24268 6.65804L6.61247 9.02783C6.82666 9.24202 7.17301 9.24202 7.38493 9.02783L9.757 6.65804C9.97119 6.44385 9.97119 6.09749 9.757 5.88558C9.54281 5.67367 9.19645 5.67139 8.98454 5.88558L7.00212 7.868L5.01969 5.88558C4.8055 5.67139 4.45915 5.67139 4.24723 5.88558C4.03532 6.09977 4.03304 6.44613 4.24723 6.65804H4.24268Z" fill="#6B6B6B"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 14 14"><circle cx="7" cy="7" r="5.5" style="fill:none; stroke:#949494; stroke-miterlimit:10; stroke-width:1px;"/><polyline points="4.5 6.5 7 8.5 9.5 6.5" style="fill:none; stroke:#949494; stroke-linecap:round; stroke-linejoin:round; stroke-width:1px;"/></svg>
\ No newline at end of file
diff --git a/resources/images/page_up.svg b/resources/images/page_up.svg
index 3a801242b2..d500df39a8 100644
--- a/resources/images/page_up.svg
+++ b/resources/images/page_up.svg
@@ -1,3 +1 @@
-<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6.99984 2.26025C8.25685 2.26025 9.46238 2.7596 10.3512 3.64845C11.2401 4.53729 11.7394 5.74282 11.7394 6.99984C11.7394 8.25685 11.2401 9.46238 10.3512 10.3512C9.46238 11.2401 8.25685 11.7394 6.99984 11.7394C5.74282 11.7394 4.53729 11.2401 3.64845 10.3512C2.7596 9.46238 2.26025 8.25685 2.26025 6.99984C2.26025 5.74282 2.7596 4.53729 3.64845 3.64845C4.53729 2.7596 5.74282 2.26025 6.99984 2.26025ZM6.99984 12.8332C8.54693 12.8332 10.0307 12.2186 11.1246 11.1246C12.2186 10.0307 12.8332 8.54693 12.8332 6.99984C12.8332 5.45274 12.2186 3.96901 11.1246 2.87505C10.0307 1.78109 8.54693 1.1665 6.99984 1.1665C5.45274 1.1665 3.96901 1.78109 2.87505 2.87505C1.78109 3.96901 1.1665 5.45274 1.1665 6.99984C1.1665 8.54693 1.78109 10.0307 2.87505 11.1246C3.96901 12.2186 5.45274 12.8332 6.99984 12.8332ZM9.757 7.34163L7.38721 4.97184C7.17301 4.75765 6.82666 4.75765 6.61475 4.97184L4.24268 7.34163C4.02848 7.55583 4.02848 7.90218 4.24268 8.11409C4.45687 8.32601 4.80322 8.32829 5.01514 8.11409L6.99756 6.13167L8.97998 8.11409C9.19417 8.32829 9.54053 8.32829 9.75244 8.11409C9.96436 7.8999 9.96663 7.55355 9.75244 7.34163H9.757Z" fill="#6B6B6B"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 14 14"><circle cx="7" cy="7" r="5.5" style="fill:none; stroke:#949494; stroke-miterlimit:10; stroke-width:1px;"/><polyline points="9.5 7.5 7 5.5 4.5 7.5" style="fill:none; stroke:#949494; stroke-linecap:round; stroke-linejoin:round; stroke-width:1px;"/></svg>
\ No newline at end of file
diff --git a/resources/images/param_advanced.svg b/resources/images/param_advanced.svg
index 86d13f71a7..d5bbb99a94 100644
--- a/resources/images/param_advanced.svg
+++ b/resources/images/param_advanced.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18"><path d="M10.848,14.8a21.022,21.022,0,0,1-4.08-5.3C4.559,5.674,3.543,2.124,4.5,1.572" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/><path d="M1.866,7.382A21,21,0,0,1,8.5,6.5c4.418,0,8,.895,8,2" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/><path d="M12.785,3.314A20.98,20.98,0,0,1,10.232,9.5C8.023,13.326,5.457,15.98,4.5,15.428" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/><circle cx="2.5" cy="7.5" r="1" style="fill:#009688;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"/><path d="M16.5,8.5c0,1.105-3.582,2-8,2s-8-.895-8-2c0-.414.5-.8,1.366-1.118" style="fill:none;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"/><circle cx="12.366" cy="3.804" r="1" style="fill:#009688;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"/><path d="M4.5,15.428c-.957-.552.059-4.1,2.268-7.928S11.543,1.02,12.5,1.572c.359.207.44.836.285,1.742" style="fill:none;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"/><circle cx="10.634" cy="14.196" r="1" style="fill:#009688;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"/><path d="M4.5,1.572c.957-.552,3.523,2.1,5.732,5.928s3.225,7.376,2.268,7.928c-.359.207-.944-.036-1.652-.624" style="fill:none;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"/></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="18" height="18" viewBox="0 0 18 18"><path d="M2.21,9.77c1.38.44,3.46.73,5.79.73,4.14,0,7.5-.9,7.5-2s-3.36-2-7.5-2S.5,7.4.5,8.5c0,.48.64.93,1.71,1.27" style="fill:none; stroke:#949494; stroke-linecap:round; stroke-linejoin:round; stroke-width:.8px;"/><circle cx="1.5" cy="8.5" r="1" style="fill:#009688; stroke:#009688; stroke-linecap:round; stroke-linejoin:round;"/><path d="M12,12.88c-.3-1.41-1.1-3.36-2.26-5.38C7.66,3.91,5.21,1.45,4.25,2c-.96.55-.05,3.91,2.02,7.5s4.53,6.05,5.48,5.5c.42-.24.48-1.02.25-2.12" style="fill:none; stroke:#949494; stroke-linecap:round; stroke-linejoin:round; stroke-width:.8px;"/><circle cx="11.25" cy="14.13" r="1" style="fill:#009688; stroke:#009688; stroke-linecap:round; stroke-linejoin:round;"/><path d="M9.79,2.85c-1.07.97-2.36,2.63-3.52,4.65-2.07,3.59-2.97,6.94-2.02,7.5.95.56,3.41-1.91,5.48-5.5s2.97-6.94,2.02-7.5c-.42-.24-1.12.09-1.96.85" style="fill:none; stroke:#949494; stroke-linecap:round; stroke-linejoin:round; stroke-width:.8px;"/><circle cx="11.25" cy="2.87" r="1" style="fill:#009688; stroke:#009688; stroke-linecap:round; stroke-linejoin:round;"/></svg>
\ No newline at end of file
diff --git a/resources/images/param_zig-zag.svg b/resources/images/param_zig-zag.svg
deleted file mode 100644
index 0c062058bc..0000000000
--- a/resources/images/param_zig-zag.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M15.5,22.5l-14-14m21,7-14-14m0,21-7-7m21-7-7-7M2.086,2.086,21.914,21.914" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round;opacity:0.75"/><path d="M8.5,22.5l14-14m-21,7,14-14m0,21,7-7m-21-7,7-7m13.414.586L2.086,21.914" style="fill:none;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"/><path d="M3.5,1.5h17a2,2,0,0,1,2,2v17a2,2,0,0,1-2,2H3.5a2,2,0,0,1-2-2V3.5A2,2,0,0,1,3.5,1.5Z" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/></svg>
\ No newline at end of file
diff --git a/resources/images/reset_gray.svg b/resources/images/reset_gray.svg
index 9e5578903e..dea3f8dcc5 100644
--- a/resources/images/reset_gray.svg
+++ b/resources/images/reset_gray.svg
@@ -1,3 +1 @@
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3.54857 9.22868C3.11861 9.22868 2.77271 8.88275 2.77271 8.45275V3.79717C2.77271 3.36718 3.11861 3.02124 3.54857 3.02124C3.97852 3.02124 4.32443 3.36718 4.32443 3.79717V6.38684L4.97098 5.62707C6.29641 4.03642 8.29749 3.02124 10.5313 3.02124C14.5302 3.02124 17.7727 6.26398 17.7727 10.2633C17.7727 14.2625 14.5302 17.5053 10.5313 17.5053C8.90202 17.5053 7.39555 16.9654 6.1865 16.0569C5.84383 15.7982 5.77594 15.3133 6.03133 14.9706C6.28671 14.6279 6.77486 14.56 7.11753 14.8154C8.06796 15.5299 9.24792 15.9534 10.5313 15.9534C13.6736 15.9534 16.221 13.4058 16.221 10.2633C16.221 7.12074 13.6736 4.5731 10.5313 4.5731C8.77594 4.5731 7.20482 5.36843 6.16064 6.62285L6.1574 6.62932L5.26516 7.67682H8.20374C8.6337 7.67682 8.9796 8.02276 8.9796 8.45275C8.9796 8.88275 8.6337 9.22868 8.20374 9.22868H3.54857Z" fill="#6B6B6B"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 14 14"><polyline points=".5 .5 .5 4.5 4.5 4.5" style="fill:none; stroke:#949494; stroke-linecap:round; stroke-linejoin:round;"/><path d="M.84,4.5C1.67,2.17,3.89.5,6.5.5c3.31,0,6,2.69,6,6s-2.69,6-6,6c-2.95,0-5.41-2.13-5.91-4.94" style="fill:none; stroke:#949494; stroke-linecap:round; stroke-linejoin:round;"/></svg>
\ No newline at end of file
diff --git a/resources/images/revert_btn.svg b/resources/images/revert_btn.svg
index 763a86ff76..ffcc5535f2 100644
--- a/resources/images/revert_btn.svg
+++ b/resources/images/revert_btn.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path d="M13.914,6.45A6.5,6.5,0,0,0,2,4.044V1.5a.5.5,0,0,0-1,0v4a.5.5,0,0,0,.5.5h4a.5.5,0,0,0,0-1H2.612a5.477,5.477,0,1,1-.54,3.388.5.5,0,1,0-.987.162,6.5,6.5,0,0,0,11.693,2.743A6.459,6.459,0,0,0,13.914,6.45Z" 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"><polyline points="1.5 1.5 1.5 5.5 5.5 5.5" style="fill:none; stroke:#ff6f00; stroke-linecap:round; stroke-linejoin:round;"/><path d="M1.84,5.5c.82-2.33,3.05-4,5.66-4,3.31,0,6,2.69,6,6s-2.69,6-6,6c-2.95,0-5.41-2.13-5.91-4.94" style="fill:none; stroke:#ff6f00; stroke-linecap:round; stroke-linejoin:round;"/></svg>
\ No newline at end of file
diff --git a/resources/images/single_slot_ams_item.svg b/resources/images/single_slot_ams_item.svg
index a1f94f84fc..edd4698500 100644
--- a/resources/images/single_slot_ams_item.svg
+++ b/resources/images/single_slot_ams_item.svg
@@ -1,12 +1 @@
-<svg width="29" height="33" viewBox="0 0 29 33" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M4.77881 0.447754C2.56967 0.447754 0.778809 2.23861 0.778809 4.44775V28.4478C0.778809 30.6569 2.56967 32.4478 4.77881 32.4478H24.7788C26.9879 32.4478 28.7788 30.6569 28.7788 28.4478V4.44775C28.7788 2.23861 26.9879 0.447754 24.7788 0.447754H4.77881ZM21.125 8.44775H9.41602V24.4478H21.125V8.44775Z" fill="white"/>
-<g clip-path="url(#clip0_20951_60572)">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M11.7788 16.7349H4.77881V28.7349H24.7788V16.7349H17.7788V18.9966C17.7788 20.6535 16.4357 21.9966 14.7788 21.9966C13.122 21.9966 11.7788 20.6535 11.7788 18.9966V16.7349Z" fill="#CECECE"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M11.9626 4.73486C9.09969 4.73486 6.77881 7.05574 6.77881 9.91868V16.7349H11.7788V12.9966C11.7788 11.3397 13.122 9.99658 14.7788 9.99658C16.4357 9.99658 17.7788 11.3397 17.7788 12.9966V16.7349H22.7788V9.91868C22.7788 7.05574 20.4579 4.73486 17.595 4.73486H11.9626Z" fill="#EEEEEE"/>
-</g>
-<defs>
-<clipPath id="clip0_20951_60572">
-<rect width="20" height="25" fill="white" transform="translate(4.77881 3.94775)"/>
-</clipPath>
-</defs>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" width="28" height="32" viewBox="0 0 28 32"><line x1="17.5" y1="8" x2="17.5" y2="24" style="fill:none; stroke:#949494;"/><line x1="9.5" y1="8" x2="9.5" y2="24" style="fill:none; stroke:#949494;"/><path d="M19.5,17V7.5c0-1.66-1.34-3-3-3h-6c-1.66,0-3,1.34-3,3v9.5" style="fill:none; stroke:#949494;"/><path d="M6,17v11h15v-11H6ZM12,20v-1c0-.55.45-1,1-1h1c.55,0,1,.45,1,1v1c0,.55-.45,1-1,1h-1c-.55,0-1-.45-1-1Z" style="fill:#949494; opacity:.7;"/></svg>
\ No newline at end of file
diff --git a/resources/images/single_slot_ams_item_dark.svg b/resources/images/single_slot_ams_item_dark.svg
index b259df0329..edd4698500 100644
--- a/resources/images/single_slot_ams_item_dark.svg
+++ b/resources/images/single_slot_ams_item_dark.svg
@@ -1,15 +1 @@
-<svg width="29" height="33" xmlns="http://www.w3.org/2000/svg" fill="none">
- <defs>
-  <clipPath id="clip0_20951_60572">
-   <rect id="svg_1" x="4.77881" y="3.94775" fill="white" height="25" width="20"/>
-  </clipPath>
- </defs>
- <g>
-  <title _mstTextHash="5637814" _mstHash="1">第 1 层</title>
-  <path id="svg_2" fill="#2d2d31" d="m4.77881,0.44775c-2.20914,0 -4,1.79086 -4,4l0,24.00005c0,2.2091 1.79086,4 4,4l19.99999,0c2.2091,0 4,-1.7909 4,-4l0,-24.00005c0,-2.20914 -1.7909,-4 -4,-4l-19.99999,0zm16.34619,8l-11.70898,0l0,16.00005l11.70898,0l0,-16.00005z" clip-rule="evenodd" fill-rule="evenodd"/>
-  <g id="svg_3" clip-path="url(#clip0_20951_60572)">
-   <path id="svg_4" fill="#CECECE" d="m11.7788,16.7349l-6.99999,0l0,12l19.99999,0l0,-12l-7,0l0,2.2617c0,1.6569 -1.3431,3 -3,3c-1.6568,0 -3,-1.3431 -3,-3l0,-2.2617z" clip-rule="evenodd" fill-rule="evenodd"/>
-   <path id="svg_5" fill="#EEEEEE" d="m11.9626,4.73486c-2.86291,0 -5.18379,2.32088 -5.18379,5.18382l0,6.81622l4.99999,0l0,-3.7383c0,-1.6569 1.3432,-3.00002 3,-3.00002c1.6569,0 3,1.34312 3,3.00002l0,3.7383l5,0l0,-6.81622c0,-2.86294 -2.3209,-5.18382 -5.1838,-5.18382l-5.6324,0z" clip-rule="evenodd" fill-rule="evenodd"/>
-  </g>
- </g>
-</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="28" height="32" viewBox="0 0 28 32"><line x1="17.5" y1="8" x2="17.5" y2="24" style="fill:none; stroke:#949494;"/><line x1="9.5" y1="8" x2="9.5" y2="24" style="fill:none; stroke:#949494;"/><path d="M19.5,17V7.5c0-1.66-1.34-3-3-3h-6c-1.66,0-3,1.34-3,3v9.5" style="fill:none; stroke:#949494;"/><path d="M6,17v11h15v-11H6ZM12,20v-1c0-.55.45-1,1-1h1c.55,0,1,.45,1,1v1c0,.55-.45,1-1,1h-1c-.55,0-1-.45-1-1Z" style="fill:#949494; opacity:.7;"/></svg>
\ No newline at end of file
diff --git a/resources/images/tab_multi_active.svg b/resources/images/tab_multi_active.svg
index dc776469e5..a005848cee 100644
--- a/resources/images/tab_multi_active.svg
+++ b/resources/images/tab_multi_active.svg
@@ -1,4 +1 @@
-<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M11.1861 5.32812H15.3642V14.5094H8.01917V13.5548M11.6917 5.65603V8.60717M11.1517 11.5583H13.2656" stroke="white"/>
-<path d="M6.30876 3.82009V6.77123M4.73482 9.72237H7.8827M2.63623 3.49219H9.98128V12.6735H2.63623V3.49219Z" stroke="white"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20"><line x1="4.5" y1="14.5" x2="10.5" y2="14.5" style="fill:none; stroke:#fff; stroke-linecap:square; stroke-miterlimit:10;"/><polyline points="8.5 10.5 7.5 11.5 6.5 10.5" style="fill:none; stroke:#fff; stroke-linecap:round; stroke-linejoin:round;"/><line x1="4.5" y1="9.5" x2="6" y2="9.5" style="fill:none; stroke:#fff; stroke-linecap:square; stroke-miterlimit:10;"/><line x1="9.5" y1="9.5" x2="10.5" y2="9.5" style="fill:none; stroke:#fff; stroke-linecap:square; stroke-miterlimit:10;"/><rect x="6.5" y="8.5" width="2" height="2" rx=".27" ry=".27" style="fill:none; stroke:#fff; stroke-miterlimit:10;"/><rect x="1.5" y="6.5" width="12" height="11" rx="1" ry="1" style="fill:none; stroke:#fff; stroke-miterlimit:10;"/><path d="M5.5,5v-1.5c0-.55.45-1,1-1h10c.55,0,1,.45,1,1v9c0,.55-.45,1-1,1h-1.5" style="fill:none; stroke:#fff; stroke-miterlimit:10;"/></svg>
\ No newline at end of file
diff --git a/resources/images/toolbar_double_directional_arrow.svg b/resources/images/toolbar_double_directional_arrow.svg
index 4cc9b2ecb3..b2b52621a0 100644
--- a/resources/images/toolbar_double_directional_arrow.svg
+++ b/resources/images/toolbar_double_directional_arrow.svg
@@ -1,8 +1 @@
-<svg width="251" height="252" viewBox="0 0 251 252" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8.53636 72.2536L67.482 9.08624" stroke="black" stroke-width="17.0079" stroke-miterlimit="10" stroke-linecap="round"/>
-<path d="M128.055 72.2536L67.482 9.08624" stroke="black" stroke-width="17.0079" stroke-miterlimit="10" stroke-linecap="round"/>
-<path d="M67.9763 243.004V8.79553" stroke="#161615" stroke-width="17.0079" stroke-miterlimit="10" stroke-linecap="round"/>
-<path d="M239.519 180L180.573 243.167" stroke="black" stroke-width="17.0079" stroke-miterlimit="10" stroke-linecap="round"/>
-<path d="M120 180L180.573 243.167" stroke="black" stroke-width="17.0079" stroke-miterlimit="10" stroke-linecap="round"/>
-<path d="M182.91 242.655V8.79999" stroke="#161615" stroke-width="17.0079" stroke-miterlimit="10" stroke-linecap="round"/>
-</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"><polyline points=".5 3.5 3.5 .5 6.5 3.5" style="fill:none; stroke:#949494; stroke-linecap:round; stroke-linejoin:round;"/><line x1="3.5" y1=".5" x2="3.5" y2="14.5" style="fill:none; stroke:#949494; stroke-linecap:round; stroke-linejoin:round;"/><polyline points="14.5 11.5 11.5 14.5 8.5 11.5" style="fill:none; stroke:#949494; stroke-linecap:round; stroke-linejoin:round;"/><line x1="11.5" y1="14.5" x2="11.5" y2=".5" style="fill:none; stroke:#949494; stroke-linecap:round; stroke-linejoin:round;"/></svg>
\ No newline at end of file
diff --git a/resources/images/toolbar_reset.svg b/resources/images/toolbar_reset.svg
index ad78b43e15..ffcc5535f2 100644
--- a/resources/images/toolbar_reset.svg
+++ b/resources/images/toolbar_reset.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 14 14"><path d="M13.914,6.45A6.5,6.5,0,0,0,2,4.044V1.5a.5.5,0,0,0-1,0v4a.5.5,0,0,0,.5.5h4a.5.5,0,0,0,0-1H2.612a5.477,5.477,0,1,1-.54,3.388.5.5,0,1,0-.987.162,6.5,6.5,0,0,0,11.693,2.743A6.459,6.459,0,0,0,13.914,6.45Z" 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"><polyline points="1.5 1.5 1.5 5.5 5.5 5.5" style="fill:none; stroke:#ff6f00; stroke-linecap:round; stroke-linejoin:round;"/><path d="M1.84,5.5c.82-2.33,3.05-4,5.66-4,3.31,0,6,2.69,6,6s-2.69,6-6,6c-2.95,0-5.41-2.13-5.91-4.94" style="fill:none; stroke:#ff6f00; stroke-linecap:round; stroke-linejoin:round;"/></svg>
\ No newline at end of file
diff --git a/resources/images/toolbar_reset_hover.svg b/resources/images/toolbar_reset_hover.svg
index ad78b43e15..ffcc5535f2 100644
--- a/resources/images/toolbar_reset_hover.svg
+++ b/resources/images/toolbar_reset_hover.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 14 14"><path d="M13.914,6.45A6.5,6.5,0,0,0,2,4.044V1.5a.5.5,0,0,0-1,0v4a.5.5,0,0,0,.5.5h4a.5.5,0,0,0,0-1H2.612a5.477,5.477,0,1,1-.54,3.388.5.5,0,1,0-.987.162,6.5,6.5,0,0,0,11.693,2.743A6.459,6.459,0,0,0,13.914,6.45Z" 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"><polyline points="1.5 1.5 1.5 5.5 5.5 5.5" style="fill:none; stroke:#ff6f00; stroke-linecap:round; stroke-linejoin:round;"/><path d="M1.84,5.5c.82-2.33,3.05-4,5.66-4,3.31,0,6,2.69,6,6s-2.69,6-6,6c-2.95,0-5.41-2.13-5.91-4.94" style="fill:none; stroke:#ff6f00; stroke-linecap:round; stroke-linejoin:round;"/></svg>
\ No newline at end of file
diff --git a/resources/images/toolbar_reset_zero.svg b/resources/images/toolbar_reset_zero.svg
index 10be9c46fc..07ce4a5fd2 100644
--- a/resources/images/toolbar_reset_zero.svg
+++ b/resources/images/toolbar_reset_zero.svg
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 14 14"><rect x="9.5" y="7.5" width="4" height="6" rx="1" ry="1" style="fill:none; stroke:#ff6f00; stroke-linecap:round; stroke-linejoin:round;"/><polyline points="1.5 1.5 1.5 5.5 5.5 5.5" style="fill:none; stroke:#ff6f00; stroke-linecap:round; stroke-linejoin:round;"/><path d="M6.79,13.46c-2.59-.31-4.77-2.29-5.21-4.99" style="fill:none; stroke:#ff6f00; stroke-linecap:round; stroke-linejoin:round;"/><path d="M2.03,5.03c.8-1.77,2.44-3.12,4.5-3.46,2.73-.45,5.33,1.03,6.43,3.43" style="fill:none; stroke:#ff6f00; stroke-linecap:round; stroke-linejoin:round;"/></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="9.5" y="7.5" width="4" height="6" rx="1" ry="1" style="fill:none; stroke:#ff6f00; stroke-linecap:round; stroke-linejoin:round;"/><polyline points="1.5 1.5 1.5 5.5 5.5 5.5" style="fill:none; stroke:#ff6f00; stroke-linecap:round; stroke-linejoin:round;"/><path d="M6.53,13.42c-2.51-.41-4.49-2.37-4.93-4.86" style="fill:none; stroke:#ff6f00; stroke-linecap:round; stroke-linejoin:round;"/><path d="M1.84,5.5c.82-2.33,3.05-4,5.66-4,2.17,0,4.07,1.15,5.13,2.88" style="fill:none; stroke:#ff6f00; stroke-linecap:round; stroke-linejoin:round;"/></svg>
\ No newline at end of file
diff --git a/resources/images/toolbar_reset_zero_hover.svg b/resources/images/toolbar_reset_zero_hover.svg
index 10be9c46fc..07ce4a5fd2 100644
--- a/resources/images/toolbar_reset_zero_hover.svg
+++ b/resources/images/toolbar_reset_zero_hover.svg
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 14 14"><rect x="9.5" y="7.5" width="4" height="6" rx="1" ry="1" style="fill:none; stroke:#ff6f00; stroke-linecap:round; stroke-linejoin:round;"/><polyline points="1.5 1.5 1.5 5.5 5.5 5.5" style="fill:none; stroke:#ff6f00; stroke-linecap:round; stroke-linejoin:round;"/><path d="M6.79,13.46c-2.59-.31-4.77-2.29-5.21-4.99" style="fill:none; stroke:#ff6f00; stroke-linecap:round; stroke-linejoin:round;"/><path d="M2.03,5.03c.8-1.77,2.44-3.12,4.5-3.46,2.73-.45,5.33,1.03,6.43,3.43" style="fill:none; stroke:#ff6f00; stroke-linecap:round; stroke-linejoin:round;"/></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="9.5" y="7.5" width="4" height="6" rx="1" ry="1" style="fill:none; stroke:#ff6f00; stroke-linecap:round; stroke-linejoin:round;"/><polyline points="1.5 1.5 1.5 5.5 5.5 5.5" style="fill:none; stroke:#ff6f00; stroke-linecap:round; stroke-linejoin:round;"/><path d="M6.53,13.42c-2.51-.41-4.49-2.37-4.93-4.86" style="fill:none; stroke:#ff6f00; stroke-linecap:round; stroke-linejoin:round;"/><path d="M1.84,5.5c.82-2.33,3.05-4,5.66-4,2.17,0,4.07,1.15,5.13,2.88" style="fill:none; stroke:#ff6f00; stroke-linecap:round; stroke-linejoin:round;"/></svg>
\ No newline at end of file
diff --git a/resources/images/undo.svg b/resources/images/undo.svg
index 763a86ff76..ffcc5535f2 100644
--- a/resources/images/undo.svg
+++ b/resources/images/undo.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path d="M13.914,6.45A6.5,6.5,0,0,0,2,4.044V1.5a.5.5,0,0,0-1,0v4a.5.5,0,0,0,.5.5h4a.5.5,0,0,0,0-1H2.612a5.477,5.477,0,1,1-.54,3.388.5.5,0,1,0-.987.162,6.5,6.5,0,0,0,11.693,2.743A6.459,6.459,0,0,0,13.914,6.45Z" 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"><polyline points="1.5 1.5 1.5 5.5 5.5 5.5" style="fill:none; stroke:#ff6f00; stroke-linecap:round; stroke-linejoin:round;"/><path d="M1.84,5.5c.82-2.33,3.05-4,5.66-4,3.31,0,6,2.69,6,6s-2.69,6-6,6c-2.95,0-5.41-2.13-5.91-4.94" style="fill:none; stroke:#ff6f00; stroke-linecap:round; stroke-linejoin:round;"/></svg>
\ No newline at end of file
diff --git a/resources/profiles/Anycubic/machine/Anycubic Kobra S1 0.4 nozzle.json b/resources/profiles/Anycubic/machine/Anycubic Kobra S1 0.4 nozzle.json
index 3ea31a77ae..2c42cc077b 100644
--- a/resources/profiles/Anycubic/machine/Anycubic Kobra S1 0.4 nozzle.json	
+++ b/resources/profiles/Anycubic/machine/Anycubic Kobra S1 0.4 nozzle.json	
@@ -41,7 +41,7 @@
     "before_layer_change_gcode": "; BEFORE_LAYER_CHANGE [layer_num] @ [layer_z]mm",
     "best_object_pos": "0.5,0.5",
     "change_extrusion_role_gcode": "",
-    "change_filament_gcode": "",
+    "change_filament_gcode": "; FLUSH_START\n;;; M400 P0\nT[next_extruder] ; change extruder\n; 1\n;;; G90\n;;; G1 Z{toolchange_z+2} F480\n;;; G1 X261 Y25 F12000\n;;; G1 Y1 F600\n;;; M400 P2730\n;;; G1 Y25 F3000\n;;; M400 P76250\n;;; M400 P35780\n; 2.1\n;;; G90\n;;; G1 Z{toolchange_z+2} F480\n;;; G1 X47 Y230 F12000\n;;; M400 P0\n; 2.2\n;;; G1 X47 Y276 F600\n;;; G1 X47 Y230 F12000\n;;; G1 X47 Y276 F600\n;;; G1 X47 Y230 F12000\n; 3.1\n;;; G1 F36000\n;;; G1 Y250\n;;; G1 F8000\n;;; G1 X81\n;;; G1 Y273\n; 3.2\n;;; G1 F8000\n;;; G1 X96\n;;; G1 X81\n;;; G1 F8000\n;;; G1 X96\n;;; G1 X81\n;;; G1 F8000\n;;; G1 X96\n;;; G1 X81\n;;; G1 X96\n;;; G1 X81\n;;; G1 X96\n;;; G1 X81\n;;; G1 X96\n;;; G1 X81\n; 3.3\n;;; G1 X72\n;;; G1 X77\n;;; G1 Z{toolchange_z}\n;;; M400 P0\n; FLUSH_END",
     "cooling_tube_length": "0",
     "cooling_tube_retraction": "0",
     "deretraction_speed": [
@@ -228,4 +228,4 @@
         "Slope Lift"
     ],
     "z_offset": "0"
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/OrcaFilamentLibrary.json b/resources/profiles/OrcaFilamentLibrary.json
index ca80b86d12..1f4b2cf779 100644
--- a/resources/profiles/OrcaFilamentLibrary.json
+++ b/resources/profiles/OrcaFilamentLibrary.json
@@ -1212,9 +1212,80 @@
             "name": "COEX PLA+Silk @System",
             "sub_path": "filament/COEX/COEX PLA+Silk @System.json"
         },
-        {
-            "name": "Numakers PLA+ @System",
+        {   "name": "Numakers PLA+ @System",
             "sub_path": "filament/Numakers/Numakers PLA+ @System.json"
+        },
+        {
+            "name": "Eolas Prints PLA Premium @System",
+            "sub_path": "filament/Eolas Prints/Eolas Prints PLA Premium @System.json"
+        },
+        {
+            "name": "Eolas Prints PLA Matte @System",
+            "sub_path": "filament/Eolas Prints/Eolas Prints PLA Matte @System.json"
+        },
+        {
+            "name": "Eolas Prints PLA Silk @System",
+            "sub_path": "filament/Eolas Prints/Eolas Prints PLA Silk @System.json"
+        },
+        {
+            "name": "Eolas Prints PLA Neon @System",
+            "sub_path": "filament/Eolas Prints/Eolas Prints PLA Neon @System.json"
+        },
+        {
+            "name": "Eolas Prints PLA High Speed @System",
+            "sub_path": "filament/Eolas Prints/Eolas Prints PLA High Speed @System.json"
+        },
+        {
+            "name": "Eolas Prints PLA INGEO 850 @System",
+            "sub_path": "filament/Eolas Prints/Eolas Prints PLA INGEO 850 @System.json"
+        },
+        {
+            "name": "Eolas Prints PLA INGEO 870 @System",
+            "sub_path": "filament/Eolas Prints/Eolas Prints PLA INGEO 870 @System.json"
+        },
+        {
+            "name": "Eolas Prints PLA Antibacterial @System",
+            "sub_path": "filament/Eolas Prints/Eolas Prints PLA Antibacterial @System.json"
+        },
+        {
+            "name": "Eolas Prints PLA Transition @System",
+            "sub_path": "filament/Eolas Prints/Eolas Prints PLA Transition @System.json"
+        },
+        {
+            "name": "Eolas Prints PETG @System",
+            "sub_path": "filament/Eolas Prints/Eolas Prints PETG @System.json"
+        },
+        {
+            "name": "Eolas Prints PETG UV Resistant @System",
+            "sub_path": "filament/Eolas Prints/Eolas Prints PETG UV Resistant @System.json"
+        },
+        {
+            "name": "Eolas Prints PETG Transition @System",
+            "sub_path": "filament/Eolas Prints/Eolas Prints PETG Transition @System.json"
+        },
+        {
+            "name": "Eolas Prints TPU Flex 93A @System",
+            "sub_path": "filament/Eolas Prints/Eolas Prints TPU Flex 93A @System.json"
+        },
+        {
+            "name": "Eolas Prints TPU Flex D53 @System",
+            "sub_path": "filament/Eolas Prints/Eolas Prints TPU Flex D53 @System.json"
+        },
+        {
+            "name": "Eolas Prints TPU Flex D60 UV Resistant @System",
+            "sub_path": "filament/Eolas Prints/Eolas Prints TPU Flex D60 UV Resistant @System.json"
+        },
+        {
+            "name": "Eolas Prints TPU Transition @System",
+            "sub_path": "filament/Eolas Prints/Eolas Prints TPU Transition @System.json"
+        },
+        {
+            "name": "Eolas Prints ABS @System",
+            "sub_path": "filament/Eolas Prints/Eolas Prints ABS @System.json"
+        },
+        {
+            "name": "Eolas Prints ASA @System",
+            "sub_path": "filament/Eolas Prints/Eolas Prints ASA @System.json"
         }
     ],
     "process_list": [],
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints ABS @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints ABS @System.json
new file mode 100644
index 0000000000..bf8afa8b31
--- /dev/null
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints ABS @System.json	
@@ -0,0 +1,23 @@
+{
+    "type": "filament",
+    "filament_id": "GFSEP017",
+    "setting_id": "GFSEP017_00",
+    "name": "Eolas Prints ABS @System",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_filament_abs",
+    "filament_color": ["#4d9398"],
+    "filament_vendor": ["Eolas Prints"],
+    "filament_type": ["ABS"],
+    "nozzle_temperature": ["255"],
+    "nozzle_temperature_initial_layer": ["260"],
+    "nozzle_temperature_range_low": ["240"],
+    "nozzle_temperature_range_high": ["270"],
+    "hot_plate_temp": ["100"],
+    "hot_plate_temp_initial_layer": ["105"],
+    "chamber_temperature": ["40"],
+    "filament_density": ["1.04"],
+    "filament_cost": ["19.50"],
+    "filament_spool_weight": ["900"],
+    "filament_max_volumetric_speed": ["18"]
+}
\ No newline at end of file
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints ASA @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints ASA @System.json
new file mode 100644
index 0000000000..21d7ef887b
--- /dev/null
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints ASA @System.json	
@@ -0,0 +1,23 @@
+{
+    "type": "filament",
+    "filament_id": "GFSEP018",
+    "setting_id": "GFSEP018_00",
+    "name": "Eolas Prints ASA @System",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_filament_asa",
+    "filament_color": ["#4d9398"],
+    "filament_vendor": ["Eolas Prints"],
+    "filament_type": ["ASA"],
+    "nozzle_temperature": ["260"],
+    "nozzle_temperature_initial_layer": ["270"],
+    "nozzle_temperature_range_low": ["245"],
+    "nozzle_temperature_range_high": ["275"],
+    "hot_plate_temp": ["100"],
+    "hot_plate_temp_initial_layer": ["105"],
+    "chamber_temperature": ["40"],
+    "filament_density": ["1.07"],
+    "filament_cost": ["22.50"],
+    "filament_spool_weight": ["900"],
+    "filament_max_volumetric_speed": ["18"]
+}
\ No newline at end of file
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PETG @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PETG @System.json
new file mode 100644
index 0000000000..6f02d13138
--- /dev/null
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PETG @System.json	
@@ -0,0 +1,22 @@
+{
+    "type": "filament",
+    "filament_id": "GFSEP010",
+    "setting_id": "GFSEP010_00",
+    "name": "Eolas Prints PETG @System",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_filament_pet",
+    "filament_color": ["#4d9398"],
+    "filament_vendor": ["Eolas Prints"],
+    "filament_type": ["PETG"],
+    "nozzle_temperature": ["240"],
+    "nozzle_temperature_initial_layer": ["245"],
+    "nozzle_temperature_range_low": ["230"],
+    "nozzle_temperature_range_high": ["260"],
+    "hot_plate_temp": ["80"],
+    "hot_plate_temp_initial_layer": ["85"],
+    "filament_density": ["1.27"],
+    "filament_cost": ["25.50"],
+    "filament_spool_weight": ["1000"],
+    "filament_max_volumetric_speed": ["15"]
+}
\ No newline at end of file
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PETG Transition @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PETG Transition @System.json
new file mode 100644
index 0000000000..d9e125b8ff
--- /dev/null
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PETG Transition @System.json	
@@ -0,0 +1,22 @@
+{
+    "type": "filament",
+    "filament_id": "GFSEP012",
+    "setting_id": "GFSEP012_00",
+    "name": "Eolas Prints PETG Transition @System",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_filament_pet",
+    "filament_color": ["#4d9398"],
+    "filament_vendor": ["Eolas Prints"],
+    "filament_type": ["PETG"],
+    "nozzle_temperature": ["240"],
+    "nozzle_temperature_initial_layer": ["245"],
+    "nozzle_temperature_range_low": ["230"],
+    "nozzle_temperature_range_high": ["260"],
+    "hot_plate_temp": ["80"],
+    "hot_plate_temp_initial_layer": ["85"],
+    "filament_density": ["1.27"],
+    "filament_cost": ["17.40"],
+    "filament_spool_weight": ["1000"],
+    "filament_max_volumetric_speed": ["15"]
+}
\ No newline at end of file
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PETG UV Resistant @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PETG UV Resistant @System.json
new file mode 100644
index 0000000000..8810346918
--- /dev/null
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PETG UV Resistant @System.json	
@@ -0,0 +1,22 @@
+{
+    "type": "filament",
+    "filament_id": "GFSEP011",
+    "setting_id": "GFSEP011_00",
+    "name": "Eolas Prints PETG UV Resistant @System",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_filament_pet",
+    "filament_color": ["#4d9398"],
+    "filament_vendor": ["Eolas Prints"],
+    "filament_type": ["PETG"],
+    "nozzle_temperature": ["245"],
+    "nozzle_temperature_initial_layer": ["250"],
+    "nozzle_temperature_range_low": ["235"],
+    "nozzle_temperature_range_high": ["265"],
+    "hot_plate_temp": ["80"],
+    "hot_plate_temp_initial_layer": ["85"],
+    "filament_density": ["1.27"],
+    "filament_cost": ["30.50"],
+    "filament_spool_weight": ["1000"],
+    "filament_max_volumetric_speed": ["15"]
+}
\ No newline at end of file
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA Antibacterial @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA Antibacterial @System.json
new file mode 100644
index 0000000000..b41e563301
--- /dev/null
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA Antibacterial @System.json	
@@ -0,0 +1,22 @@
+{
+    "type": "filament",
+    "filament_id": "GFSEP008",
+    "setting_id": "GFSEP008_00",
+    "name": "Eolas Prints PLA Antibacterial @System",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_filament_pla",
+    "filament_color": ["#4d9398"],
+    "filament_vendor": ["Eolas Prints"],
+    "filament_type": ["PLA"],
+    "nozzle_temperature": ["216"],
+    "nozzle_temperature_initial_layer": ["220"],
+    "nozzle_temperature_range_low": ["195"],
+    "nozzle_temperature_range_high": ["230"],
+    "hot_plate_temp": ["60"],
+    "hot_plate_temp_initial_layer": ["60"],
+    "filament_density": ["1.24"],
+    "filament_cost": ["30.50"],
+    "filament_spool_weight": ["1000"],
+    "filament_max_volumetric_speed": ["15"]
+}
\ No newline at end of file
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA High Speed @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA High Speed @System.json
new file mode 100644
index 0000000000..fd41493192
--- /dev/null
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA High Speed @System.json	
@@ -0,0 +1,22 @@
+{
+    "type": "filament",
+    "filament_id": "GFSEP005",
+    "setting_id": "GFSEP005_00",
+    "name": "Eolas Prints PLA High Speed @System",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_filament_pla",
+    "filament_color": ["#4d9398"],
+    "filament_vendor": ["Eolas Prints"],
+    "filament_type": ["PLA"],
+    "nozzle_temperature": ["220"],
+    "nozzle_temperature_initial_layer": ["220"],
+    "nozzle_temperature_range_low": ["210"],
+    "nozzle_temperature_range_high": ["240"],
+    "hot_plate_temp": ["60"],
+    "hot_plate_temp_initial_layer": ["60"],
+    "filament_density": ["1.24"],
+    "filament_cost": ["25.50"],
+    "filament_spool_weight": ["1000"],
+    "filament_max_volumetric_speed": ["17.8"]
+}
\ No newline at end of file
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA INGEO 850 @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA INGEO 850 @System.json
new file mode 100644
index 0000000000..ccef240d17
--- /dev/null
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA INGEO 850 @System.json	
@@ -0,0 +1,22 @@
+{
+    "type": "filament",
+    "filament_id": "GFSEP006",
+    "setting_id": "GFSEP006_00",
+    "name": "Eolas Prints PLA INGEO 850 @System",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_filament_pla",
+    "filament_color": ["#4d9398"],
+    "filament_vendor": ["Eolas Prints"],
+    "filament_type": ["PLA"],
+    "nozzle_temperature": ["210"],
+    "nozzle_temperature_initial_layer": ["215"],
+    "nozzle_temperature_range_low": ["190"],
+    "nozzle_temperature_range_high": ["230"],
+    "hot_plate_temp": ["60"],
+    "hot_plate_temp_initial_layer": ["60"],
+    "filament_density": ["1.24"],
+    "filament_cost": ["25.50"],
+    "filament_spool_weight": ["1000"],
+    "filament_max_volumetric_speed": ["15"]
+}
\ No newline at end of file
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA INGEO 870 @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA INGEO 870 @System.json
new file mode 100644
index 0000000000..da7ebe735d
--- /dev/null
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA INGEO 870 @System.json	
@@ -0,0 +1,22 @@
+{
+    "type": "filament",
+    "filament_id": "GFSEP007",
+    "setting_id": "GFSEP007_00",
+    "name": "Eolas Prints PLA INGEO 870 @System",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_filament_pla",
+    "filament_color": ["#4d9398"],
+    "filament_vendor": ["Eolas Prints"],
+    "filament_type": ["PLA"],
+    "nozzle_temperature": ["220"],
+    "nozzle_temperature_initial_layer": ["225"],
+    "nozzle_temperature_range_low": ["200"],
+    "nozzle_temperature_range_high": ["235"],
+    "hot_plate_temp": ["60"],
+    "hot_plate_temp_initial_layer": ["60"],
+    "filament_density": ["1.22"],
+    "filament_cost": ["30.50"],
+    "filament_spool_weight": ["1000"],
+    "filament_max_volumetric_speed": ["15"]
+}
\ No newline at end of file
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA Matte @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA Matte @System.json
new file mode 100644
index 0000000000..5c90dff774
--- /dev/null
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA Matte @System.json	
@@ -0,0 +1,22 @@
+{
+    "type": "filament",
+    "filament_id": "GFSEP002",
+    "setting_id": "GFSEP002_00",
+    "name": "Eolas Prints PLA Matte @System",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_filament_pla",
+    "filament_color": ["#4d9398"],
+    "filament_vendor": ["Eolas Prints"],
+    "filament_type": ["PLA"],
+    "nozzle_temperature": ["215"],
+    "nozzle_temperature_initial_layer": ["220"],
+    "nozzle_temperature_range_low": ["200"],
+    "nozzle_temperature_range_high": ["230"],
+    "hot_plate_temp": ["60"],
+    "hot_plate_temp_initial_layer": ["60"],
+    "filament_density": ["1.24"],
+    "filament_cost": ["25.50"],
+    "filament_spool_weight": ["1000"],
+    "filament_max_volumetric_speed": ["15"]
+}
\ No newline at end of file
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA Neon @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA Neon @System.json
new file mode 100644
index 0000000000..857924f75a
--- /dev/null
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA Neon @System.json	
@@ -0,0 +1,22 @@
+{
+    "type": "filament",
+    "filament_id": "GFSEP004",
+    "setting_id": "GFSEP004_00",
+    "name": "Eolas Prints PLA Neon @System",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_filament_pla",
+    "filament_color": ["#4d9398"],
+    "filament_vendor": ["Eolas Prints"],
+    "filament_type": ["PLA"],
+    "nozzle_temperature": ["210"],
+    "nozzle_temperature_initial_layer": ["215"],
+    "nozzle_temperature_range_low": ["200"],
+    "nozzle_temperature_range_high": ["230"],
+    "hot_plate_temp": ["60"],
+    "hot_plate_temp_initial_layer": ["60"],
+    "filament_density": ["1.24"],
+    "filament_cost": ["25.50"],
+    "filament_spool_weight": ["1000"],
+    "filament_max_volumetric_speed": ["10"]
+}
\ No newline at end of file
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA Premium @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA Premium @System.json
new file mode 100644
index 0000000000..ceeaabbcf5
--- /dev/null
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA Premium @System.json	
@@ -0,0 +1,22 @@
+{
+    "type": "filament",
+    "filament_id": "GFSEP001",
+    "setting_id": "GFSEP001_00",
+    "name": "Eolas Prints PLA Premium @System",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_filament_pla",
+    "filament_color": ["#4d9398"],
+    "filament_vendor": ["Eolas Prints"],
+    "filament_type": ["PLA"],
+    "nozzle_temperature": ["210"],
+    "nozzle_temperature_initial_layer": ["215"],
+    "nozzle_temperature_range_low": ["190"],
+    "nozzle_temperature_range_high": ["230"],
+    "hot_plate_temp": ["60"],
+    "hot_plate_temp_initial_layer": ["60"],
+    "filament_density": ["1.24"],
+    "filament_cost": ["19.90"],
+    "filament_spool_weight": ["1000"],
+    "filament_max_volumetric_speed": ["15"]
+}
\ No newline at end of file
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA Silk @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA Silk @System.json
new file mode 100644
index 0000000000..0409a36e12
--- /dev/null
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA Silk @System.json	
@@ -0,0 +1,22 @@
+{
+    "type": "filament",
+    "filament_id": "GFSEP003",
+    "setting_id": "GFSEP003_00",
+    "name": "Eolas Prints PLA Silk @System",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_filament_pla",
+    "filament_color": ["#4d9398"],
+    "filament_vendor": ["Eolas Prints"],
+    "filament_type": ["PLA"],
+    "nozzle_temperature": ["215"],
+    "nozzle_temperature_initial_layer": ["220"],
+    "nozzle_temperature_range_low": ["205"],
+    "nozzle_temperature_range_high": ["235"],
+    "hot_plate_temp": ["60"],
+    "hot_plate_temp_initial_layer": ["60"],
+    "filament_density": ["1.24"],
+    "filament_cost": ["25.50"],
+    "filament_spool_weight": ["1000"],
+    "filament_max_volumetric_speed": ["8"]
+}
\ No newline at end of file
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA Transition @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA Transition @System.json
new file mode 100644
index 0000000000..0804a78a64
--- /dev/null
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA Transition @System.json	
@@ -0,0 +1,22 @@
+{
+    "type": "filament",
+    "filament_id": "GFSEP009",
+    "setting_id": "GFSEP009_00",
+    "name": "Eolas Prints PLA Transition @System",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_filament_pla",
+    "filament_color": ["#4d9398"],
+    "filament_vendor": ["Eolas Prints"],
+    "filament_type": ["PLA"],
+    "nozzle_temperature": ["210"],
+    "nozzle_temperature_initial_layer": ["215"],
+    "nozzle_temperature_range_low": ["200"],
+    "nozzle_temperature_range_high": ["230"],
+    "hot_plate_temp": ["60"],
+    "hot_plate_temp_initial_layer": ["60"],
+    "filament_density": ["1.24"],
+    "filament_cost": ["13.90"],
+    "filament_spool_weight": ["1000"],
+    "filament_max_volumetric_speed": ["15"]
+}
\ No newline at end of file
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints TPU Flex 93A @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints TPU Flex 93A @System.json
new file mode 100644
index 0000000000..90cc77ff33
--- /dev/null
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints TPU Flex 93A @System.json	
@@ -0,0 +1,22 @@
+{
+    "type": "filament",
+    "filament_id": "GFSEP013",
+    "setting_id": "GFSEP013_00",
+    "name": "Eolas Prints TPU Flex 93A @System",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_filament_tpu",
+    "filament_color": ["#4d9398"],
+    "filament_vendor": ["Eolas Prints"],
+    "filament_type": ["TPU"],
+    "nozzle_temperature": ["220"],
+    "nozzle_temperature_initial_layer": ["225"],
+    "nozzle_temperature_range_low": ["210"],
+    "nozzle_temperature_range_high": ["240"],
+    "hot_plate_temp": ["50"],
+    "hot_plate_temp_initial_layer": ["55"],
+    "filament_density": ["1.21"],
+    "filament_cost": ["34.99"],
+    "filament_spool_weight": ["1000"],
+    "filament_max_volumetric_speed": ["6"]
+}
\ No newline at end of file
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints TPU Flex D53 @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints TPU Flex D53 @System.json
new file mode 100644
index 0000000000..96237eb712
--- /dev/null
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints TPU Flex D53 @System.json	
@@ -0,0 +1,22 @@
+{
+    "type": "filament",
+    "filament_id": "GFSEP014",
+    "setting_id": "GFSEP014_00",
+    "name": "Eolas Prints TPU Flex D53 @System",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_filament_tpu",
+    "filament_color": ["#4d9398"],
+    "filament_vendor": ["Eolas Prints"],
+    "filament_type": ["TPU"],
+    "nozzle_temperature": ["220"],
+    "nozzle_temperature_initial_layer": ["225"],
+    "nozzle_temperature_range_low": ["205"],
+    "nozzle_temperature_range_high": ["235"],
+    "hot_plate_temp": ["45"],
+    "hot_plate_temp_initial_layer": ["50"],
+    "filament_density": ["1.17"],
+    "filament_cost": ["38.50"],
+    "filament_spool_weight": ["1000"],
+    "filament_max_volumetric_speed": ["8"]
+}
\ No newline at end of file
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints TPU Flex D60 UV Resistant @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints TPU Flex D60 UV Resistant @System.json
new file mode 100644
index 0000000000..e88f950722
--- /dev/null
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints TPU Flex D60 UV Resistant @System.json	
@@ -0,0 +1,22 @@
+{
+    "type": "filament",
+    "filament_id": "GFSEP015",
+    "setting_id": "GFSEP015_00",
+    "name": "Eolas Prints TPU D60 UV Resistant @System",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_filament_tpu",
+    "filament_color": ["#4d9398"],
+    "filament_vendor": ["Eolas Prints"],
+    "filament_type": ["TPU"],
+    "nozzle_temperature": ["225"],
+    "nozzle_temperature_initial_layer": ["230"],
+    "nozzle_temperature_range_low": ["215"],
+    "nozzle_temperature_range_high": ["245"],
+    "hot_plate_temp": ["55"],
+    "hot_plate_temp_initial_layer": ["60"],
+    "filament_density": ["1.16"],
+    "filament_cost": ["37.90"],
+    "filament_spool_weight": ["1000"],
+    "filament_max_volumetric_speed": ["8"]
+}
\ No newline at end of file
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints TPU Transition @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints TPU Transition @System.json
new file mode 100644
index 0000000000..c1029399d4
--- /dev/null
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints TPU Transition @System.json	
@@ -0,0 +1,22 @@
+{
+    "type": "filament",
+    "filament_id": "GFSEP016",
+    "setting_id": "GFSEP016_00",
+    "name": "Eolas Prints TPU Transition @System",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_filament_tpu",
+    "filament_color": ["#4d9398"],
+    "filament_vendor": ["Eolas Prints"],
+    "filament_type": ["TPU"],
+    "nozzle_temperature": ["220"],
+    "nozzle_temperature_initial_layer": ["225"],
+    "nozzle_temperature_range_low": ["210"],
+    "nozzle_temperature_range_high": ["240"],
+    "hot_plate_temp": ["50"],
+    "hot_plate_temp_initial_layer": ["55"],
+    "filament_density": ["1.21"],
+    "filament_cost": ["22.50"],
+    "filament_spool_weight": ["1000"],
+    "filament_max_volumetric_speed": ["5"]
+}
\ No newline at end of file
diff --git a/resources/profiles/Prusa/machine/Prusa MINIIS 0.4 nozzle.json b/resources/profiles/Prusa/machine/Prusa MINIIS 0.4 nozzle.json
index 6f7bd1649a..b63413d8ce 100644
--- a/resources/profiles/Prusa/machine/Prusa MINIIS 0.4 nozzle.json	
+++ b/resources/profiles/Prusa/machine/Prusa MINIIS 0.4 nozzle.json	
@@ -94,6 +94,9 @@
     ],
     "z_hop": [
         "0.2"
+    ],
+        "machine_max_junction_deviation": [
+        "0.01"
     ],
     "fan_speedup_time": "0.2",
     "fan_speedup_overhangs": "1",
@@ -102,7 +105,7 @@
     "printable_height": "180",
     "machine_end_gcode": "{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+2, max_print_height)} F720 ; Move print head up{endif}\nG1 X170 Y170 F4200 ; park print head\n{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+50, max_print_height)} F720 ; Move print head further up{endif}\nG4 ; wait\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nM221 S100 ; reset flow\nM572 S0 ; reset PA\nM569 S1 X Y ; reset to stealthchop for X Y\nM84 ; disable motors\n; max_layer_z = [max_layer_z]",
     "machine_pause_gcode": "M601",
-    "machine_start_gcode": "M862.3 P \"MINI\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM862.5 P2 ; g-code level check\nM862.6 P\"Input shaper\" ; FW feature check\nM115 U6.0.3+14902\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nG28 ; home all without mesh bed level\nM104 S170 ; set extruder temp for bed leveling\nM140 S[first_layer_bed_temperature] ; set bed temp\nM109 R170 ; wait for bed leveling temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM569 S1 X Y ; set stealthchop for X Y\nM204 T1250 ; set travel acceleration\nG29 ; mesh bed leveling \nM104 S[first_layer_temperature] ; set extruder temp\nG92 E0\n\nG1 X0 Y-2 Z3 F2400\n\nM109 S[first_layer_temperature] ; wait for extruder temp\n\n; intro line\nG1 X10 Z0.2 F1000\nG1 X70 E8 F900\nG1 X140 E10 F700\nG92 E0\n\nM569 S0 X Y ; set spreadcycle for X Y\nM204 T[machine_max_acceleration_travel] ; restore travel acceleration\nM572 W0.06 ; set smooth time\nM221 S95 ; set flow",
+    "machine_start_gcode": "M862.3 P \"MINI\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM862.5 P2 ; g-code level check\nM862.6 P\"Input shaper\" ; FW feature check\nM115 U6.4.0+11974\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nG28 ; home all without mesh bed level\nM104 S170 ; set extruder temp for bed leveling\nM140 S[first_layer_bed_temperature] ; set bed temp\nM109 R170 ; wait for bed leveling temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM569 S1 X Y ; set stealthchop for X Y\nM204 T1250 ; set travel acceleration\nG29 ; mesh bed leveling \nM104 S[first_layer_temperature] ; set extruder temp\nG92 E0\n\nG1 X0 Y-2 Z3 F2400\n\nM109 S[first_layer_temperature] ; wait for extruder temp\n\n; intro line\nG1 X10 Z0.2 F1000\nG1 X70 E8 F900\nG1 X140 E10 F700\nG92 E0\n\nM569 S0 X Y ; set spreadcycle for X Y\nM204 T[machine_max_acceleration_travel] ; restore travel acceleration\nM572 W0.06 ; set smooth time\nM221 S95 ; set flow",
     "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\nG92 E0.0\n;[layer_z]\nM201 X{interpolate_table(extruded_weight_total, (0,4000), (1000,1700), (10000,1700))} Y{interpolate_table(extruded_weight_total, (0,4000), (1000,1700), (10000,1700))}",
     "change_filament_gcode": "M600",
     "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]\n{if ! spiral_mode}M74 W[extruded_weight_total]{endif}\n",
diff --git a/resources/profiles/Prusa/machine/Prusa MK3.5 0.4 nozzle.json b/resources/profiles/Prusa/machine/Prusa MK3.5 0.4 nozzle.json
index 8d5307d1a8..18576df366 100644
--- a/resources/profiles/Prusa/machine/Prusa MK3.5 0.4 nozzle.json	
+++ b/resources/profiles/Prusa/machine/Prusa MK3.5 0.4 nozzle.json	
@@ -95,6 +95,9 @@
     "z_hop": [
         "0.2"
     ],
+    "machine_max_junction_deviation": [
+        "0.01"
+    ],
     "fan_speedup_time": "0.2",
     "fan_speedup_overhangs": "1",
     "fan_kickstart": "0",
@@ -102,7 +105,7 @@
     "printable_height": "210",
     "machine_end_gcode": "{if layer_z < max_print_height}G1 Z{z_offset+min(layer_z+1, max_print_height)} F720 ; Move print head up{endif}\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 X241 Y201 F3600 ; park\n{if layer_z < max_print_height}G1 Z{z_offset+min(layer_z+23, max_print_height)} F300 ; Move print head up{endif}\nG4 ; wait\nM572 S0 ; reset PA\nM593 X T2 F0 ; disable IS\nM593 Y T2 F0 ; disable IS\nM84 X Y E ; disable motors\n; max_layer_z = [max_layer_z]",
     "machine_pause_gcode": "M601",
-    "machine_start_gcode": "M17 ; enable steppers\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM862.3 P \"MK3.5\" ; printer model check\nM862.5 P2 ; g-code level check\nM862.6 P\"Input shaper\" ; FW feature check\nM115 U6.2.2+8853\n\nM555 X{(min(print_bed_max[0], first_layer_print_min[0] + 32) - 32)} Y{(max(0, first_layer_print_min[1]) - 4)} W{((min(print_bed_max[0], max(first_layer_print_min[0] + 32, first_layer_print_max[0])))) - ((min(print_bed_max[0], first_layer_print_min[0] + 32) - 32))} H{((first_layer_print_max[1])) - ((max(0, first_layer_print_min[1]) - 4))}\n\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\n\nG28 ; home all\n\nM140 S[first_layer_bed_temperature] ; set bed temp\nM104 T0 S170 ; set extruder temp for bed leveling\nM109 T0 R170 ; wait for temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\n\nG29 P1 ; invalidate mbl & probe print area\nG29 P1 X23 Y5 W80 H20 C ; probe near purge place\nG29 P3.2 ; interpolate mbl probes\nG29 P3.13 ; extrapolate mbl outside probe area\nG29 A ; activate mbl\n\n; prepare for purge\nM104 S{first_layer_temperature[0]}\nG0 X0 Y-4 Z15 F4800 ; move away and ready for the purge\nM109 S{first_layer_temperature[0]}\n\n; Extrude purge line\n\nG92 E0 ; reset extruder position\nG0 E7 X15 Z0.2 F500 ; purge\nG0 X25 E4 F500 ; purge\nG0 X35 E4 F650 ; purge\nG0 X45 E4 F800 ; purge\nG0 X{45 + 3} Z0.05 F8000 ; wipe, move close to the bed\nG0 X{45 + 3 * 2} Z0.2 F8000 ; wipe, move quickly away from the bed\n\nG92 E0\nM221 S100 ; reset flow to 100%\n",
+    "machine_start_gcode": "M17 ; enable steppers\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM862.3 P \"MK3.5\" ; printer model check\nM862.5 P2 ; g-code level check\nM862.6 P\"Input shaper\" ; FW feature check\nM115 U6.4.0+11974\n\nM555 X{(min(print_bed_max[0], first_layer_print_min[0] + 32) - 32)} Y{(max(0, first_layer_print_min[1]) - 4)} W{((min(print_bed_max[0], max(first_layer_print_min[0] + 32, first_layer_print_max[0])))) - ((min(print_bed_max[0], first_layer_print_min[0] + 32) - 32))} H{((first_layer_print_max[1])) - ((max(0, first_layer_print_min[1]) - 4))}\n\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\n\nG28 ; home all\n\nM140 S[first_layer_bed_temperature] ; set bed temp\nM104 T0 S170 ; set extruder temp for bed leveling\nM109 T0 R170 ; wait for temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\n\nG29 P1 ; invalidate mbl & probe print area\nG29 P1 X23 Y5 W80 H20 C ; probe near purge place\nG29 P3.2 ; interpolate mbl probes\nG29 P3.13 ; extrapolate mbl outside probe area\nG29 A ; activate mbl\n\n; prepare for purge\nM104 S{first_layer_temperature[0]}\nG0 X0 Y-4 Z15 F4800 ; move away and ready for the purge\nM109 S{first_layer_temperature[0]}\n\n; Extrude purge line\n\nG92 E0 ; reset extruder position\nG0 E7 X15 Z0.2 F500 ; purge\nG0 X25 E4 F500 ; purge\nG0 X35 E4 F650 ; purge\nG0 X45 E4 F800 ; purge\nG0 X{45 + 3} Z0.05 F8000 ; wipe, move close to the bed\nG0 X{45 + 3 * 2} Z0.2 F8000 ; wipe, move quickly away from the bed\n\nG92 E0\nM221 S100 ; reset flow to 100%\n",
     "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\nG92 E0.0\n;[layer_z]\nM201 X{interpolate_table(extruded_weight_total, (0,4000), (1400,2500), (10000,2500))} Y{interpolate_table(extruded_weight_total, (0,4000), (1400,2500), (10000,2500))}\n",
     "change_filament_gcode": "M600",
     "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]\n{if ! spiral_mode}M74 W[extruded_weight_total]{endif}\n",
diff --git a/resources/profiles/Prusa/process/0.05mm DETAIL @CORE One 0.25.json b/resources/profiles/Prusa/process/0.05mm DETAIL @CORE One 0.25.json
index 90282356ee..5a5e94e124 100644
--- a/resources/profiles/Prusa/process/0.05mm DETAIL @CORE One 0.25.json	
+++ b/resources/profiles/Prusa/process/0.05mm DETAIL @CORE One 0.25.json	
@@ -10,5 +10,8 @@
     "support_interface_top_layers": "3",
     "initial_layer_infill_speed": "45",
     "initial_layer_speed": "25",
-    "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.25"
+    "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.25",
+    "gap_infill_speed": "45",
+    "small_perimeter_speed": "45",
+    "outer_wall_speed": "45"
 }
\ No newline at end of file
diff --git a/resources/profiles/Prusa/process/0.05mm Detail @MINIIS.json b/resources/profiles/Prusa/process/0.05mm Detail @MINIIS.json
index 9f2b524b57..6298c71d49 100644
--- a/resources/profiles/Prusa/process/0.05mm Detail @MINIIS.json	
+++ b/resources/profiles/Prusa/process/0.05mm Detail @MINIIS.json	
@@ -19,6 +19,9 @@
     "top_shell_layers": "13",
     "bottom_shell_thickness": "0.5",
     "bottom_shell_layers": "10",
+    "support_base_pattern_spacing": "1",
+    "support_top_z_distance": "0.09",
+    "support_bottom_z_distance": "0.09",
     "compatible_printers": [
         "Prusa MINIIS 0.25 nozzle"
     ]
diff --git a/resources/profiles/Prusa/process/0.05mm Detail @MK3.5.json b/resources/profiles/Prusa/process/0.05mm Detail @MK3.5.json
index 9f82ceb6eb..a9a79b47a1 100644
--- a/resources/profiles/Prusa/process/0.05mm Detail @MK3.5.json	
+++ b/resources/profiles/Prusa/process/0.05mm Detail @MK3.5.json	
@@ -19,7 +19,9 @@
     "top_shell_layers": "13",
     "bottom_shell_thickness": "0.5",
     "bottom_shell_layers": "10",
+    "support_base_pattern_spacing": "1",
     "support_top_z_distance": "0.09",
+    "support_bottom_z_distance": "0.09",
     "compatible_printers": [
         "Prusa MK3.5 0.25 nozzle"
     ]
diff --git a/resources/profiles/Prusa/process/0.07mm DETAIL @CORE One 0.25.json b/resources/profiles/Prusa/process/0.07mm DETAIL @CORE One 0.25.json
index aa1fb6b9f7..cda4e3096b 100644
--- a/resources/profiles/Prusa/process/0.07mm DETAIL @CORE One 0.25.json	
+++ b/resources/profiles/Prusa/process/0.07mm DETAIL @CORE One 0.25.json	
@@ -10,5 +10,8 @@
     "support_interface_top_layers": "3",
     "initial_layer_infill_speed": "45",
     "initial_layer_speed": "25",
-    "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.25"
+    "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.25",
+    "gap_infill_speed": "45",
+    "small_perimeter_speed": "45",
+    "outer_wall_speed": "45"
 }
\ No newline at end of file
diff --git a/resources/profiles/Prusa/process/0.07mm Detail @MINIIS.json b/resources/profiles/Prusa/process/0.07mm Detail @MINIIS.json
index 9217fc2f00..63d1757fd0 100644
--- a/resources/profiles/Prusa/process/0.07mm Detail @MINIIS.json	
+++ b/resources/profiles/Prusa/process/0.07mm Detail @MINIIS.json	
@@ -21,7 +21,9 @@
     "bottom_shell_layers": "8",
     "bridge_speed": "30",
     "internal_solid_infill_speed": "140",
-    "support_top_z_distance": "0.1",
+    "support_base_pattern_spacing": "1",
+    "support_top_z_distance": "0.09",
+    "support_bottom_z_distance": "0.09",
     "compatible_printers": [
         "Prusa MINIIS 0.25 nozzle"
     ]
diff --git a/resources/profiles/Prusa/process/0.07mm Detail @MK3.5.json b/resources/profiles/Prusa/process/0.07mm Detail @MK3.5.json
index 6fc9c6886c..eb90dc1922 100644
--- a/resources/profiles/Prusa/process/0.07mm Detail @MK3.5.json	
+++ b/resources/profiles/Prusa/process/0.07mm Detail @MK3.5.json	
@@ -21,7 +21,9 @@
     "bottom_shell_layers": "8",
     "bridge_speed": "30",
     "internal_solid_infill_speed": "140",
-    "support_top_z_distance": "0.1",
+    "support_base_pattern_spacing": "1",
+    "support_top_z_distance": "0.09",
+    "support_bottom_z_distance": "0.09",
     "compatible_printers": [
         "Prusa MK3.5 0.25 nozzle"
     ]
diff --git a/resources/profiles/Prusa/process/0.10mm FAST DETAIL @CORE One 0.4.json b/resources/profiles/Prusa/process/0.10mm FAST DETAIL @CORE One 0.4.json
index d481f3139d..b2c2ca9528 100644
--- a/resources/profiles/Prusa/process/0.10mm FAST DETAIL @CORE One 0.4.json	
+++ b/resources/profiles/Prusa/process/0.10mm FAST DETAIL @CORE One 0.4.json	
@@ -13,5 +13,8 @@
     "support_interface_top_layers": "3",
     "initial_layer_infill_speed": "100",
     "initial_layer_speed": "45",
-    "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.4"
+    "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.4",
+    "small_perimeter_speed": "145",
+    "inner_wall_speed": "145",
+    "outer_wall_speed": "145"
 }
\ No newline at end of file
diff --git a/resources/profiles/Prusa/process/0.10mm STRUCTURAL @CORE One 0.5.json b/resources/profiles/Prusa/process/0.10mm STRUCTURAL @CORE One 0.5.json
index f5f6a460b0..df335dbe67 100644
--- a/resources/profiles/Prusa/process/0.10mm STRUCTURAL @CORE One 0.5.json	
+++ b/resources/profiles/Prusa/process/0.10mm STRUCTURAL @CORE One 0.5.json	
@@ -4,9 +4,9 @@
     "inherits": "0.10mm STRUCTURAL @MK4S 0.5",
     "from": "system",
     "instantiation": "true",
-    "inner_wall_speed": "80",
-    "small_perimeter_speed": "45",
-    "outer_wall_speed": "45",
+    "inner_wall_speed": "70",
+    "small_perimeter_speed": "50",
+    "outer_wall_speed": "50",
     "travel_speed": "350",
     "travel_acceleration": "7000",
     "default_acceleration": "3000",
diff --git a/resources/profiles/Prusa/process/0.10mm Speed @MINIIS.json b/resources/profiles/Prusa/process/0.10mm Speed @MINIIS.json
index b8107625fa..6a87714bb0 100644
--- a/resources/profiles/Prusa/process/0.10mm Speed @MINIIS.json	
+++ b/resources/profiles/Prusa/process/0.10mm Speed @MINIIS.json	
@@ -24,7 +24,9 @@
     "internal_solid_infill_acceleration": "3000",
     "inner_wall_acceleration": "2000",
     "outer_wall_acceleration": "1500",
-    "support_top_z_distance": "0.1",
+    "support_base_pattern_spacing": "2",
+    "support_top_z_distance": "0.17",
+    "support_bottom_z_distance": "0.17",
     "compatible_printers": [
         "Prusa MINIIS 0.4 nozzle"
     ]
diff --git a/resources/profiles/Prusa/process/0.10mm Speed @MK3.5.json b/resources/profiles/Prusa/process/0.10mm Speed @MK3.5.json
index 92d201b8e1..7327e51e82 100644
--- a/resources/profiles/Prusa/process/0.10mm Speed @MK3.5.json	
+++ b/resources/profiles/Prusa/process/0.10mm Speed @MK3.5.json	
@@ -24,7 +24,9 @@
     "internal_solid_infill_acceleration": "3000",
     "inner_wall_acceleration": "2000",
     "outer_wall_acceleration": "1500",
-    "support_top_z_distance": "0.1",
+    "support_base_pattern_spacing": "2",
+    "support_top_z_distance": "0.17",
+    "support_bottom_z_distance": "0.17",
     "compatible_printers": [
         "Prusa MK3.5 0.4 nozzle"
     ]
diff --git a/resources/profiles/Prusa/process/0.12mm SPEED @CORE One 0.25.json b/resources/profiles/Prusa/process/0.12mm SPEED @CORE One 0.25.json
index 69ef541dae..3fc92e8b42 100644
--- a/resources/profiles/Prusa/process/0.12mm SPEED @CORE One 0.25.json	
+++ b/resources/profiles/Prusa/process/0.12mm SPEED @CORE One 0.25.json	
@@ -10,5 +10,8 @@
     "support_interface_top_layers": "3",
     "initial_layer_infill_speed": "45",
     "initial_layer_speed": "25",
-    "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.25"
+    "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.25",
+    "small_perimeter_speed": "150",
+    "outer_wall_speed": "150",
+    "inner_wall_speed": "150"
 }
\ No newline at end of file
diff --git a/resources/profiles/Prusa/process/0.12mm STRUCTURAL @CORE One 0.25.json b/resources/profiles/Prusa/process/0.12mm STRUCTURAL @CORE One 0.25.json
index a61d130cb5..ec754dc350 100644
--- a/resources/profiles/Prusa/process/0.12mm STRUCTURAL @CORE One 0.25.json	
+++ b/resources/profiles/Prusa/process/0.12mm STRUCTURAL @CORE One 0.25.json	
@@ -10,5 +10,8 @@
     "support_interface_top_layers": "3",
     "initial_layer_infill_speed": "45",
     "initial_layer_speed": "25",
-    "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.25"
+    "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.25",
+    "gap_infill_speed": "45",
+    "small_perimeter_speed": "45",
+    "outer_wall_speed": "45"
 }
\ No newline at end of file
diff --git a/resources/profiles/Prusa/process/0.12mm STRUCTURAL @CORE One 0.3.json b/resources/profiles/Prusa/process/0.12mm STRUCTURAL @CORE One 0.3.json
index 35b0d2c525..101e7f0968 100644
--- a/resources/profiles/Prusa/process/0.12mm STRUCTURAL @CORE One 0.3.json	
+++ b/resources/profiles/Prusa/process/0.12mm STRUCTURAL @CORE One 0.3.json	
@@ -12,5 +12,8 @@
     "initial_layer_infill_speed": "60",
     "initial_layer_speed": "45",
     "top_surface_acceleration": "1500",
-    "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.3"
+    "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.3",
+    "small_perimeter_speed": "45",
+    "inner_wall_speed": "70",
+    "outer_wall_speed": "45"
 }
\ No newline at end of file
diff --git a/resources/profiles/Prusa/process/0.12mm Speed @MINIIS.json b/resources/profiles/Prusa/process/0.12mm Speed @MINIIS.json
index e8518fdb25..c4d772993f 100644
--- a/resources/profiles/Prusa/process/0.12mm Speed @MINIIS.json	
+++ b/resources/profiles/Prusa/process/0.12mm Speed @MINIIS.json	
@@ -31,7 +31,8 @@
     "overhang_1_4_speed": "60",
     "internal_solid_infill_acceleration": "2500",
     "sparse_infill_acceleration": "2500",
-    "support_top_z_distance": "0.1",
+    "support_top_z_distance": "0.09",
+    "support_bottom_z_distance": "0.09",
     "compatible_printers": [
         "Prusa MINIIS 0.25 nozzle"
     ]
diff --git a/resources/profiles/Prusa/process/0.12mm Speed @MK3.5.json b/resources/profiles/Prusa/process/0.12mm Speed @MK3.5.json
index abaef8f727..76ce6b9221 100644
--- a/resources/profiles/Prusa/process/0.12mm Speed @MK3.5.json	
+++ b/resources/profiles/Prusa/process/0.12mm Speed @MK3.5.json	
@@ -31,7 +31,8 @@
     "overhang_1_4_speed": "60",
     "internal_solid_infill_acceleration": "2500",
     "sparse_infill_acceleration": "2500",
-    "support_top_z_distance": "0.1",
+    "support_top_z_distance": "0.09",
+    "support_bottom_z_distance": "0.09",
     "compatible_printers": [
         "Prusa MK3.5 0.25 nozzle"
     ]
diff --git a/resources/profiles/Prusa/process/0.12mm Standard @MINIIS.json b/resources/profiles/Prusa/process/0.12mm Standard @MINIIS.json
index f0d03268c4..72175e280d 100644
--- a/resources/profiles/Prusa/process/0.12mm Standard @MINIIS.json	
+++ b/resources/profiles/Prusa/process/0.12mm Standard @MINIIS.json	
@@ -36,7 +36,9 @@
     "internal_solid_infill_acceleration": "2500",
     "sparse_infill_acceleration": "2500",
     "travel_acceleration": "3000",
-    "support_top_z_distance": "0.1",
+    "support_base_pattern_spacing": "1",
+    "support_top_z_distance": "0.09",
+    "support_bottom_z_distance": "0.09",
     "compatible_printers": [
         "Prusa MINIIS 0.25 nozzle"
     ]
diff --git a/resources/profiles/Prusa/process/0.12mm Standard @MK3.5.json b/resources/profiles/Prusa/process/0.12mm Standard @MK3.5.json
index 6099147be4..8f4b41b380 100644
--- a/resources/profiles/Prusa/process/0.12mm Standard @MK3.5.json	
+++ b/resources/profiles/Prusa/process/0.12mm Standard @MK3.5.json	
@@ -36,7 +36,9 @@
     "internal_solid_infill_acceleration": "2500",
     "sparse_infill_acceleration": "2500",
     "travel_acceleration": "3000",
-    "support_top_z_distance": "0.1",
+    "support_base_pattern_spacing": "1",
+    "support_top_z_distance": "0.09",
+    "support_bottom_z_distance": "0.09",
     "compatible_printers": [
         "Prusa MK3.5 0.25 nozzle"
     ]
diff --git a/resources/profiles/Prusa/process/0.15mm High Flow @MINIIS.json b/resources/profiles/Prusa/process/0.15mm High Flow @MINIIS.json
index 58a8211986..81711734a1 100644
--- a/resources/profiles/Prusa/process/0.15mm High Flow @MINIIS.json	
+++ b/resources/profiles/Prusa/process/0.15mm High Flow @MINIIS.json	
@@ -29,7 +29,8 @@
     "inner_wall_acceleration": "3500",
     "outer_wall_acceleration": "2500",
     "bridge_acceleration": "1500",
-    "support_top_z_distance": "0.1",
+    "support_top_z_distance": "0.17",
+    "support_bottom_z_distance": "0.17",
     "compatible_printers": [
         "Prusa MINIIS 0.4 nozzle"
     ]
diff --git a/resources/profiles/Prusa/process/0.15mm High Flow @MK3.5.json b/resources/profiles/Prusa/process/0.15mm High Flow @MK3.5.json
index 92db093a4c..a3ecfea49b 100644
--- a/resources/profiles/Prusa/process/0.15mm High Flow @MK3.5.json	
+++ b/resources/profiles/Prusa/process/0.15mm High Flow @MK3.5.json	
@@ -29,7 +29,8 @@
     "inner_wall_acceleration": "3500",
     "outer_wall_acceleration": "2500",
     "bridge_acceleration": "1500",
-    "support_top_z_distance": "0.1",
+    "support_top_z_distance": "0.17",
+    "support_bottom_z_distance": "0.17",
     "compatible_printers": [
         "Prusa MK3.5 0.4 nozzle"
     ]
diff --git a/resources/profiles/Prusa/process/0.15mm SPEED @CORE One 0.25.json b/resources/profiles/Prusa/process/0.15mm SPEED @CORE One 0.25.json
index 8e5f0cab2d..4600a136a8 100644
--- a/resources/profiles/Prusa/process/0.15mm SPEED @CORE One 0.25.json	
+++ b/resources/profiles/Prusa/process/0.15mm SPEED @CORE One 0.25.json	
@@ -10,5 +10,8 @@
     "support_interface_top_layers": "3",
     "initial_layer_infill_speed": "45",
     "initial_layer_speed": "25",
-    "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.25"
+    "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.25",
+    "small_perimeter_speed": "150",
+    "inner_wall_speed": "150",
+    "outer_wall_speed": "150"
 }
\ No newline at end of file
diff --git a/resources/profiles/Prusa/process/0.15mm SPEED @CORE One 0.4.json b/resources/profiles/Prusa/process/0.15mm SPEED @CORE One 0.4.json
index 2c3b531050..e08b21a26f 100644
--- a/resources/profiles/Prusa/process/0.15mm SPEED @CORE One 0.4.json	
+++ b/resources/profiles/Prusa/process/0.15mm SPEED @CORE One 0.4.json	
@@ -4,7 +4,7 @@
     "inherits": "0.15mm SPEED @MK4S 0.4",
     "from": "system",
     "instantiation": "true",
-    "overhang_2_4_speed": "50",
+    "overhang_3_4_speed": "50",
     "travel_speed": "350",
     "travel_acceleration": "7000",
     "default_acceleration": "3000",
@@ -16,5 +16,6 @@
     "internal_solid_infill_acceleration": "6000",
     "inner_wall_acceleration": "6000",
     "outer_wall_acceleration": "3000",
-    "top_surface_acceleration": "2000"
+    "top_surface_acceleration": "2000",
+    "support_threshold_angle": "35"
 }
\ No newline at end of file
diff --git a/resources/profiles/Prusa/process/0.15mm SPEED @CORE One HF 0.4.json b/resources/profiles/Prusa/process/0.15mm SPEED @CORE One HF 0.4.json
index fa9fb8c30c..50ad496cd2 100644
--- a/resources/profiles/Prusa/process/0.15mm SPEED @CORE One HF 0.4.json	
+++ b/resources/profiles/Prusa/process/0.15mm SPEED @CORE One HF 0.4.json	
@@ -4,7 +4,7 @@
     "inherits": "0.15mm SPEED @MK4S HF0.4",
     "from": "system",
     "instantiation": "true",
-    "overhang_2_4_speed": "50",
+    "overhang_1_4_speed": "50",
     "overhang_3_4_speed": "60%",
     "sparse_infill_speed": "300",
     "travel_speed": "350",
@@ -18,5 +18,6 @@
     "internal_solid_infill_acceleration": "6000",
     "inner_wall_acceleration": "6000",
     "outer_wall_acceleration": "3000",
-    "top_surface_acceleration": "2000"
+    "top_surface_acceleration": "2000",
+    "support_threshold_angle": "35"
 }
\ No newline at end of file
diff --git a/resources/profiles/Prusa/process/0.15mm STRUCTURAL @CORE One 0.25.json b/resources/profiles/Prusa/process/0.15mm STRUCTURAL @CORE One 0.25.json
index 55e9dc654c..51886f189e 100644
--- a/resources/profiles/Prusa/process/0.15mm STRUCTURAL @CORE One 0.25.json	
+++ b/resources/profiles/Prusa/process/0.15mm STRUCTURAL @CORE One 0.25.json	
@@ -10,5 +10,8 @@
     "support_interface_top_layers": "3",
     "initial_layer_infill_speed": "45",
     "initial_layer_speed": "25",
-    "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.25"
+    "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.25",
+    "gap_infill_speed": "45",
+    "small_perimeter_speed": "45",
+    "outer_wall_speed": "45"
 }
\ No newline at end of file
diff --git a/resources/profiles/Prusa/process/0.15mm STRUCTURAL @CORE One 0.4.json b/resources/profiles/Prusa/process/0.15mm STRUCTURAL @CORE One 0.4.json
index fd2d410e48..017b232df4 100644
--- a/resources/profiles/Prusa/process/0.15mm STRUCTURAL @CORE One 0.4.json	
+++ b/resources/profiles/Prusa/process/0.15mm STRUCTURAL @CORE One 0.4.json	
@@ -4,7 +4,7 @@
     "inherits": "0.15mm STRUCTURAL @MK4S 0.4",
     "from": "system",
     "instantiation": "true",
-    "overhang_2_4_speed": "45",
+    "overhang_3_4_speed": "45",
     "sparse_infill_speed": "120",
     "travel_speed": "350",
     "travel_acceleration": "7000",
diff --git a/resources/profiles/Prusa/process/0.15mm STRUCTURAL @CORE One 0.5.json b/resources/profiles/Prusa/process/0.15mm STRUCTURAL @CORE One 0.5.json
index 2cecda0dd0..765d0efa49 100644
--- a/resources/profiles/Prusa/process/0.15mm STRUCTURAL @CORE One 0.5.json	
+++ b/resources/profiles/Prusa/process/0.15mm STRUCTURAL @CORE One 0.5.json	
@@ -4,7 +4,7 @@
     "inherits": "0.15mm STRUCTURAL @MK4S 0.5",
     "from": "system",
     "instantiation": "true",
-    "overhang_2_4_speed": "45",
+    "overhang_3_4_speed": "45",
     "travel_speed": "350",
     "travel_acceleration": "7000",
     "default_acceleration": "3000",
diff --git a/resources/profiles/Prusa/process/0.15mm STRUCTURAL @CORE One 0.6.json b/resources/profiles/Prusa/process/0.15mm STRUCTURAL @CORE One 0.6.json
index 2f58de84e9..0024001fd9 100644
--- a/resources/profiles/Prusa/process/0.15mm STRUCTURAL @CORE One 0.6.json	
+++ b/resources/profiles/Prusa/process/0.15mm STRUCTURAL @CORE One 0.6.json	
@@ -4,9 +4,9 @@
     "inherits": "0.15mm STRUCTURAL @MK4S 0.6",
     "from": "system",
     "instantiation": "true",
-    "inner_wall_speed": "80",
-    "overhang_2_4_speed": "30",
-    "overhang_3_4_speed": "70%",
+    "inner_wall_speed": "70",
+    "overhang_3_4_speed": "30",
+    "overhang_4_4_speed": "70%",
     "travel_speed": "350",
     "travel_acceleration": "7000",
     "default_acceleration": "3000",
@@ -18,5 +18,6 @@
     "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.6",
     "inner_wall_acceleration": "2500",
     "outer_wall_acceleration": "1500",
-    "top_surface_acceleration": "2000"
+    "top_surface_acceleration": "2000",
+    "gap_infill_speed": "70"
 }
\ No newline at end of file
diff --git a/resources/profiles/Prusa/process/0.15mm Speed @MINIIS 0.25.json b/resources/profiles/Prusa/process/0.15mm Speed @MINIIS 0.25.json
index 30d9a165d5..3aa3019d76 100644
--- a/resources/profiles/Prusa/process/0.15mm Speed @MINIIS 0.25.json	
+++ b/resources/profiles/Prusa/process/0.15mm Speed @MINIIS 0.25.json	
@@ -29,7 +29,8 @@
     "internal_solid_infill_acceleration": "2500",
     "inner_wall_acceleration": "2000",
     "outer_wall_acceleration": "1500",
-    "support_top_z_distance": "0.1",
+    "support_top_z_distance": "0.09",
+    "support_bottom_z_distance": "0.09",
     "compatible_printers": [
         "Prusa MINIIS 0.25 nozzle"
     ]
diff --git a/resources/profiles/Prusa/process/0.15mm Speed @MINIIS.json b/resources/profiles/Prusa/process/0.15mm Speed @MINIIS.json
index 853e0e01e6..6f6a9cffcd 100644
--- a/resources/profiles/Prusa/process/0.15mm Speed @MINIIS.json	
+++ b/resources/profiles/Prusa/process/0.15mm Speed @MINIIS.json	
@@ -29,7 +29,8 @@
     "internal_solid_infill_acceleration": "2500",
     "inner_wall_acceleration": "2000",
     "outer_wall_acceleration": "1500",
-    "support_top_z_distance": "0.1",
+    "support_top_z_distance": "0.17",
+    "support_bottom_z_distance": "0.17",
     "compatible_printers": [
         "Prusa MINIIS 0.4 nozzle"
     ]
diff --git a/resources/profiles/Prusa/process/0.15mm Speed @MK3.5 0.25.json b/resources/profiles/Prusa/process/0.15mm Speed @MK3.5 0.25.json
index 09c562d356..e322f1ce63 100644
--- a/resources/profiles/Prusa/process/0.15mm Speed @MK3.5 0.25.json	
+++ b/resources/profiles/Prusa/process/0.15mm Speed @MK3.5 0.25.json	
@@ -29,7 +29,8 @@
     "internal_solid_infill_acceleration": "2500",
     "inner_wall_acceleration": "2000",
     "outer_wall_acceleration": "1500",
-    "support_top_z_distance": "0.1",
+    "support_top_z_distance": "0.09",
+    "support_bottom_interface_spacing": "0.09",
     "compatible_printers": [
         "Prusa MK3.5 0.25 nozzle"
     ]
diff --git a/resources/profiles/Prusa/process/0.15mm Speed @MK3.5.json b/resources/profiles/Prusa/process/0.15mm Speed @MK3.5.json
index 175c896845..31eb1443bb 100644
--- a/resources/profiles/Prusa/process/0.15mm Speed @MK3.5.json	
+++ b/resources/profiles/Prusa/process/0.15mm Speed @MK3.5.json	
@@ -29,7 +29,8 @@
     "inner_wall_acceleration": "2000",
     "outer_wall_acceleration": "1500",
     "bridge_acceleration": "1500",
-    "support_top_z_distance": "0.1",
+    "support_top_z_distance": "0.17",
+    "support_bottom_interface_spacing": "0.17",
     "compatible_printers": [
         "Prusa MK3.5 0.4 nozzle"
     ]
diff --git a/resources/profiles/Prusa/process/0.15mm Standard @MINIIS 0.25.json b/resources/profiles/Prusa/process/0.15mm Standard @MINIIS 0.25.json
index b6fe166ce1..362ed653d2 100644
--- a/resources/profiles/Prusa/process/0.15mm Standard @MINIIS 0.25.json	
+++ b/resources/profiles/Prusa/process/0.15mm Standard @MINIIS 0.25.json	
@@ -29,7 +29,9 @@
     "internal_solid_infill_acceleration": "2500",
     "inner_wall_acceleration": "2000",
     "outer_wall_acceleration": "1500",
-    "support_top_z_distance": "0.1",
+    "support_base_pattern_spacing": "1",
+    "support_top_z_distance": "0.09",
+    "support_bottom_z_distance": "0.09",
     "compatible_printers": [
         "Prusa MINIIS 0.25 nozzle"
     ]
diff --git a/resources/profiles/Prusa/process/0.15mm Standard @MINIIS 0.6.json b/resources/profiles/Prusa/process/0.15mm Standard @MINIIS 0.6.json
index 606e52ecb7..5cd6746563 100644
--- a/resources/profiles/Prusa/process/0.15mm Standard @MINIIS 0.6.json	
+++ b/resources/profiles/Prusa/process/0.15mm Standard @MINIIS 0.6.json	
@@ -37,7 +37,10 @@
     "inner_wall_acceleration": "2500",
     "outer_wall_acceleration": "1500",
     "bridge_acceleration": "1500",
-    "support_top_z_distance": "0.1",
+    "support_base_pattern_spacing": "2",
+    "support_top_z_distance": "0.25",
+    "support_bottom_z_distance": "0.25",
+    "support_interface_spacing": "0.25",
     "compatible_printers": [
         "Prusa MINIIS 0.6 nozzle"
     ]
diff --git a/resources/profiles/Prusa/process/0.15mm Standard @MINIIS.json b/resources/profiles/Prusa/process/0.15mm Standard @MINIIS.json
index 3f1a5c6825..d61a785155 100644
--- a/resources/profiles/Prusa/process/0.15mm Standard @MINIIS.json	
+++ b/resources/profiles/Prusa/process/0.15mm Standard @MINIIS.json	
@@ -33,7 +33,8 @@
     "inner_wall_acceleration": "2000",
     "outer_wall_acceleration": "1500",
     "bridge_acceleration": "1500",
-    "support_top_z_distance": "0.1",
+    "support_top_z_distance": "0.17",
+    "support_bottom_z_distance": "0.17",
     "compatible_printers": [
         "Prusa MINIIS 0.4 nozzle"
     ]
diff --git a/resources/profiles/Prusa/process/0.15mm Standard @MK3.5 0.25.json b/resources/profiles/Prusa/process/0.15mm Standard @MK3.5 0.25.json
index eca3cdad8c..3d55cc1e39 100644
--- a/resources/profiles/Prusa/process/0.15mm Standard @MK3.5 0.25.json	
+++ b/resources/profiles/Prusa/process/0.15mm Standard @MK3.5 0.25.json	
@@ -29,7 +29,9 @@
     "internal_solid_infill_acceleration": "2500",
     "inner_wall_acceleration": "2000",
     "outer_wall_acceleration": "1500",
-    "support_top_z_distance": "0.1",
+    "support_base_pattern_spacing": "1",
+    "support_top_z_distance": "0.09",
+    "support_bottom_z_distance": "0.09",
     "compatible_printers": [
         "Prusa MK3.5 0.25 nozzle"
     ]
diff --git a/resources/profiles/Prusa/process/0.15mm Standard @MK3.5 0.6.json b/resources/profiles/Prusa/process/0.15mm Standard @MK3.5 0.6.json
index 6c6a80a261..c0087d57ea 100644
--- a/resources/profiles/Prusa/process/0.15mm Standard @MK3.5 0.6.json	
+++ b/resources/profiles/Prusa/process/0.15mm Standard @MK3.5 0.6.json	
@@ -37,7 +37,11 @@
     "inner_wall_acceleration": "2500",
     "outer_wall_acceleration": "1500",
     "bridge_acceleration": "1500",
-    "support_top_z_distance": "0.1",
+    "support_base_pattern_spacing": "2",
+    "support_top_z_distance": "0.22",
+    "support_bottom_z_distance": "0.22",
+    "support_bottom_interface_spacing": "0.22",
+    "support_interface_spacing": "0.25",
     "compatible_printers": [
         "Prusa MK3.5 0.6 nozzle"
     ]
diff --git a/resources/profiles/Prusa/process/0.15mm Standard @MK3.5.json b/resources/profiles/Prusa/process/0.15mm Standard @MK3.5.json
index 4044df4712..e6161e5896 100644
--- a/resources/profiles/Prusa/process/0.15mm Standard @MK3.5.json	
+++ b/resources/profiles/Prusa/process/0.15mm Standard @MK3.5.json	
@@ -28,7 +28,8 @@
     "internal_solid_infill_acceleration": "2500",
     "inner_wall_acceleration": "2000",
     "outer_wall_acceleration": "1500",
-    "support_top_z_distance": "0.1",
+    "support_top_z_distance": "0.17",
+    "support_bottom_z_distance": "0.17",
     "compatible_printers": [
         "Prusa MK3.5 0.4 nozzle"
     ]
diff --git a/resources/profiles/Prusa/process/0.16mm SPEED @CORE One 0.3.json b/resources/profiles/Prusa/process/0.16mm SPEED @CORE One 0.3.json
index d0ca7859df..15096ebd6b 100644
--- a/resources/profiles/Prusa/process/0.16mm SPEED @CORE One 0.3.json	
+++ b/resources/profiles/Prusa/process/0.16mm SPEED @CORE One 0.3.json	
@@ -13,5 +13,8 @@
     "initial_layer_infill_speed": "60",
     "initial_layer_speed": "45",
     "top_surface_acceleration": "1500",
-    "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.3"
+    "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.3",
+    "small_perimeter_speed": "160",
+    "inner_wall_speed": "160",
+    "outer_wall_speed": "160"
 }
\ No newline at end of file
diff --git a/resources/profiles/Prusa/process/0.16mm STRUCTURAL @CORE One 0.3.json b/resources/profiles/Prusa/process/0.16mm STRUCTURAL @CORE One 0.3.json
index 192682e5b7..4e11371cfe 100644
--- a/resources/profiles/Prusa/process/0.16mm STRUCTURAL @CORE One 0.3.json	
+++ b/resources/profiles/Prusa/process/0.16mm STRUCTURAL @CORE One 0.3.json	
@@ -12,5 +12,8 @@
     "initial_layer_infill_speed": "60",
     "initial_layer_speed": "45",
     "top_surface_acceleration": "1500",
-    "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.3"
+    "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.3",
+    "small_perimeter_speed": "50",
+    "inner_wall_speed": "70",
+    "outer_wall_speed": "50"
 }
\ No newline at end of file
diff --git a/resources/profiles/Prusa/process/0.20mm High Flow @MINIIS 0.6.json b/resources/profiles/Prusa/process/0.20mm High Flow @MINIIS 0.6.json
index aeca348889..15363df16c 100644
--- a/resources/profiles/Prusa/process/0.20mm High Flow @MINIIS 0.6.json	
+++ b/resources/profiles/Prusa/process/0.20mm High Flow @MINIIS 0.6.json	
@@ -36,5 +36,10 @@
     "outer_wall_acceleration": "4000",
     "bridge_acceleration": "1500",
     "internal_solid_infill_acceleration": "3000",
-    "overhang_1_4_speed": "45"
+    "overhang_1_4_speed": "45",
+    "support_base_pattern_spacing": "2",
+    "support_top_z_distance": "0.22",
+    "support_bottom_z_distance": "0.22",
+    "support_bottom_interface_spacing": "0.22",
+    "support_interface_spacing": "0.25"
 }
\ No newline at end of file
diff --git a/resources/profiles/Prusa/process/0.20mm High Flow @MK3.5 0.6.json b/resources/profiles/Prusa/process/0.20mm High Flow @MK3.5 0.6.json
index 2aa0d96b93..c9056822db 100644
--- a/resources/profiles/Prusa/process/0.20mm High Flow @MK3.5 0.6.json	
+++ b/resources/profiles/Prusa/process/0.20mm High Flow @MK3.5 0.6.json	
@@ -36,5 +36,10 @@
     "outer_wall_acceleration": "4000",
     "bridge_acceleration": "1500",
     "internal_solid_infill_acceleration": "3000",
-    "overhang_1_4_speed": "45"
+    "overhang_1_4_speed": "45",
+    "support_base_pattern_spacing": "2",
+    "support_top_z_distance": "0.22",
+    "support_bottom_z_distance": "0.22",
+    "support_bottom_interface_spacing": "0.22",
+    "support_interface_spacing": "0.25"
 }
\ No newline at end of file
diff --git a/resources/profiles/Prusa/process/0.20mm SOLUBLE FULL @CORE One 0.4.json b/resources/profiles/Prusa/process/0.20mm SOLUBLE FULL @CORE One 0.4.json
index 3fe89b38a6..7e0f0042c0 100644
--- a/resources/profiles/Prusa/process/0.20mm SOLUBLE FULL @CORE One 0.4.json	
+++ b/resources/profiles/Prusa/process/0.20mm SOLUBLE FULL @CORE One 0.4.json	
@@ -4,12 +4,15 @@
     "inherits": "0.20mm SOLUBLE FULL @MK4S 0.4",
     "from": "system",
     "instantiation": "true",
-    "overhang_2_4_speed": "50",
+    "overhang_3_4_speed": "50",
     "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.4 and printer_notes!~/.*HF_NOZZLE.*/",
     "travel_speed": "350",
     "travel_acceleration": "7000",
     "default_acceleration": "3000",
     "support_interface_top_layers": "3",
     "initial_layer_infill_speed": "100",
-    "initial_layer_speed": "45"
+    "initial_layer_speed": "45",
+    "small_perimeter_speed": "50",
+    "inner_wall_speed": "70",
+    "outer_wall_speed": "50"
 }
\ No newline at end of file
diff --git a/resources/profiles/Prusa/process/0.20mm SOLUBLE INTERFACE @CORE One 0.4.json b/resources/profiles/Prusa/process/0.20mm SOLUBLE INTERFACE @CORE One 0.4.json
index 49c4c28280..222663644c 100644
--- a/resources/profiles/Prusa/process/0.20mm SOLUBLE INTERFACE @CORE One 0.4.json	
+++ b/resources/profiles/Prusa/process/0.20mm SOLUBLE INTERFACE @CORE One 0.4.json	
@@ -4,12 +4,15 @@
     "inherits": "0.20mm SOLUBLE INTERFACE @MK4S 0.4",
     "from": "system",
     "instantiation": "true",
-    "overhang_2_4_speed": "50",
+    "overhang_3_4_speed": "50",
     "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.4 and printer_notes!~/.*HF_NOZZLE.*/",
     "travel_speed": "350",
     "travel_acceleration": "7000",
     "default_acceleration": "3000",
     "support_interface_top_layers": "3",
     "initial_layer_infill_speed": "100",
-    "initial_layer_speed": "45"
+    "initial_layer_speed": "45",
+    "small_perimeter_speed": "50",
+    "inner_wall_speed": "70",
+    "outer_wall_speed": "50"
 }
\ No newline at end of file
diff --git a/resources/profiles/Prusa/process/0.20mm SPEED @CORE One 0.3.json b/resources/profiles/Prusa/process/0.20mm SPEED @CORE One 0.3.json
index df4d8e80cc..0f0cc78362 100644
--- a/resources/profiles/Prusa/process/0.20mm SPEED @CORE One 0.3.json	
+++ b/resources/profiles/Prusa/process/0.20mm SPEED @CORE One 0.3.json	
@@ -13,5 +13,8 @@
     "initial_layer_infill_speed": "60",
     "initial_layer_speed": "45",
     "top_surface_acceleration": "1500",
-    "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.3"
+    "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.3",
+    "small_perimeter_speed": "160",
+    "inner_wall_speed": "160",
+    "outer_wall_speed": "160"
 }
\ No newline at end of file
diff --git a/resources/profiles/Prusa/process/0.20mm SPEED @CORE One 0.4.json b/resources/profiles/Prusa/process/0.20mm SPEED @CORE One 0.4.json
index 9171ec4b21..79cd06680f 100644
--- a/resources/profiles/Prusa/process/0.20mm SPEED @CORE One 0.4.json	
+++ b/resources/profiles/Prusa/process/0.20mm SPEED @CORE One 0.4.json	
@@ -4,7 +4,7 @@
     "inherits": "0.20mm SPEED @MK4S 0.4",
     "from": "system",
     "instantiation": "true",
-    "overhang_2_4_speed": "50",
+    "overhang_3_4_speed": "50",
     "travel_speed": "350",
     "travel_acceleration": "7000",
     "default_acceleration": "3000",
@@ -16,5 +16,6 @@
     "internal_solid_infill_acceleration": "6000",
     "inner_wall_acceleration": "6000",
     "outer_wall_acceleration": "3000",
-    "top_surface_acceleration": "2000"
+    "top_surface_acceleration": "2000",
+    "support_threshold_angle": "35"
 }
\ No newline at end of file
diff --git a/resources/profiles/Prusa/process/0.20mm SPEED @CORE One 0.5.json b/resources/profiles/Prusa/process/0.20mm SPEED @CORE One 0.5.json
index e7299809ea..20d64e324c 100644
--- a/resources/profiles/Prusa/process/0.20mm SPEED @CORE One 0.5.json	
+++ b/resources/profiles/Prusa/process/0.20mm SPEED @CORE One 0.5.json	
@@ -4,7 +4,7 @@
     "inherits": "0.20mm SPEED @MK4S 0.5",
     "from": "system",
     "instantiation": "true",
-    "overhang_2_4_speed": "50",
+    "overhang_3_4_speed": "50",
     "travel_speed": "350",
     "travel_acceleration": "7000",
     "default_acceleration": "3000",
diff --git a/resources/profiles/Prusa/process/0.20mm SPEED @CORE One 0.6.json b/resources/profiles/Prusa/process/0.20mm SPEED @CORE One 0.6.json
index 78446c1687..1bbd442a02 100644
--- a/resources/profiles/Prusa/process/0.20mm SPEED @CORE One 0.6.json	
+++ b/resources/profiles/Prusa/process/0.20mm SPEED @CORE One 0.6.json	
@@ -4,8 +4,8 @@
     "inherits": "0.20mm SPEED @MK4S 0.6",
     "from": "system",
     "instantiation": "true",
-    "overhang_2_4_speed": "30",
-    "overhang_3_4_speed": "70%",
+    "overhang_3_4_speed": "30",
+    "overhang_4_4_speed": "70%",
     "travel_speed": "350",
     "travel_acceleration": "7000",
     "default_acceleration": "3000",
@@ -17,5 +17,8 @@
     "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.6 and printer_notes!~/.*HF_NOZZLE.*/",
     "inner_wall_acceleration": "6000",
     "outer_wall_acceleration": "3000",
-    "top_surface_acceleration": "2000"
+    "top_surface_acceleration": "2000",
+    "small_perimeter_speed": "130",
+    "inner_wall_speed": "130",
+    "outer_wall_speed": "130"
 }
\ No newline at end of file
diff --git a/resources/profiles/Prusa/process/0.20mm SPEED @CORE One HF 0.4.json b/resources/profiles/Prusa/process/0.20mm SPEED @CORE One HF 0.4.json
index 96433e26e8..5b9b42f34c 100644
--- a/resources/profiles/Prusa/process/0.20mm SPEED @CORE One HF 0.4.json	
+++ b/resources/profiles/Prusa/process/0.20mm SPEED @CORE One HF 0.4.json	
@@ -4,8 +4,8 @@
     "inherits": "0.20mm SPEED @MK4S HF0.4",
     "from": "system",
     "instantiation": "true",
-    "overhang_2_4_speed": "50",
-    "overhang_3_4_speed": "60%",
+    "overhang_3_4_speed": "50",
+    "overhang_4_4_speed": "70%",
     "sparse_infill_speed": "300",
     "travel_speed": "350",
     "travel_acceleration": "7000",
@@ -18,5 +18,6 @@
     "internal_solid_infill_acceleration": "6000",
     "inner_wall_acceleration": "6000",
     "outer_wall_acceleration": "3000",
-    "top_surface_acceleration": "2000"
+    "top_surface_acceleration": "2000",
+    "support_threshold_angle": "35"
 }
\ No newline at end of file
diff --git a/resources/profiles/Prusa/process/0.20mm SPEED @CORE One HF 0.5.json b/resources/profiles/Prusa/process/0.20mm SPEED @CORE One HF 0.5.json
index 3ad26d4548..c7324713ea 100644
--- a/resources/profiles/Prusa/process/0.20mm SPEED @CORE One HF 0.5.json	
+++ b/resources/profiles/Prusa/process/0.20mm SPEED @CORE One HF 0.5.json	
@@ -4,7 +4,7 @@
     "inherits": "0.20mm SPEED @MK4S HF0.5",
     "from": "system",
     "instantiation": "true",
-    "overhang_2_4_speed": "50",
+    "overhang_3_4_speed": "50",
     "travel_speed": "350",
     "travel_acceleration": "7000",
     "default_acceleration": "3000",
diff --git a/resources/profiles/Prusa/process/0.20mm SPEED @CORE One HF 0.6.json b/resources/profiles/Prusa/process/0.20mm SPEED @CORE One HF 0.6.json
index 204f356661..8cb0eb8f1c 100644
--- a/resources/profiles/Prusa/process/0.20mm SPEED @CORE One HF 0.6.json	
+++ b/resources/profiles/Prusa/process/0.20mm SPEED @CORE One HF 0.6.json	
@@ -4,8 +4,8 @@
     "inherits": "0.20mm SPEED @MK4S HF0.6",
     "from": "system",
     "instantiation": "true",
-    "overhang_2_4_speed": "30",
-    "overhang_3_4_speed": "70%",
+    "overhang_3_4_speed": "30",
+    "overhang_4_4_speed": "70%",
     "travel_speed": "350",
     "travel_acceleration": "7000",
     "default_acceleration": "3000",
diff --git a/resources/profiles/Prusa/process/0.20mm STRUCTURAL @CORE One 0.3.json b/resources/profiles/Prusa/process/0.20mm STRUCTURAL @CORE One 0.3.json
index e7dd110d1d..d9b1a2ef54 100644
--- a/resources/profiles/Prusa/process/0.20mm STRUCTURAL @CORE One 0.3.json	
+++ b/resources/profiles/Prusa/process/0.20mm STRUCTURAL @CORE One 0.3.json	
@@ -12,5 +12,8 @@
     "initial_layer_infill_speed": "60",
     "initial_layer_speed": "45",
     "top_surface_acceleration": "1500",
-    "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.3"
+    "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.3",
+    "small_perimeter_speed": "50",
+    "inner_wall_speed": "70",
+    "outer_wall_speed": "50"
 }
\ No newline at end of file
diff --git a/resources/profiles/Prusa/process/0.20mm STRUCTURAL @CORE One 0.4.json b/resources/profiles/Prusa/process/0.20mm STRUCTURAL @CORE One 0.4.json
index 95d97fea4e..a139f2cd4f 100644
--- a/resources/profiles/Prusa/process/0.20mm STRUCTURAL @CORE One 0.4.json	
+++ b/resources/profiles/Prusa/process/0.20mm STRUCTURAL @CORE One 0.4.json	
@@ -4,7 +4,7 @@
     "inherits": "0.20mm STRUCTURAL @MK4S 0.4",
     "from": "system",
     "instantiation": "true",
-    "overhang_2_4_speed": "45",
+    "overhang_3_4_speed": "45",
     "travel_speed": "350",
     "travel_acceleration": "7000",
     "default_acceleration": "3000",
diff --git a/resources/profiles/Prusa/process/0.20mm STRUCTURAL @CORE One 0.5.json b/resources/profiles/Prusa/process/0.20mm STRUCTURAL @CORE One 0.5.json
index c6fba65551..57c2968e0d 100644
--- a/resources/profiles/Prusa/process/0.20mm STRUCTURAL @CORE One 0.5.json	
+++ b/resources/profiles/Prusa/process/0.20mm STRUCTURAL @CORE One 0.5.json	
@@ -4,7 +4,7 @@
     "inherits": "0.20mm STRUCTURAL @MK4S 0.5",
     "from": "system",
     "instantiation": "true",
-    "overhang_2_4_speed": "45",
+    "overhang_3_4_speed": "45",
     "travel_speed": "350",
     "travel_acceleration": "7000",
     "default_acceleration": "3000",
diff --git a/resources/profiles/Prusa/process/0.20mm STRUCTURAL @CORE One 0.6.json b/resources/profiles/Prusa/process/0.20mm STRUCTURAL @CORE One 0.6.json
index 5445f967b5..9bbd5097c8 100644
--- a/resources/profiles/Prusa/process/0.20mm STRUCTURAL @CORE One 0.6.json	
+++ b/resources/profiles/Prusa/process/0.20mm STRUCTURAL @CORE One 0.6.json	
@@ -4,7 +4,7 @@
     "inherits": "0.20mm STRUCTURAL @MK4S 0.6",
     "from": "system",
     "instantiation": "true",
-    "overhang_2_4_speed": "30",
+    "overhang_3_4_speed": "30",
     "travel_speed": "350",
     "travel_acceleration": "7000",
     "default_acceleration": "3000",
diff --git a/resources/profiles/Prusa/process/0.20mm Speed @MINIIS 0.6.json b/resources/profiles/Prusa/process/0.20mm Speed @MINIIS 0.6.json
index 2e2cb971fe..29f9977358 100644
--- a/resources/profiles/Prusa/process/0.20mm Speed @MINIIS 0.6.json	
+++ b/resources/profiles/Prusa/process/0.20mm Speed @MINIIS 0.6.json	
@@ -34,5 +34,10 @@
     "outer_wall_acceleration": "2000",
     "bridge_acceleration": "1500",
     "internal_solid_infill_acceleration": "3000",
-    "overhang_1_4_speed": "45"
+    "overhang_1_4_speed": "45",
+    "support_base_pattern_spacing": "2",
+    "support_top_z_distance": "0.22",
+    "support_bottom_z_distance": "0.22",
+    "support_bottom_interface_spacing": "0.22",
+    "support_interface_spacing": "0.25"
 }
\ No newline at end of file
diff --git a/resources/profiles/Prusa/process/0.20mm Speed @MK3.5 0.6.json b/resources/profiles/Prusa/process/0.20mm Speed @MK3.5 0.6.json
index fb256ecc05..79c38ffeea 100644
--- a/resources/profiles/Prusa/process/0.20mm Speed @MK3.5 0.6.json	
+++ b/resources/profiles/Prusa/process/0.20mm Speed @MK3.5 0.6.json	
@@ -34,5 +34,10 @@
     "outer_wall_acceleration": "2000",
     "bridge_acceleration": "1500",
     "internal_solid_infill_acceleration": "3000",
-    "overhang_1_4_speed": "45"
+    "overhang_1_4_speed": "45",
+    "support_base_pattern_spacing": "2",
+    "support_top_z_distance": "0.22",
+    "support_bottom_z_distance": "0.22",
+    "support_bottom_interface_spacing": "0.22",
+    "support_interface_spacing": "0.25"
 }
\ No newline at end of file
diff --git a/resources/profiles/Prusa/process/0.20mm Standard @MINIIS 0.6.json b/resources/profiles/Prusa/process/0.20mm Standard @MINIIS 0.6.json
index 6ed283fa8c..d27e89b756 100644
--- a/resources/profiles/Prusa/process/0.20mm Standard @MINIIS 0.6.json	
+++ b/resources/profiles/Prusa/process/0.20mm Standard @MINIIS 0.6.json	
@@ -29,6 +29,11 @@
     "bridge_acceleration": "1500",
     "internal_solid_infill_acceleration": "3000",
     "overhang_1_4_speed": "45",
+    "support_base_pattern_spacing": "2",
+    "support_top_z_distance": "0.22",
+    "support_bottom_z_distance": "0.22",
+    "support_bottom_interface_spacing": "0.22",
+    "support_interface_spacing": "0.25",
     "compatible_printers": [
         "Prusa MINIIS 0.6 nozzle"
     ]
diff --git a/resources/profiles/Prusa/process/0.20mm Standard @MK3.5 0.6.json b/resources/profiles/Prusa/process/0.20mm Standard @MK3.5 0.6.json
index f6e1946a04..e4b4f4b5d1 100644
--- a/resources/profiles/Prusa/process/0.20mm Standard @MK3.5 0.6.json	
+++ b/resources/profiles/Prusa/process/0.20mm Standard @MK3.5 0.6.json	
@@ -29,6 +29,11 @@
     "bridge_acceleration": "1500",
     "internal_solid_infill_acceleration": "3000",
     "overhang_1_4_speed": "45",
+    "support_base_pattern_spacing": "2",
+    "support_top_z_distance": "0.22",
+    "support_bottom_z_distance": "0.22",
+    "support_bottom_interface_spacing": "0.22",
+    "support_interface_spacing": "0.25",
     "compatible_printers": [
         "Prusa MK3.5 0.6 nozzle"
     ]
diff --git a/resources/profiles/Prusa/process/0.25mm High Flow @MINIIS.json b/resources/profiles/Prusa/process/0.25mm High Flow @MINIIS.json
index 4521f5fbb1..f1784af6c5 100644
--- a/resources/profiles/Prusa/process/0.25mm High Flow @MINIIS.json	
+++ b/resources/profiles/Prusa/process/0.25mm High Flow @MINIIS.json	
@@ -40,7 +40,11 @@
     "bridge_acceleration": "1500",
     "internal_solid_infill_acceleration": "3000",
     "overhang_1_4_speed": "45",
-    "support_top_z_distance": "0.25",
+    "support_base_pattern_spacing": "2",
+    "support_top_z_distance": "0.22",
+    "support_bottom_z_distance": "0.22",
+    "support_bottom_interface_spacing": "0.22",
+    "support_interface_spacing": "0.25",
     "compatible_printers": [
         "Prusa MINIIS 0.6 nozzle"
     ]
diff --git a/resources/profiles/Prusa/process/0.25mm High Flow @MK3.5.json b/resources/profiles/Prusa/process/0.25mm High Flow @MK3.5.json
index 00faf7f563..0cb9257ddf 100644
--- a/resources/profiles/Prusa/process/0.25mm High Flow @MK3.5.json	
+++ b/resources/profiles/Prusa/process/0.25mm High Flow @MK3.5.json	
@@ -40,7 +40,11 @@
     "bridge_acceleration": "1500",
     "internal_solid_infill_acceleration": "3000",
     "overhang_1_4_speed": "45",
-    "support_top_z_distance": "0.25",
+    "support_base_pattern_spacing": "2",
+    "support_top_z_distance": "0.22",
+    "support_bottom_z_distance": "0.22",
+    "support_bottom_interface_spacing": "0.22",
+    "support_interface_spacing": "0.25",
     "compatible_printers": [
         "Prusa MK3.5 0.6 nozzle"
     ]
diff --git a/resources/profiles/Prusa/process/0.25mm SPEED @CORE One 0.5.json b/resources/profiles/Prusa/process/0.25mm SPEED @CORE One 0.5.json
index bfe931bc62..cb087eb345 100644
--- a/resources/profiles/Prusa/process/0.25mm SPEED @CORE One 0.5.json	
+++ b/resources/profiles/Prusa/process/0.25mm SPEED @CORE One 0.5.json	
@@ -4,7 +4,7 @@
     "inherits": "0.25mm SPEED @MK4S 0.5",
     "from": "system",
     "instantiation": "true",
-    "overhang_2_4_speed": "50",
+    "overhang_3_4_speed": "50",
     "travel_speed": "350",
     "travel_acceleration": "7000",
     "default_acceleration": "3000",
diff --git a/resources/profiles/Prusa/process/0.25mm SPEED @CORE One 0.6.json b/resources/profiles/Prusa/process/0.25mm SPEED @CORE One 0.6.json
index 4cd0500e7b..621c94e9d8 100644
--- a/resources/profiles/Prusa/process/0.25mm SPEED @CORE One 0.6.json	
+++ b/resources/profiles/Prusa/process/0.25mm SPEED @CORE One 0.6.json	
@@ -4,8 +4,8 @@
     "inherits": "0.25mm SPEED @MK4S 0.6",
     "from": "system",
     "instantiation": "true",
-    "overhang_2_4_speed": "30",
-    "overhang_3_4_speed": "70%",
+    "overhang_3_4_speed": "30",
+    "overhang_4_4_speed": "70%",
     "travel_speed": "350",
     "travel_acceleration": "7000",
     "default_acceleration": "3000",
@@ -17,5 +17,8 @@
     "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.6 and printer_notes!~/.*HF_NOZZLE.*/",
     "inner_wall_acceleration": "6000",
     "outer_wall_acceleration": "3000",
-    "top_surface_acceleration": "2000"
+    "top_surface_acceleration": "2000",
+    "small_perimeter_speed": "75",
+    "inner_wall_speed": "95",
+    "outer_wall_speed": "75"
 }
\ No newline at end of file
diff --git a/resources/profiles/Prusa/process/0.25mm SPEED @CORE One HF 0.4.json b/resources/profiles/Prusa/process/0.25mm SPEED @CORE One HF 0.4.json
index b0b066e261..634c502f73 100644
--- a/resources/profiles/Prusa/process/0.25mm SPEED @CORE One HF 0.4.json	
+++ b/resources/profiles/Prusa/process/0.25mm SPEED @CORE One HF 0.4.json	
@@ -4,8 +4,8 @@
     "inherits": "0.25mm SPEED @MK4S HF0.4",
     "from": "system",
     "instantiation": "true",
-    "overhang_2_4_speed": "50",
-    "overhang_3_4_speed": "60%",
+    "overhang_3_4_speed": "50",
+    "overhang_4_4_speed": "70%",
     "sparse_infill_speed": "300",
     "travel_speed": "350",
     "travel_acceleration": "7000",
@@ -13,10 +13,11 @@
     "support_interface_top_layers": "3",
     "initial_layer_infill_speed": "100",
     "initial_layer_speed": "45",
-    "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.4 and printer_notes=~/.*HF_NOZZLE.*/",
+"compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.4 and printer_notes=~/.*HF_NOZZLE.*/",
     "sparse_infill_acceleration": "7000",
     "internal_solid_infill_acceleration": "6000",
     "inner_wall_acceleration": "6000",
     "outer_wall_acceleration": "3000",
-    "top_surface_acceleration": "2000"
+    "top_surface_acceleration": "2000",
+    "support_threshold_angle": "35"
 }
\ No newline at end of file
diff --git a/resources/profiles/Prusa/process/0.25mm SPEED @CORE One HF 0.5.json b/resources/profiles/Prusa/process/0.25mm SPEED @CORE One HF 0.5.json
index 20634c06e1..268891fb46 100644
--- a/resources/profiles/Prusa/process/0.25mm SPEED @CORE One HF 0.5.json	
+++ b/resources/profiles/Prusa/process/0.25mm SPEED @CORE One HF 0.5.json	
@@ -4,7 +4,7 @@
     "inherits": "0.25mm SPEED @MK4S HF0.5",
     "from": "system",
     "instantiation": "true",
-    "overhang_2_4_speed": "50",
+    "overhang_3_4_speed": "50",
     "travel_speed": "350",
     "travel_acceleration": "7000",
     "default_acceleration": "3000",
diff --git a/resources/profiles/Prusa/process/0.25mm SPEED @CORE One HF 0.6.json b/resources/profiles/Prusa/process/0.25mm SPEED @CORE One HF 0.6.json
index 493f82b29b..bb26e69f5d 100644
--- a/resources/profiles/Prusa/process/0.25mm SPEED @CORE One HF 0.6.json	
+++ b/resources/profiles/Prusa/process/0.25mm SPEED @CORE One HF 0.6.json	
@@ -4,8 +4,8 @@
     "inherits": "0.25mm SPEED @MK4S HF0.6",
     "from": "system",
     "instantiation": "true",
-    "overhang_2_4_speed": "30",
-    "overhang_3_4_speed": "70%",
+    "overhang_3_4_speed": "30",
+    "overhang_4_4_speed": "70%",
     "travel_speed": "350",
     "travel_acceleration": "7000",
     "default_acceleration": "3000",
diff --git a/resources/profiles/Prusa/process/0.25mm STRUCTURAL @CORE One 0.5.json b/resources/profiles/Prusa/process/0.25mm STRUCTURAL @CORE One 0.5.json
index a89610e3ee..c4d22efeb2 100644
--- a/resources/profiles/Prusa/process/0.25mm STRUCTURAL @CORE One 0.5.json	
+++ b/resources/profiles/Prusa/process/0.25mm STRUCTURAL @CORE One 0.5.json	
@@ -4,7 +4,7 @@
     "inherits": "0.25mm STRUCTURAL @MK4S 0.5",
     "from": "system",
     "instantiation": "true",
-    "overhang_2_4_speed": "45",
+    "overhang_3_4_speed": "45",
     "travel_speed": "350",
     "travel_acceleration": "7000",
     "default_acceleration": "3000",
diff --git a/resources/profiles/Prusa/process/0.25mm STRUCTURAL @CORE One 0.6.json b/resources/profiles/Prusa/process/0.25mm STRUCTURAL @CORE One 0.6.json
index 5418273bb2..96a614266d 100644
--- a/resources/profiles/Prusa/process/0.25mm STRUCTURAL @CORE One 0.6.json	
+++ b/resources/profiles/Prusa/process/0.25mm STRUCTURAL @CORE One 0.6.json	
@@ -4,7 +4,7 @@
     "inherits": "0.25mm STRUCTURAL @MK4S 0.6",
     "from": "system",
     "instantiation": "true",
-    "overhang_2_4_speed": "30",
+    "overhang_3_4_speed": "30",
     "travel_speed": "350",
     "travel_acceleration": "7000",
     "default_acceleration": "3000",
diff --git a/resources/profiles/Prusa/process/0.25mm STRUCTURAL @CORE One HF 0.4.json b/resources/profiles/Prusa/process/0.25mm STRUCTURAL @CORE One HF 0.4.json
index 6392a2c0f7..978f3f94d0 100644
--- a/resources/profiles/Prusa/process/0.25mm STRUCTURAL @CORE One HF 0.4.json	
+++ b/resources/profiles/Prusa/process/0.25mm STRUCTURAL @CORE One HF 0.4.json	
@@ -4,7 +4,7 @@
     "inherits": "0.25mm STRUCTURAL @MK4S HF0.4",
     "from": "system",
     "instantiation": "true",
-    "overhang_2_4_speed": "45",
+    "overhang_3_4_speed": "45",
     "travel_speed": "350",
     "travel_acceleration": "7000",
     "default_acceleration": "3000",
diff --git a/resources/profiles/Prusa/process/0.25mm Speed @MINIIS.json b/resources/profiles/Prusa/process/0.25mm Speed @MINIIS.json
index c5085cbf7c..33e3de92dc 100644
--- a/resources/profiles/Prusa/process/0.25mm Speed @MINIIS.json	
+++ b/resources/profiles/Prusa/process/0.25mm Speed @MINIIS.json	
@@ -30,7 +30,11 @@
     "overhang_1_4_speed": "45",
     "travel_speed": "300",
     "internal_solid_infill_acceleration": "3000",
-    "support_top_z_distance": "0.25",
+    "support_base_pattern_spacing": "2",
+    "support_top_z_distance": "0.22",
+    "support_bottom_z_distance": "0.22",
+    "support_bottom_interface_spacing": "0.22",
+    "support_interface_spacing": "0.25",
     "compatible_printers": [
         "Prusa MINIIS 0.6 nozzle"
     ]
diff --git a/resources/profiles/Prusa/process/0.25mm Speed @MK3.5.json b/resources/profiles/Prusa/process/0.25mm Speed @MK3.5.json
index 6dec0d7f5c..7ebe2664ef 100644
--- a/resources/profiles/Prusa/process/0.25mm Speed @MK3.5.json	
+++ b/resources/profiles/Prusa/process/0.25mm Speed @MK3.5.json	
@@ -30,7 +30,11 @@
     "overhang_1_4_speed": "45",
     "travel_speed": "300",
     "internal_solid_infill_acceleration": "3000",
-    "support_top_z_distance": "0.25",
+    "support_base_pattern_spacing": "2",
+    "support_top_z_distance": "0.22",
+    "support_bottom_z_distance": "0.22",
+    "support_bottom_interface_spacing": "0.22",
+    "support_interface_spacing": "0.25",
     "compatible_printers": [
         "Prusa MK3.5 0.6 nozzle"
     ]
diff --git a/resources/profiles/Prusa/process/0.25mm Standard @MINIIS.json b/resources/profiles/Prusa/process/0.25mm Standard @MINIIS.json
index e98b851fc4..4191366100 100644
--- a/resources/profiles/Prusa/process/0.25mm Standard @MINIIS.json	
+++ b/resources/profiles/Prusa/process/0.25mm Standard @MINIIS.json	
@@ -29,7 +29,11 @@
     "gap_infill_speed": "60",
     "support_speed": "80",
     "travel_speed": "300",
-    "support_top_z_distance": "0.25",
+    "support_base_pattern_spacing": "2",
+    "support_top_z_distance": "0.22",
+    "support_bottom_z_distance": "0.22",
+    "support_bottom_interface_spacing": "0.22",
+    "support_interface_spacing": "0.25",
     "compatible_printers": [
         "Prusa MINIIS 0.6 nozzle"
     ]
diff --git a/resources/profiles/Prusa/process/0.25mm Standard @MK3.5.json b/resources/profiles/Prusa/process/0.25mm Standard @MK3.5.json
index e9c0451d61..64e099d97e 100644
--- a/resources/profiles/Prusa/process/0.25mm Standard @MK3.5.json	
+++ b/resources/profiles/Prusa/process/0.25mm Standard @MK3.5.json	
@@ -29,7 +29,11 @@
     "gap_infill_speed": "60",
     "support_speed": "80",
     "travel_speed": "300",
-    "support_top_z_distance": "0.25",
+    "support_base_pattern_spacing": "2",
+    "support_top_z_distance": "0.22",
+    "support_bottom_z_distance": "0.22",
+    "support_bottom_interface_spacing": "0.22",
+    "support_interface_spacing": "0.25",
     "compatible_printers": [
         "Prusa MK3.5 0.6 nozzle"
     ]
diff --git a/resources/profiles/Prusa/process/0.28mm DRAFT @CORE One HF 0.4.json b/resources/profiles/Prusa/process/0.28mm DRAFT @CORE One HF 0.4.json
index a1f896b3c0..e493e19467 100644
--- a/resources/profiles/Prusa/process/0.28mm DRAFT @CORE One HF 0.4.json	
+++ b/resources/profiles/Prusa/process/0.28mm DRAFT @CORE One HF 0.4.json	
@@ -4,7 +4,7 @@
     "inherits": "0.28mm DRAFT @MK4S HF0.4",
     "from": "system",
     "instantiation": "true",
-    "overhang_2_4_speed": "50",
+    "overhang_3_4_speed": "50",
     "support_threshold_angle": "35",
     "outer_wall_acceleration": "3000",
     "inner_wall_acceleration": "6000",
diff --git a/resources/profiles/Prusa/process/0.30mm DETAIL @CORE One 0.8.json b/resources/profiles/Prusa/process/0.30mm DETAIL @CORE One 0.8.json
index 0ecac72e60..db88957c69 100644
--- a/resources/profiles/Prusa/process/0.30mm DETAIL @CORE One 0.8.json	
+++ b/resources/profiles/Prusa/process/0.30mm DETAIL @CORE One 0.8.json	
@@ -4,8 +4,8 @@
     "inherits": "0.30mm DETAIL @MK4S 0.8",
     "from": "system",
     "instantiation": "true",
-    "overhang_2_4_speed": "35",
-    "top_surface_speed": "2000",
+    "overhang_3_4_speed": "35",
+    "top_surface_acceleration": "2000",
     "inner_wall_acceleration": "2500",
     "internal_solid_infill_acceleration": "5000",
     "sparse_infill_acceleration": "7000",
@@ -15,5 +15,6 @@
     "support_interface_top_layers": "3",
     "initial_layer_infill_speed": "55",
     "initial_layer_speed": "45",
-    "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.8 and printer_notes!~/.*HF_NOZZLE.*/"
+    "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.8 and printer_notes!~/.*HF_NOZZLE.*/",
+    "gap_infill_speed": "45"
 }
\ No newline at end of file
diff --git a/resources/profiles/Prusa/process/0.30mm Detail @MINIIS.json b/resources/profiles/Prusa/process/0.30mm Detail @MINIIS.json
index 90a7a28fb8..dcc20a87bd 100644
--- a/resources/profiles/Prusa/process/0.30mm Detail @MINIIS.json	
+++ b/resources/profiles/Prusa/process/0.30mm Detail @MINIIS.json	
@@ -21,7 +21,11 @@
     "bottom_shell_thickness": "0.5",
     "bottom_shell_layers": "2",
     "travel_speed": "300",
+    "support_base_pattern_spacing": "2",
     "support_top_z_distance": "0.25",
+    "support_bottom_z_distance": "0.25",
+    "support_bottom_interface_spacing": "0.25",
+    "support_interface_spacing": "0.35",
     "compatible_printers": [
         "Prusa MINIIS 0.8 nozzle"
     ]
diff --git a/resources/profiles/Prusa/process/0.30mm Detail @MK3.5.json b/resources/profiles/Prusa/process/0.30mm Detail @MK3.5.json
index 7d4ed7d622..975851d38f 100644
--- a/resources/profiles/Prusa/process/0.30mm Detail @MK3.5.json	
+++ b/resources/profiles/Prusa/process/0.30mm Detail @MK3.5.json	
@@ -21,7 +21,11 @@
     "bottom_shell_thickness": "0.5",
     "bottom_shell_layers": "2",
     "travel_speed": "300",
+    "support_base_pattern_spacing": "2",
     "support_top_z_distance": "0.25",
+    "support_bottom_z_distance": "0.25",
+    "support_bottom_interface_spacing": "0.25",
+    "support_interface_spacing": "0.35",
     "compatible_printers": [
         "Prusa MK3.5 0.8 nozzle"
     ]
diff --git a/resources/profiles/Prusa/process/0.30mm SPEED @CORE One HF 0.8.json b/resources/profiles/Prusa/process/0.30mm SPEED @CORE One HF 0.8.json
index 8477a7c0f9..d4be25be9a 100644
--- a/resources/profiles/Prusa/process/0.30mm SPEED @CORE One HF 0.8.json	
+++ b/resources/profiles/Prusa/process/0.30mm SPEED @CORE One HF 0.8.json	
@@ -4,8 +4,8 @@
     "inherits": "0.30mm SPEED @MK4S HF0.8",
     "from": "system",
     "instantiation": "true",
-    "overhang_2_4_speed": "45",
-    "top_surface_speed": "2000",
+    "overhang_3_4_speed": "45",
+    "top_surface_acceleration": "2000",
     "travel_speed": "350",
     "travel_acceleration": "7000",
     "default_acceleration": "3000",
diff --git a/resources/profiles/Prusa/process/0.30mm STRUCTURAL @CORE One HF 0.8.json b/resources/profiles/Prusa/process/0.30mm STRUCTURAL @CORE One HF 0.8.json
index d8cb0916af..7426aa3a21 100644
--- a/resources/profiles/Prusa/process/0.30mm STRUCTURAL @CORE One HF 0.8.json	
+++ b/resources/profiles/Prusa/process/0.30mm STRUCTURAL @CORE One HF 0.8.json	
@@ -4,8 +4,8 @@
     "inherits": "0.30mm STRUCTURAL @MK4S HF0.8",
     "from": "system",
     "instantiation": "true",
-    "overhang_2_4_speed": "40",
-    "top_surface_speed": "2000",
+    "overhang_3_4_speed": "40",
+    "top_surface_acceleration": "2000",
     "support_speed": "100",
     "support_interface_speed": "55%",
     "travel_speed": "350",
@@ -18,6 +18,5 @@
     "sparse_infill_acceleration": "6000",
     "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.8 and printer_notes=~/.*HF_NOZZLE.*/",
     "inner_wall_acceleration": "2500",
-    "outer_wall_acceleration": "1500",
-    "top_surface_acceleration": "2000"
+    "outer_wall_acceleration": "1500"
 }
\ No newline at end of file
diff --git a/resources/profiles/Prusa/process/0.32mm High Flow @MINIIS.json b/resources/profiles/Prusa/process/0.32mm High Flow @MINIIS.json
index a1fbbc989f..7602017ccd 100644
--- a/resources/profiles/Prusa/process/0.32mm High Flow @MINIIS.json	
+++ b/resources/profiles/Prusa/process/0.32mm High Flow @MINIIS.json	
@@ -37,7 +37,11 @@
     "outer_wall_acceleration": "4000",
     "bridge_acceleration": "1500",
     "internal_solid_infill_acceleration": "3000",
+    "support_base_pattern_spacing": "2",
     "support_top_z_distance": "0.25",
+    "support_bottom_z_distance": "0.25",
+    "support_bottom_interface_spacing": "0.25",
+    "support_interface_spacing": "0.25",
     "compatible_printers": [
         "Prusa MINIIS 0.6 nozzle"
     ]
diff --git a/resources/profiles/Prusa/process/0.32mm High Flow @MK3.5.json b/resources/profiles/Prusa/process/0.32mm High Flow @MK3.5.json
index 43a0733ac4..b295a0b1b3 100644
--- a/resources/profiles/Prusa/process/0.32mm High Flow @MK3.5.json	
+++ b/resources/profiles/Prusa/process/0.32mm High Flow @MK3.5.json	
@@ -39,7 +39,11 @@
     "outer_wall_acceleration": "4000",
     "bridge_acceleration": "1500",
     "internal_solid_infill_acceleration": "3000",
+    "support_base_pattern_spacing": "2",
     "support_top_z_distance": "0.25",
+    "support_bottom_z_distance": "0.25",
+    "support_bottom_interface_spacing": "0.25",
+    "support_interface_spacing": "0.25",
     "compatible_printers": [
         "Prusa MK3.5 0.6 nozzle"
     ]
diff --git a/resources/profiles/Prusa/process/0.32mm SPEED @CORE One 0.6.json b/resources/profiles/Prusa/process/0.32mm SPEED @CORE One 0.6.json
index 549b62c466..8b4b7511b1 100644
--- a/resources/profiles/Prusa/process/0.32mm SPEED @CORE One 0.6.json	
+++ b/resources/profiles/Prusa/process/0.32mm SPEED @CORE One 0.6.json	
@@ -4,8 +4,8 @@
     "inherits": "0.32mm SPEED @MK4S 0.6",
     "from": "system",
     "instantiation": "true",
-    "overhang_2_4_speed": "30",
-    "overhang_3_4_speed": "70%",
+    "overhang_3_4_speed": "30",
+    "overhang_4_4_speed": "70%",
     "travel_speed": "350",
     "travel_acceleration": "7000",
     "default_acceleration": "3000",
diff --git a/resources/profiles/Prusa/process/0.32mm SPEED @CORE One HF 0.5.json b/resources/profiles/Prusa/process/0.32mm SPEED @CORE One HF 0.5.json
index 1471abb700..55594a5dd2 100644
--- a/resources/profiles/Prusa/process/0.32mm SPEED @CORE One HF 0.5.json	
+++ b/resources/profiles/Prusa/process/0.32mm SPEED @CORE One HF 0.5.json	
@@ -4,7 +4,7 @@
     "inherits": "0.32mm SPEED @MK4S HF0.5",
     "from": "system",
     "instantiation": "true",
-    "overhang_2_4_speed": "50",
+    "overhang_3_4_speed": "50",
     "support_interface_speed": "50%",
     "travel_speed": "350",
     "travel_acceleration": "7000",
diff --git a/resources/profiles/Prusa/process/0.32mm SPEED @CORE One HF 0.6.json b/resources/profiles/Prusa/process/0.32mm SPEED @CORE One HF 0.6.json
index e9bde33023..533da07e95 100644
--- a/resources/profiles/Prusa/process/0.32mm SPEED @CORE One HF 0.6.json	
+++ b/resources/profiles/Prusa/process/0.32mm SPEED @CORE One HF 0.6.json	
@@ -4,9 +4,9 @@
     "inherits": "0.32mm SPEED @MK4S HF0.6",
     "from": "system",
     "instantiation": "true",
-    "overhang_2_4_speed": "35",
-    "overhang_3_4_speed": "70%",
-    "top_surface_speed": "2000",
+    "overhang_3_4_speed": "35",
+    "overhang_4_4_speed": "70%",
+    "top_surface_acceleration": "2000",
     "travel_speed": "350",
     "travel_acceleration": "7000",
     "default_acceleration": "3000",
@@ -17,6 +17,5 @@
     "sparse_infill_acceleration": "7000",
     "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.6 and printer_notes=~/.*HF_NOZZLE.*/",
     "inner_wall_acceleration": "6000",
-    "outer_wall_acceleration": "3000",
-    "top_surface_acceleration": "2000"
+    "outer_wall_acceleration": "3000"
 }
\ No newline at end of file
diff --git a/resources/profiles/Prusa/process/0.32mm STRUCTURAL @CORE One 0.6.json b/resources/profiles/Prusa/process/0.32mm STRUCTURAL @CORE One 0.6.json
index e52aa90a5f..a652b7097c 100644
--- a/resources/profiles/Prusa/process/0.32mm STRUCTURAL @CORE One 0.6.json	
+++ b/resources/profiles/Prusa/process/0.32mm STRUCTURAL @CORE One 0.6.json	
@@ -4,7 +4,7 @@
     "inherits": "0.32mm STRUCTURAL @MK4S 0.6",
     "from": "system",
     "instantiation": "true",
-    "overhang_2_4_speed": "30",
+    "overhang_3_4_speed": "30",
     "travel_speed": "350",
     "travel_acceleration": "7000",
     "default_acceleration": "3000",
diff --git a/resources/profiles/Prusa/process/0.32mm STRUCTURAL @CORE One HF 0.5.json b/resources/profiles/Prusa/process/0.32mm STRUCTURAL @CORE One HF 0.5.json
index a1f851d518..7fb4500b02 100644
--- a/resources/profiles/Prusa/process/0.32mm STRUCTURAL @CORE One HF 0.5.json	
+++ b/resources/profiles/Prusa/process/0.32mm STRUCTURAL @CORE One HF 0.5.json	
@@ -4,7 +4,7 @@
     "inherits": "0.32mm STRUCTURAL @MK4S HF0.5",
     "from": "system",
     "instantiation": "true",
-    "overhang_2_4_speed": "45",
+    "overhang_3_4_speed": "45",
     "support_speed": "120",
     "support_interface_speed": "50%",
     "travel_speed": "350",
diff --git a/resources/profiles/Prusa/process/0.32mm STRUCTURAL @CORE One HF 0.6.json b/resources/profiles/Prusa/process/0.32mm STRUCTURAL @CORE One HF 0.6.json
index 2a3f2ce950..887768ee8e 100644
--- a/resources/profiles/Prusa/process/0.32mm STRUCTURAL @CORE One HF 0.6.json	
+++ b/resources/profiles/Prusa/process/0.32mm STRUCTURAL @CORE One HF 0.6.json	
@@ -4,7 +4,7 @@
     "inherits": "0.32mm STRUCTURAL @MK4S HF0.6",
     "from": "system",
     "instantiation": "true",
-    "overhang_2_4_speed": "35",
+    "overhang_3_4_speed": "35",
     "support_speed": "110",
     "support_interface_speed": "50%",
     "travel_speed": "350",
diff --git a/resources/profiles/Prusa/process/0.32mm Standard @MINIIS.json b/resources/profiles/Prusa/process/0.32mm Standard @MINIIS.json
index 411a870db7..c1edeeb9eb 100644
--- a/resources/profiles/Prusa/process/0.32mm Standard @MINIIS.json	
+++ b/resources/profiles/Prusa/process/0.32mm Standard @MINIIS.json	
@@ -30,7 +30,11 @@
     "top_surface_speed": "55",
     "gap_infill_speed": "45",
     "travel_speed": "300",
+    "support_base_pattern_spacing": "2",
     "support_top_z_distance": "0.25",
+    "support_bottom_z_distance": "0.25",
+    "support_bottom_interface_spacing": "0.25",
+    "support_interface_spacing": "0.25",
     "compatible_printers": [
         "Prusa MINIIS 0.6 nozzle"
     ]
diff --git a/resources/profiles/Prusa/process/0.32mm Standard @MK3.5.json b/resources/profiles/Prusa/process/0.32mm Standard @MK3.5.json
index 1f4001c0fb..5674aed58e 100644
--- a/resources/profiles/Prusa/process/0.32mm Standard @MK3.5.json	
+++ b/resources/profiles/Prusa/process/0.32mm Standard @MK3.5.json	
@@ -30,7 +30,11 @@
     "top_surface_speed": "55",
     "gap_infill_speed": "45",
     "travel_speed": "300",
+    "support_base_pattern_spacing": "2",
     "support_top_z_distance": "0.25",
+    "support_bottom_z_distance": "0.25",
+    "support_bottom_interface_spacing": "0.25",
+    "support_interface_spacing": "0.25",    
     "compatible_printers": [
         "Prusa MK3.5 0.6 nozzle"
     ]
diff --git a/resources/profiles/Prusa/process/0.35mm Standard @MINIIS.json b/resources/profiles/Prusa/process/0.35mm Standard @MINIIS.json
index bb7145adc8..edc3044976 100644
--- a/resources/profiles/Prusa/process/0.35mm Standard @MINIIS.json	
+++ b/resources/profiles/Prusa/process/0.35mm Standard @MINIIS.json	
@@ -30,7 +30,11 @@
     "top_surface_speed": "55",
     "gap_infill_speed": "45",
     "travel_speed": "300",
-    "support_top_z_distance": "0.25",
+    "support_base_pattern_spacing": "2",
+    "support_top_z_distance": "0.22",
+    "support_bottom_z_distance": "0.22",
+    "support_bottom_interface_spacing": "0.22",
+    "support_interface_spacing": "0.25",
     "compatible_printers": [
         "Prusa MINIIS 0.6 nozzle"
     ]
diff --git a/resources/profiles/Prusa/process/0.35mm Standard @MK3.5.json b/resources/profiles/Prusa/process/0.35mm Standard @MK3.5.json
index 9ff6c800c2..82e2034788 100644
--- a/resources/profiles/Prusa/process/0.35mm Standard @MK3.5.json	
+++ b/resources/profiles/Prusa/process/0.35mm Standard @MK3.5.json	
@@ -30,7 +30,11 @@
     "top_surface_speed": "55",
     "gap_infill_speed": "45",
     "travel_speed": "300",
-    "support_top_z_distance": "0.25",
+    "support_base_pattern_spacing": "2",
+    "support_top_z_distance": "0.22",
+    "support_bottom_z_distance": "0.22",
+    "support_bottom_interface_spacing": "0.22",
+    "support_interface_spacing": "0.25",
     "compatible_printers": [
         "Prusa MK3.5 0.6 nozzle"
     ]
diff --git a/resources/profiles/Prusa/process/0.40mm High Flow @MINIIS.json b/resources/profiles/Prusa/process/0.40mm High Flow @MINIIS.json
index 593fda4beb..ea55022d19 100644
--- a/resources/profiles/Prusa/process/0.40mm High Flow @MINIIS.json	
+++ b/resources/profiles/Prusa/process/0.40mm High Flow @MINIIS.json	
@@ -41,7 +41,11 @@
     "inner_wall_acceleration": "3000",
     "outer_wall_acceleration": "2500",
     "bridge_acceleration": "1000",
+    "support_base_pattern_spacing": "2",
     "support_top_z_distance": "0.25",
+    "support_bottom_z_distance": "0.25",
+    "support_bottom_interface_spacing": "0.25",
+    "support_interface_spacing": "0.35",
     "compatible_printers": [
         "Prusa MINIIS 0.8 nozzle"
     ]
diff --git a/resources/profiles/Prusa/process/0.40mm High Flow @MK3.5.json b/resources/profiles/Prusa/process/0.40mm High Flow @MK3.5.json
index 056c8cb2be..79fda27a93 100644
--- a/resources/profiles/Prusa/process/0.40mm High Flow @MK3.5.json	
+++ b/resources/profiles/Prusa/process/0.40mm High Flow @MK3.5.json	
@@ -41,7 +41,11 @@
     "inner_wall_acceleration": "3000",
     "outer_wall_acceleration": "2500",
     "bridge_acceleration": "1000",
+    "support_base_pattern_spacing": "2",
     "support_top_z_distance": "0.25",
+    "support_bottom_z_distance": "0.25",
+    "support_bottom_interface_spacing": "0.25",
+    "support_interface_spacing": "0.35",
     "compatible_printers": [
         "Prusa MK3.5 0.8 nozzle"
     ]
diff --git a/resources/profiles/Prusa/process/0.40mm QUALITY @CORE One 0.8.json b/resources/profiles/Prusa/process/0.40mm QUALITY @CORE One 0.8.json
index 4567cd1dd7..a92c5eb3dd 100644
--- a/resources/profiles/Prusa/process/0.40mm QUALITY @CORE One 0.8.json	
+++ b/resources/profiles/Prusa/process/0.40mm QUALITY @CORE One 0.8.json	
@@ -4,8 +4,8 @@
     "inherits": "0.40mm QUALITY @MK4S 0.8",
     "from": "system",
     "instantiation": "true",
-    "overhang_2_4_speed": "35",
-    "top_surface_speed": "2000",
+    "overhang_3_4_speed": "35",
+    "top_surface_acceleration": "2000",
     "inner_wall_acceleration": "2500",
     "internal_solid_infill_acceleration": "5000",
     "sparse_infill_acceleration": "7000",
diff --git a/resources/profiles/Prusa/process/0.40mm SPEED @CORE One HF 0.6.json b/resources/profiles/Prusa/process/0.40mm SPEED @CORE One HF 0.6.json
index e0b870c9ad..bb913bcabd 100644
--- a/resources/profiles/Prusa/process/0.40mm SPEED @CORE One HF 0.6.json	
+++ b/resources/profiles/Prusa/process/0.40mm SPEED @CORE One HF 0.6.json	
@@ -4,9 +4,9 @@
     "inherits": "0.40mm SPEED @MK4S HF0.6",
     "from": "system",
     "instantiation": "true",
-    "overhang_2_4_speed": "35",
-    "overhang_3_4_speed": "70%",
-    "top_surface_speed": "2000",
+    "overhang_3_4_speed": "35",
+    "overhang_4_4_speed": "70%",
+    "top_surface_acceleration": "2000",
     "travel_speed": "350",
     "travel_acceleration": "7000",
     "default_acceleration": "3000",
@@ -17,6 +17,5 @@
     "sparse_infill_acceleration": "7000",
     "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.6 and printer_notes=~/.*HF_NOZZLE.*/",
     "inner_wall_acceleration": "6000",
-    "outer_wall_acceleration": "3000",
-    "top_surface_acceleration": "2000"
+    "outer_wall_acceleration": "3000"
 }
\ No newline at end of file
diff --git a/resources/profiles/Prusa/process/0.40mm SPEED @CORE One HF 0.8.json b/resources/profiles/Prusa/process/0.40mm SPEED @CORE One HF 0.8.json
index 142556619a..7e6f2c156c 100644
--- a/resources/profiles/Prusa/process/0.40mm SPEED @CORE One HF 0.8.json	
+++ b/resources/profiles/Prusa/process/0.40mm SPEED @CORE One HF 0.8.json	
@@ -4,8 +4,8 @@
     "inherits": "0.40mm SPEED @MK4S HF0.8",
     "from": "system",
     "instantiation": "true",
-    "overhang_2_4_speed": "45",
-    "top_surface_speed": "2000",
+    "overhang_3_4_speed": "45",
+    "top_surface_acceleration": "2000",
     "travel_speed": "350",
     "travel_acceleration": "7000",
     "default_acceleration": "3000",
@@ -14,5 +14,7 @@
     "initial_layer_speed": "45",
     "internal_solid_infill_acceleration": "5000",
     "sparse_infill_acceleration": "7000",
-    "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.8 and printer_notes=~/.*HF_NOZZLE.*/"
+    "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.8 and printer_notes=~/.*HF_NOZZLE.*/",
+    "small_perimeter_speed": "85",
+    "outer_wall_speed": "85"
 }
\ No newline at end of file
diff --git a/resources/profiles/Prusa/process/0.40mm STRUCTURAL @CORE One HF 0.6.json b/resources/profiles/Prusa/process/0.40mm STRUCTURAL @CORE One HF 0.6.json
index adfba858f2..fe8697d887 100644
--- a/resources/profiles/Prusa/process/0.40mm STRUCTURAL @CORE One HF 0.6.json	
+++ b/resources/profiles/Prusa/process/0.40mm STRUCTURAL @CORE One HF 0.6.json	
@@ -4,7 +4,7 @@
     "inherits": "0.40mm STRUCTURAL @MK4S HF0.6",
     "from": "system",
     "instantiation": "true",
-    "overhang_2_4_speed": "35",
+    "overhang_3_4_speed": "35",
     "travel_speed": "350",
     "travel_acceleration": "7000",
     "default_acceleration": "3000",
diff --git a/resources/profiles/Prusa/process/0.40mm STRUCTURAL @CORE One HF 0.8.json b/resources/profiles/Prusa/process/0.40mm STRUCTURAL @CORE One HF 0.8.json
index e651c26ce3..6fbe39f6ba 100644
--- a/resources/profiles/Prusa/process/0.40mm STRUCTURAL @CORE One HF 0.8.json	
+++ b/resources/profiles/Prusa/process/0.40mm STRUCTURAL @CORE One HF 0.8.json	
@@ -4,8 +4,8 @@
     "inherits": "0.40mm STRUCTURAL @MK4S HF0.8",
     "from": "system",
     "instantiation": "true",
-    "overhang_2_4_speed": "40",
-    "top_surface_speed": "2000",
+    "overhang_3_4_speed": "40",
+    "top_surface_acceleration": "2000",
     "travel_speed": "350",
     "travel_acceleration": "7000",
     "default_acceleration": "3000",
@@ -16,6 +16,5 @@
     "sparse_infill_acceleration": "6000",
     "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.8 and printer_notes=~/.*HF_NOZZLE.*/",
     "inner_wall_acceleration": "2500",
-    "outer_wall_acceleration": "1500",
-    "top_surface_acceleration": "2000"
+    "outer_wall_acceleration": "1500"
 }
\ No newline at end of file
diff --git a/resources/profiles/Prusa/process/0.40mm Standard @MINIIS.json b/resources/profiles/Prusa/process/0.40mm Standard @MINIIS.json
index c040568d16..a29bbbdbbe 100644
--- a/resources/profiles/Prusa/process/0.40mm Standard @MINIIS.json	
+++ b/resources/profiles/Prusa/process/0.40mm Standard @MINIIS.json	
@@ -40,7 +40,11 @@
     "inner_wall_acceleration": "2000",
     "outer_wall_acceleration": "1500",
     "bridge_acceleration": "1000",
+    "support_base_pattern_spacing": "2",
     "support_top_z_distance": "0.25",
+    "support_bottom_z_distance": "0.25",
+    "support_bottom_interface_spacing": "0.25",
+    "support_interface_spacing": "0.35",
     "compatible_printers": [
         "Prusa MINIIS 0.8 nozzle"
     ]
diff --git a/resources/profiles/Prusa/process/0.40mm Standard @MK3.5.json b/resources/profiles/Prusa/process/0.40mm Standard @MK3.5.json
index 31fddc238b..41659260f1 100644
--- a/resources/profiles/Prusa/process/0.40mm Standard @MK3.5.json	
+++ b/resources/profiles/Prusa/process/0.40mm Standard @MK3.5.json	
@@ -41,7 +41,11 @@
     "inner_wall_acceleration": "2000",
     "outer_wall_acceleration": "1500",
     "bridge_acceleration": "1000",
+    "support_base_pattern_spacing": "2",
     "support_top_z_distance": "0.25",
+    "support_bottom_z_distance": "0.25",
+    "support_bottom_interface_spacing": "0.25",
+    "support_interface_spacing": "0.35",
     "compatible_printers": [
         "Prusa MK3.5 0.8 nozzle"
     ]
diff --git a/resources/profiles/Prusa/process/0.55mm DRAFT @CORE One 0.8.json b/resources/profiles/Prusa/process/0.55mm DRAFT @CORE One 0.8.json
index 6037cbdbda..5d350f3738 100644
--- a/resources/profiles/Prusa/process/0.55mm DRAFT @CORE One 0.8.json	
+++ b/resources/profiles/Prusa/process/0.55mm DRAFT @CORE One 0.8.json	
@@ -4,7 +4,7 @@
     "inherits": "0.55mm DRAFT @MK4S 0.8",
     "from": "system",
     "instantiation": "true",
-    "top_surface_speed": "2000",
+    "top_surface_acceleration": "2000",
     "inner_wall_acceleration": "2500",
     "internal_solid_infill_acceleration": "5000",
     "sparse_infill_acceleration": "7000",
@@ -14,5 +14,6 @@
     "support_interface_top_layers": "3",
     "initial_layer_infill_speed": "55",
     "initial_layer_speed": "45",
-    "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.8 and printer_notes!~/.*HF_NOZZLE.*/"
+    "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.8 and printer_notes!~/.*HF_NOZZLE.*/",
+    "inner_wall_speed": "45"
 }
\ No newline at end of file
diff --git a/resources/profiles/Prusa/process/0.55mm SPEED @CORE One HF 0.8.json b/resources/profiles/Prusa/process/0.55mm SPEED @CORE One HF 0.8.json
index 11b159f114..f9270671a2 100644
--- a/resources/profiles/Prusa/process/0.55mm SPEED @CORE One HF 0.8.json	
+++ b/resources/profiles/Prusa/process/0.55mm SPEED @CORE One HF 0.8.json	
@@ -4,8 +4,8 @@
     "inherits": "0.55mm SPEED @MK4S HF0.8",
     "from": "system",
     "instantiation": "true",
-    "overhang_2_4_speed": "45",
-    "top_surface_speed": "2000",
+    "overhang_3_4_speed": "45",
+    "top_surface_acceleration": "2000",
     "travel_speed": "350",
     "travel_acceleration": "7000",
     "default_acceleration": "3000",
diff --git a/resources/profiles/Prusa/process/process_common_MK3.5.json b/resources/profiles/Prusa/process/process_common_MK3.5.json
index a5471d2bf6..4873772bf7 100644
--- a/resources/profiles/Prusa/process/process_common_MK3.5.json
+++ b/resources/profiles/Prusa/process/process_common_MK3.5.json
@@ -55,10 +55,13 @@
     "raft_contact_distance": "0.15",
     "raft_expansion": "1.5",
     "raft_first_layer_density": "90%",
-    "raft_first_layer_expansion": "3.5",
     "support_threshold_angle": "40",
     "support_interface_bottom_layers": "0",
     "support_base_pattern": "rectilinear",
     "support_interface_top_layers": "3",
-    "support_top_z_distance": "0.17"
+    "raft_first_layer_expansion": "3",
+    "support_base_pattern_spacing": "2",
+    "support_bottom_interface_spacing": "0.2",
+    "support_interface_spacing": "0.2",
+    "support_top_z_distance": "0.2"
 }
\ No newline at end of file
diff --git a/resources/profiles/Prusa/process/process_common_miniis.json b/resources/profiles/Prusa/process/process_common_miniis.json
index 443fae9dc3..533d660224 100644
--- a/resources/profiles/Prusa/process/process_common_miniis.json
+++ b/resources/profiles/Prusa/process/process_common_miniis.json
@@ -55,10 +55,13 @@
     "raft_contact_distance": "0.15",
     "raft_expansion": "1.5",
     "raft_first_layer_density": "90%",
-    "raft_first_layer_expansion": "3.5",
     "support_threshold_angle": "40",
     "support_interface_bottom_layers": "0",
     "support_base_pattern": "rectilinear",
     "support_interface_top_layers": "3",
-    "support_top_z_distance": "0.17"
+    "raft_first_layer_expansion": "3",
+    "support_base_pattern_spacing": "2",
+    "support_bottom_interface_spacing": "0.2",
+    "support_interface_spacing": "0.2",
+    "support_top_z_distance": "0.2"
 }
\ No newline at end of file
diff --git a/resources/web/flush/WipingDialog.html b/resources/web/flush/WipingDialog.html
index 4f6b807b9d..efaea1c8ea 100644
--- a/resources/web/flush/WipingDialog.html
+++ b/resources/web/flush/WipingDialog.html
@@ -137,40 +137,6 @@
         display: inline-block;
       }
 
-      .btn {
-        display: inline-block;
-        padding: 6px 9px;
-        border: 2px solid transparent;
-        border-radius: 12px;
-        font-size: 12px;
-        text-align: center;
-        cursor: pointer;
-        transition: all 0.3s;
-      }
-
-      .btn-ok {
-        color: #fff;
-        background-color: #009688;
-      }
-      .btn-ok:hover {
-        background-color: #26A69A;
-      }
-
-      .btn-cancel {
-        color: black;
-        background-color: white;
-        border: 1px solid black;
-      }
-      .btn-cancel:hover {
-        background-color: #eeeeee;
-      }
-
-      body.dark-mode button.btn-cancel {
-          background-color: #2d2d31;
-          color: #e0e0e0;
-          border: 1px solid #e0e0e0;
-      }
-
       select {
         padding: 6px 9px;
         border: 1px solid #dbdbdb;
@@ -197,7 +163,7 @@
       .button-container {
         display: flex;
         justify-content: center;
-        gap: 10px;
+        gap: 0px;
         margin: 10px;
       }
 
@@ -266,15 +232,6 @@
         position: sticky;
         z-index: 11;
       }
-
-      body.dark-mode .btn-ok {
-        background-color: #009688;
-      }
-
-      body.dark-mode .btn-dark {
-        background-color: #34495e;
-      }
-
       body.dark-mode select {
         background-color: #2d2d31;
         color: white;
@@ -295,6 +252,8 @@
     </style>
   </head>
 
+  <link rel="stylesheet" type="text/css" href="../include/global.css" /> <!-- ORCA One for all-->
+
   <body>
     <div class="container">
       <div class="tip-panel" id="auto_flush_tip">
@@ -303,14 +262,14 @@
         in Orca Slicer &gt; Preferences.
       </div>
 
-      <div style="margin-bottom: 10px; ">
-        <button
-          class="btn btn-ok"
+      <div style="margin-bottom: 10px; display: flex; align-items: center;">
+        <div
+          class="ButtonStyleConfirm ButtonTypeWindow"
           onclick="calcFlushingVolumes()"
           id="calc_btn"
         >
           Re-Calculate
-        </button>
+      </div>
         <select
           id="extruders"
           onchange="handleExtruderSelect(document.getElementById('extruders').value)"
@@ -366,12 +325,12 @@
         </div>
       </div>
       <div class="button-container" style="padding: 0px; margin: 0px;">
-        <button class="btn btn-ok" id="ok_btn" style="width: 60px; height: 30px; font-size: 12px; text-align: center;" onclick="storeData()">
+        <div class="ButtonStyleConfirm ButtonTypeChoice" id="ok_btn" onclick="storeData()">
           Save
-        </button>
-        <button class="btn btn-cancel" id="cancel_btn" style="width: 60px; height: 30px; font-size: 12px; text-align: center;" onclick="quit()">
+        </div>
+        <div class="ButtonStyleRegular ButtonTypeChoice" id="cancel_btn" onclick="quit()">
           Cancel
-        </button>
+        </div>
       </div>
     </div>
 
diff --git a/resources/web/guide/1/index.html b/resources/web/guide/1/index.html
index 00f134dd49..a5e969b42d 100644
--- a/resources/web/guide/1/index.html
+++ b/resources/web/guide/1/index.html
@@ -4,6 +4,7 @@
 <meta charset="utf-8">
 <meta http-equiv="Cache-Control" content="max-age=7200" />
 <title>引导_P1</title>
+<link rel="stylesheet" type="text/css" href="../../include/global.css" />	<!-- ORCA One for all-->
 <link rel="stylesheet" type="text/css" href="../css/common.css" />	
 <link rel="stylesheet" type="text/css" href="../css/dark.css" />		
 <link rel="stylesheet" type="text/css" href="1.css" />
@@ -19,7 +20,7 @@
 	<div id="Title" class="trans" tid="t1">Welcome to Orca Slicer</div>
 	<div id="STip" class="trans" tid="t2">Orca Slicer will be setup in several steps. Let's start!</div>
 	<div id="BtnArea">
-	    <a id="StartBtn" class="NormalBtn swiper-button-next trans" tid="t24" href="../11/index.html">Get Started</a>
+	    <a id="StartBtn" class="ButtonStyleConfirm ButtonTypeChoice trans" tid="t24" href="../11/index.html">Get Started</a>
 	</div>
 </body>
 </html>
diff --git a/resources/web/guide/11/index.html b/resources/web/guide/11/index.html
index e503b475f0..4b6e970d8a 100644
--- a/resources/web/guide/11/index.html
+++ b/resources/web/guide/11/index.html
@@ -4,6 +4,7 @@
 <meta charset="utf-8">
 <meta http-equiv="Cache-Control" content="max-age=7200" />
 <title>引导_P21</title>
+<link rel="stylesheet" type="text/css" href="../../include/global.css" />	<!-- ORCA One for all-->
 <link rel="stylesheet" type="text/css" href="../css/common.css" />		
 <link rel="stylesheet" type="text/css" href="11.css" />
 <link rel="stylesheet" type="text/css" href="../css/dark.css" />	
@@ -33,7 +34,7 @@
 	</div>-->
 </div>
 <div id="AcceptArea">
-	<div class="NormalBtn trans" id="AcceptBtn" tid="t9"  onclick="GotoPolicyPage()">Next</div>
+	<div class="ButtonStyleConfirm ButtonTypeChoice trans" id="AcceptBtn" tid="t9"  onclick="GotoPolicyPage()">Next</div>
 </div>	
 </body>
 </html>
diff --git a/resources/web/guide/21/21.css b/resources/web/guide/21/21.css
index 5b5f0f2e6a..b370a94879 100644
--- a/resources/web/guide/21/21.css
+++ b/resources/web/guide/21/21.css
@@ -25,10 +25,6 @@
 	margin-right: 0px; /* ORCA align buttons with end of horizontal separator/line */
 }
 
-.BannerBtns>.SmallBtn_Green.trans{
-	margin-right: 7px; /* ORCA adds a small gap between buttons */
-}
-
 .BlockBanner  a
 {
 	display: inline-block;
@@ -149,7 +145,7 @@ img.ModelThumbnail
 {
 	margin-top: 4mm;
 	display: flex;
-	justify-content:space-around;
+	justify-content:flex-end;
 }
 
 .search {
diff --git a/resources/web/guide/21/21.js b/resources/web/guide/21/21.js
index 9c4756cf21..53cef68b7e 100644
--- a/resources/web/guide/21/21.js
+++ b/resources/web/guide/21/21.js
@@ -91,8 +91,8 @@ function HandleModelList( pVal )
 '<div class="BlockBanner">'+
 '	<a>'+sVV+'</a>'+				
 '	<div class="BannerBtns">'+
-'		<div class="SmallBtn_Green trans" tid="t11" onClick="SelectPrinterAll('+"\'"+strVendor+"\'"+')">all</div>'+
-'		<div class="SmallBtn trans" tid="t12" onClick="SelectPrinterNone('+"\'"+strVendor+"\'"+')">none</div>'+
+'		<div class="ButtonStyleConfirm ButtonTypeWindow trans" tid="t11" onClick="SelectPrinterAll('+"\'"+strVendor+"\'"+')">all</div>'+
+'		<div class="ButtonStyleRegular ButtonTypeWindow trans" tid="t12" onClick="SelectPrinterNone('+"\'"+strVendor+"\'"+')">none</div>'+
 '	</div>'+
 '</div>'+
 '<div class="PrinterArea">	'+
@@ -210,8 +210,8 @@ function FilterModelList(keyword) {
 				'<div class="BlockBanner">' +
 				'	<a>' + sVV + '</a>' +
 				'	<div class="BannerBtns">' +
-				'		<div class="SmallBtn_Green trans" tid="t11" onClick="SelectPrinterAll(' + "\'" + strVendor + "\'" + ')">all</div>' +
-				'		<div class="SmallBtn trans" tid="t12" onClick="SelectPrinterNone(' + "\'" + strVendor + "\'" + ')">none</div>' +
+				'		<div class="ButtonStyleConfirm ButtonTypeWindow trans" tid="t11" onClick="SelectPrinterAll(' + "\'" + strVendor + "\'" + ')">all</div>' +
+				'		<div class="ButtonStyleRegular ButtonTypeWindow trans" tid="t12" onClick="SelectPrinterNone(' + "\'" + strVendor + "\'" + ')">none</div>' +
 				'	</div>' +
 				'</div>' +
 				'<div class="PrinterArea">	' +
diff --git a/resources/web/guide/21/index.html b/resources/web/guide/21/index.html
index 53b6bf2d6c..6a929c9eec 100644
--- a/resources/web/guide/21/index.html
+++ b/resources/web/guide/21/index.html
@@ -4,6 +4,7 @@
 <meta charset="utf-8">
 <meta http-equiv="Cache-Control" content="max-age=7200" />
 <title>引导_P21</title>
+<link rel="stylesheet" type="text/css" href="../../include/global.css" />	<!-- ORCA One for all-->
 <link rel="stylesheet" type="text/css" href="../css/common.css" />	
 <link rel="stylesheet" type="text/css" href="21.css" />
 <link rel="stylesheet" type="text/css" href="../css/dark.css" />	
@@ -34,8 +35,8 @@
 <div class="BlockBanner">
 	<a>BBL-3DP</a>		
 	<div class="BannerBtns">
-		<div class="SmallBtn_Green trans" onClick="SelectPrinterAll('BBL')">所有</div>
-		<div class="SmallBtn trans" onClick="SelectPrinterNone('BBL')">无</div>
+		<div class="ButtonStyleConfirm ButtonTypeWindow trans" onClick="SelectPrinterAll('BBL')">所有</div>
+		<div class="ButtonStyleRegular ButtonTypeWindow trans" onClick="SelectPrinterNone('BBL')">无</div>
 	</div>
 </div>
 	
@@ -120,8 +121,8 @@
 	
 </div>
 <div id="AcceptArea">
-	<div class="GrayBtn trans" id="PreBtn" tid="t8"  onclick="window.open('../1/index.html','_self')">Back</div>
-	<div class="NormalBtn trans" id="AcceptBtn" tid="t9"  onclick="GotoFilamentPage()">Next</div>
+	<div class="ButtonStyleRegular ButtonTypeChoice trans" id="PreBtn" tid="t8"  onclick="window.open('../1/index.html','_self')">Back</div>
+	<div class="ButtonStyleConfirm ButtonTypeChoice trans" id="AcceptBtn" tid="t9"  onclick="GotoFilamentPage()">Next</div>
 </div>
 	
 <div id="NoticeMask"></div>
@@ -130,7 +131,7 @@
 	<div id="NoticeContent">
 	<div id="NoticeText" class="trans" tid="t37">At least one printer must be selected.</div>
 	<div id="NoticeBtns">
-		<div class="SmallBtn trans" tid="t36" onClick="ShowNotice(0)">ok</div>
+		<div class="ButtonStyleConfirm ButtonTypeChoice trans" tid="t36" onClick="ShowNotice(0)">ok</div>
 	</div>
 	</div>
 </div>	
diff --git a/resources/web/guide/22/22.css b/resources/web/guide/22/22.css
index 8f8abac0a9..ee2a7d2746 100644
--- a/resources/web/guide/22/22.css
+++ b/resources/web/guide/22/22.css
@@ -39,12 +39,6 @@ input
 	align-items: center;
 }
 
-#ItemSelectArea .SmallBtn
-{
-	margin-left:5px;
-}
-
-
 #ItemBlockArea
 {
 	flex: 1 0 236px;
@@ -110,7 +104,7 @@ input
 {
 	margin-top: 4mm;
 	display: flex;
-	justify-content:space-around;
+	justify-content:flex-end;
 }
 
 #GotoNetPluginBtn
diff --git a/resources/web/guide/22/index.html b/resources/web/guide/22/index.html
index a23bfca06a..c104d82a09 100644
--- a/resources/web/guide/22/index.html
+++ b/resources/web/guide/22/index.html
@@ -4,6 +4,7 @@
 <meta charset="utf-8">
 <meta http-equiv="Cache-Control" content="max-age=0" />
 <title>引导_P21</title>
+<link rel="stylesheet" type="text/css" href="../../include/global.css" />	<!-- ORCA One for all-->
 <link rel="stylesheet" type="text/css" href="../css/common.css" />	
 <link rel="stylesheet" type="text/css" href="22.css" />
 <link rel="stylesheet" type="text/css" href="../css/dark.css" />		
@@ -44,17 +45,17 @@
 
 	
 <div id="ItemSelectArea">
-	<div class="SmallBtn_Green trans" tid="t11" onClick="SelectAllFilament(1)">All</div>
-	<div class="SmallBtn trans" tid="t12" onClick="SelectAllFilament(0)">Clear all</div>
+	<div class="ButtonStyleConfirm ButtonTypeWindow trans" tid="t11" onClick="SelectAllFilament(1)">All</div>
+	<div class="ButtonStyleRegular ButtonTypeWindow trans" tid="t12" onClick="SelectAllFilament(0)">Clear all</div>
 </div>
 <div id="ItemBlockArea" class="ZScrol">	
 </div>
 	
 </div>
 <div id="AcceptArea">
-	<div class="GrayBtn trans" tid="t8" id="PreBtn"  onclick="ReturnPreviewPage()">Back</div>
-	<div class="NormalBtn trans" tid="t25" id="AcceptBtn"  onclick="FinishGuide()">finish</div>
-	<div class="NormalBtn trans" tid="t9" id="GotoNetPluginBtn"  onclick="GotoNetPluginPage()">Next</div>	
+	<div class="ButtonStyleRegular ButtonTypeChoice trans" tid="t8" id="PreBtn"  onclick="ReturnPreviewPage()">Back</div>
+	<div class="ButtonStyleRegular ButtonTypeChoice trans" tid="t25" id="AcceptBtn"  onclick="FinishGuide()">finish</div>
+	<div class="ButtonStyleConfirm ButtonTypeChoice trans" tid="t9" id="GotoNetPluginBtn"  onclick="GotoNetPluginPage()">Next</div>	
 </div>
 <div id="NoticeMask">
 </div>
@@ -64,8 +65,8 @@
 	<div id="NoticeText" class="trans" tid="t19">At least one filament must be selected. </div>
 	<div id="NoticeText" class="trans" tid="t20">Do you want to use default filament ?</div>
 	<div id="NoticeBtns">
-		<div class="SmallBtn trans" tid="t21" onClick="ChooseDefaultFilament()">Yes</div>
-		<div class="SmallBtn trans" tid="t22" onClick="ShowNotice(0)">No</div>
+		<div class="ButtonStyleConfirm ButtonTypeChoice trans" tid="t21" onClick="ChooseDefaultFilament()">Yes</div>
+		<div class="ButtonStyleRegular ButtonTypeChoice trans" tid="t22" onClick="ShowNotice(0)">No</div>
 	</div>
 	</div>
 	</div>
diff --git a/resources/web/guide/23/23.css b/resources/web/guide/23/23.css
index c5c90943b9..57a376e458 100644
--- a/resources/web/guide/23/23.css
+++ b/resources/web/guide/23/23.css
@@ -39,12 +39,6 @@ input
 	align-items: center;
 }
 
-#ItemSelectArea .SmallBtn
-{
-	margin-left:5px;
-}
-
-
 #ItemBlockArea
 {
 	display:flex;
@@ -111,7 +105,7 @@ input
 {
 	margin-top: 4mm;
 	display: flex;
-	justify-content:space-around;
+	justify-content:flex-end;
 }
 
 #SystemFilamentsArea
diff --git a/resources/web/guide/23/index.html b/resources/web/guide/23/index.html
index cd3e42b8b7..34d69fd8c2 100644
--- a/resources/web/guide/23/index.html
+++ b/resources/web/guide/23/index.html
@@ -4,6 +4,7 @@
 <meta charset="utf-8">
 <meta http-equiv="Cache-Control" content="max-age=0" />
 <title>引导_P21</title>
+<link rel="stylesheet" type="text/css" href="../../include/global.css" />	<!-- ORCA One for all-->
 <link rel="stylesheet" type="text/css" href="../css/common.css" />	
 <link rel="stylesheet" type="text/css" href="23.css" />
 <link rel="stylesheet" type="text/css" href="../css/dark.css" />	
@@ -44,8 +45,8 @@
 </div>
 
 <div id="ItemSelectArea">
-	<div class="SmallBtn_Green trans" tid="t11" onClick="SelectAllFilament(1)">all</div>
-	<div class="SmallBtn trans" tid="t12" onClick="SelectAllFilament(0)">Clear all</div>
+	<div class="ButtonStyleConfirm ButtonTypeWindow  trans" tid="t11" onClick="SelectAllFilament(1)">all</div>
+	<div class="ButtonStyleRegular ButtonTypeWindow  trans" tid="t12" onClick="SelectAllFilament(0)">Clear all</div>
 </div>	
 	
 <div id="ItemBlockArea" class="ZScrol">	
@@ -55,7 +56,7 @@
 	
 <div id="CustomFilamentsArea">
 	<div id="CFilament_Btn_Area">
-		<div class="SmallBtn_Green trans" tid="t111" onClick="OnClickCustomFilamentAdd()">Create New</div>
+		<div class="ButtonStyleConfirm ButtonTypeWindow trans" tid="t111" onClick="OnClickCustomFilamentAdd()">Create New</div>
 	</div>
     <div id="CFilament_List" class="ZScrol">
 	</div>
@@ -63,8 +64,8 @@
 	
 </div>
 <div id="AcceptArea">
-	<div class="NormalBtn trans" tid="t39" id="AcceptBtn"  onclick="ConfirmSelect()">Confirm</div>	
-	<div class="GrayBtn trans" tid="t38" id="PreBtn"  onclick="CancelSelect()">Cancel</div>
+	<div class="ButtonStyleConfirm ButtonTypeChoice trans" tid="t39" id="AcceptBtn"  onclick="ConfirmSelect()">Confirm</div>	
+	<div class="ButtonStyleRegular ButtonTypeChoice trans" tid="t38" id="PreBtn"  onclick="CancelSelect()">Cancel</div>
 </div>
 <div id="NoticeMask">
 </div>
@@ -74,8 +75,8 @@
 	<div id="NoticeText" class="trans" tid="t19">At least one filament must be selected. </div>
 	<div id="NoticeText" class="trans" tid="t20">Do you want to use default filament ?</div>
 	<div id="NoticeBtns">
-		<div class="SmallBtn trans" tid="t21" onClick="ChooseDefaultFilament()">yes</div>
-		<div class="SmallBtn trans" tid="t22" onClick="ShowNotice(0)">no</div>
+		<div class="ButtonStyleConfirm ButtonTypeChoice trans" tid="t21" onClick="ChooseDefaultFilament()">yes</div>
+		<div class="ButtonStyleRegular ButtonTypeChoice trans" tid="t22" onClick="ShowNotice(0)">no</div>
 	</div>
 	</div>
 	</div>
diff --git a/resources/web/guide/24/24.css b/resources/web/guide/24/24.css
index 15faf78e2b..b460e8e0ae 100644
--- a/resources/web/guide/24/24.css
+++ b/resources/web/guide/24/24.css
@@ -24,10 +24,6 @@
 	margin-right: 0px; /* ORCA align buttons with end of horizontal separator/line */
 }
 
-.BannerBtns>.SmallBtn_Green.trans{
-	margin-right: 7px; /* ORCA adds a small gap between buttons */
-}
-
 /*.Banner-Btn
 {
 	background-color: #C0C0C0;
@@ -174,7 +170,7 @@ img.ModelThumbnail
 {
 	margin-top: 4mm;
 	display: flex;
-	justify-content:space-around;
+	justify-content:flex-end;
 }
 
 .search {
diff --git a/resources/web/guide/24/24.js b/resources/web/guide/24/24.js
index 1d862c9a7a..16f34cae44 100644
--- a/resources/web/guide/24/24.js
+++ b/resources/web/guide/24/24.js
@@ -91,8 +91,8 @@ function HandleModelList( pVal )
 '<div class="BlockBanner">'+
 '	<a>'+sVV+'</a>'+				
 '	<div class="BannerBtns">'+
-'		<div class="SmallBtn_Green trans" tid="t11" onClick="SelectPrinterAll('+"\'"+strVendor+"\'"+')">all</div>'+
-'		<div class="SmallBtn trans" tid="t12" onClick="SelectPrinterNone('+"\'"+strVendor+"\'"+')">none</div>'+
+'		<div class="ButtonStyleConfirm ButtonTypeWindow trans" tid="t11" onClick="SelectPrinterAll('+"\'"+strVendor+"\'"+')">all</div>'+
+'		<div class="ButtonStyleRegular ButtonTypeWindow trans" tid="t12" onClick="SelectPrinterNone('+"\'"+strVendor+"\'"+')">none</div>'+
 '	</div>'+
 '</div>'+
 '<div class="PrinterArea">	'+
@@ -210,8 +210,8 @@ function FilterModelList(keyword) {
 				'<div class="BlockBanner">' +
 				'	<a>' + sVV + '</a>' +
 				'	<div class="BannerBtns">' +
-				'		<div class="SmallBtn_Green trans" tid="t11" onClick="SelectPrinterAll(' + "\'" + strVendor + "\'" + ')">all</div>' +
-				'		<div class="SmallBtn trans" tid="t12" onClick="SelectPrinterNone(' + "\'" + strVendor + "\'" + ')">none</div>' +
+				'		<div class="ButtonStyleConfirm ButtonTypeWindow trans" tid="t11" onClick="SelectPrinterAll(' + "\'" + strVendor + "\'" + ')">all</div>' +
+				'		<div class="ButtonStyleRegular ButtonTypeWindow trans" tid="t12" onClick="SelectPrinterNone(' + "\'" + strVendor + "\'" + ')">none</div>' +
 				'	</div>' +
 				'</div>' +
 				'<div class="PrinterArea">	' +
diff --git a/resources/web/guide/24/index.html b/resources/web/guide/24/index.html
index b787556aae..a658cdd9af 100644
--- a/resources/web/guide/24/index.html
+++ b/resources/web/guide/24/index.html
@@ -4,7 +4,8 @@
 <meta charset="utf-8">
 <meta http-equiv="Cache-Control" content="max-age=7200" />
 <title>引导_P21</title>
-<link rel="stylesheet" type="text/css" href="../css/common.css" />	
+<link rel="stylesheet" type="text/css" href="../../include/global.css" />	<!-- ORCA One for all-->
+<link rel="stylesheet" type="text/css" href="../css/common.css" />
 <link rel="stylesheet" type="text/css" href="24.css" />
 <link rel="stylesheet" type="text/css" href="../css/dark.css" />	
 <!-- <script type="text/javascript" src="test.js"></script> -->
@@ -33,8 +34,8 @@
 <!--<div class="OneVendorBlock" Vendor="BBL">	
 <div class="BlockBanner">
 	<div class="BannerBtns">
-		<div class="SmallBtn_Green" onClick="SelectPrinterAll('BBL')">所有</div>
-		<div class="SmallBtn" onClick="SelectPrinterNone('BBL')">无</div>
+		<div class="ButtonStyleConfirm ButtonTypeWindow" onClick="SelectPrinterAll('BBL')">所有</div>
+		<div class="ButtonStyleRegular ButtonTypeWindow" onClick="SelectPrinterNone('BBL')">无</div>
 	</div>
 	
 	<a>BBL-3DP</a>	
@@ -92,8 +93,8 @@
 	
 </div>
 <div id="AcceptArea">
-	<div class="NormalBtn trans" tid="t39" id="AcceptBtn"  onclick="ConfirmSelect()">Confirm</div>	
-	<div class="GrayBtn trans" tid="t38" id="PreBtn"  onclick="CancelSelect()">Cancel</div>
+	<div class="ButtonStyleConfirm ButtonTypeChoice trans" tid="t39" id="AcceptBtn"  onclick="ConfirmSelect()">Confirm</div>	
+	<div class="ButtonStyleRegular ButtonTypeChoice trans" tid="t38" id="PreBtn"  onclick="CancelSelect()">Cancel</div>
 </div>
 	
 <div id="NoticeMask"></div>
@@ -102,7 +103,7 @@
 	<div id="NoticeContent">
 	<div id="NoticeText" class="trans" tid="t37">At least one printer must be selected.</div>
 	<div id="NoticeBtns">
-		<div class="SmallBtn trans" tid="t36" onClick="ShowNotice(0)">ok</div>
+		<div class="ButtonStyleConfirm ButtonTypeChoice trans" tid="t36" onClick="ShowNotice(0)">ok</div>
 	</div>
 	</div>
 </div>	
diff --git a/resources/web/guide/3/index.html b/resources/web/guide/3/index.html
index 836811bf84..7d3e0e472c 100644
--- a/resources/web/guide/3/index.html
+++ b/resources/web/guide/3/index.html
@@ -4,6 +4,7 @@
 <meta charset="utf-8">
 <meta http-equiv="Cache-Control" content="max-age=7200" />
 <title>引导_P1</title>
+<link rel="stylesheet" type="text/css" href="../../include/global.css" />	<!-- ORCA One for all-->
 <link rel="stylesheet" type="text/css" href="../css/common.css" />	
 <link rel="stylesheet" type="text/css" href="3.css" />
 <link rel="stylesheet" type="text/css" href="../css/dark.css" />
@@ -32,8 +33,8 @@
 </label>
 </div>		
 <div id="AcceptArea">
-	<div class="GrayBtn trans" tid="t8" id="PreBtn"  onclick="window.open('../11/index.html','_self')">Back</div>
-	<div class="NormalBtn trans" tid="t9" id="AcceptBtn"  onclick="GotoNextPage()">Next</div>
+	<div class="ButtonStyleRegular ButtonTypeChoice trans" tid="t8" id="PreBtn"  onclick="window.open('../11/index.html','_self')">Back</div>
+	<div class="ButtonStyleConfirm ButtonTypeChoice trans" tid="t9" id="AcceptBtn"  onclick="GotoNextPage()">Next</div>
 </div>
 </body>
 </html>
diff --git a/resources/web/guide/31/index.html b/resources/web/guide/31/index.html
index 65b81fd420..c30f20cce6 100644
--- a/resources/web/guide/31/index.html
+++ b/resources/web/guide/31/index.html
@@ -4,6 +4,7 @@
 <meta charset="utf-8">
 <meta http-equiv="Cache-Control" content="max-age=7200" />
 <title>引导_P1</title>
+<link rel="stylesheet" type="text/css" href="../../include/global.css" />	<!-- ORCA One for all-->
 <link rel="stylesheet" type="text/css" href="../css/common.css" />	
 <link rel="stylesheet" type="text/css" href="31.css" />
 <script type="text/javascript" src="../js/jquery-2.1.1.min.js"></script>
@@ -31,8 +32,8 @@
 </label>
 </div>		
 <div id="AcceptArea">
-	<div class="GrayBtn trans" tid="t8" id="PreBtn"  onclick="window.open('../11/index.html','_self')">Back</div>
-	<div class="NormalBtn trans" tid="t9" id="AcceptBtn"  onclick="GotoNextPage()">Next</div>
+	<div class="ButtonStyleRegular ButtonTypeChoice trans" tid="t8" id="PreBtn"  onclick="window.open('../11/index.html','_self')">Back</div>
+	<div class="ButtonStyleConfirm ButtonTypeChoice trans" tid="t9" id="AcceptBtn"  onclick="GotoNextPage()">Next</div>
 </div>
 </body>
 </html>
diff --git a/resources/web/guide/4orca/index.html b/resources/web/guide/4orca/index.html
index c108144a81..e9b5cf5df2 100644
--- a/resources/web/guide/4orca/index.html
+++ b/resources/web/guide/4orca/index.html
@@ -4,6 +4,7 @@
 <meta charset="utf-8">
 <meta http-equiv="Cache-Control" content="max-age=7200" />
 <title>引导_P1</title>
+<link rel="stylesheet" type="text/css" href="../../include/global.css" />	<!-- ORCA One for all-->
 <link rel="stylesheet" type="text/css" href="../css/common.css" />	
 <link rel="stylesheet" type="text/css" href="../css/dark.css" />		
 <link rel="stylesheet" type="text/css" href="4orca.css" />
@@ -31,8 +32,8 @@
 	
 </div>
 <div id="AcceptArea">
-	<div class="GrayBtn trans" tid="t8" id="PreBtn"  onclick="window.history.back()">Back</div>
-	<div class="NormalBtn trans" tid="t9" id="GotoNetPluginBtn"  onclick="GotoNetPluginPage()">Next</div>	
+	<div class="ButtonStyleRegular ButtonTypeChoice trans" tid="t8" id="PreBtn"  onclick="window.history.back()">Back</div>
+	<div class="ButtonStyleConfirm ButtonTypeChoice trans" tid="t9" id="GotoNetPluginBtn"  onclick="GotoNetPluginPage()">Next</div>	
 </div>	
 </body>
 </html>
diff --git a/resources/web/guide/5/index.html b/resources/web/guide/5/index.html
index 96357328d6..2d853d4cab 100644
--- a/resources/web/guide/5/index.html
+++ b/resources/web/guide/5/index.html
@@ -4,6 +4,7 @@
 <meta charset="utf-8">
 <meta http-equiv="Cache-Control" content="max-age=7200" />
 <title>引导_P1</title>
+<link rel="stylesheet" type="text/css" href="../../include/global.css" />	<!-- ORCA One for all-->
 <link rel="stylesheet" type="text/css" href="../css/common.css" />	
 <link rel="stylesheet" type="text/css" href="../css/dark.css" />		
 <link rel="stylesheet" type="text/css" href="5.css" />
@@ -37,8 +38,8 @@
 	
 </div>
 <div id="AcceptArea">
-	<div class="GrayBtn trans" tid="t8" id="PreBtn"  onclick="window.history.back()">Back</div>
-	<div class="NormalBtn trans" tid="t25" id="AcceptBtn"  onclick="FinishGuide()">Finish</div>
+	<div class="ButtonStyleRegular ButtonTypeChoice trans" tid="t8" id="PreBtn"  onclick="window.history.back()">Back</div>
+	<div class="ButtonStyleConfirm ButtonTypeChoice trans" tid="t25" id="AcceptBtn"  onclick="FinishGuide()">Finish</div>
 </div>	
 </body>
 </html>
diff --git a/resources/web/guide/6/index.html b/resources/web/guide/6/index.html
index d9d8c60867..1aa159c514 100644
--- a/resources/web/guide/6/index.html
+++ b/resources/web/guide/6/index.html
@@ -4,6 +4,7 @@
 <meta charset="utf-8">
 <meta http-equiv="Cache-Control" content="max-age=7200" />
 <title>引导_P1</title>
+<link rel="stylesheet" type="text/css" href="../../include/global.css" />	<!-- ORCA One for all-->
 <link rel="stylesheet" type="text/css" href="6.css" />
 <script type="text/javascript" src="../js/jquery-2.1.1.min.js"></script>
 <script type="text/javascript" src="../js/json2.js"></script>	
@@ -40,9 +41,9 @@
 </div>
 	
 <div id="BtnBlock">
-	<div id="CancelBtn" class="trans Btn_Green" tid="t38" onClick="CancelDownload()">Cancel</div>
-	<div id="RestartBtn" class="Btn_Green" onClick="RestartBambuStudio()"><a class="trans" tid="t25">Finish</a></div>
-	<div id="CloseBtn" class="Btn_Green" onClick="CloseDownDialog()"><a class="trans" tid="t86">Close</a></div>
+	<div id="CancelBtn"  class="ButtonStyleRegular ButtonTypeChoice trans" tid="t38" onClick="CancelDownload()"    >Cancel</div>
+	<div id="RestartBtn" class="ButtonStyleRegular ButtonTypeChoice trans" tid="t25" onClick="RestartBambuStudio()">Finish</div>
+	<div id="CloseBtn"   class="ButtonStyleRegular ButtonTypeChoice trans" tid="t86" onClick="CloseDownDialog()"   >Close </div>
 </div>
 </body>
 </html>
diff --git a/resources/web/guide/css/common.css b/resources/web/guide/css/common.css
index 11eac6d01a..b8bee5dc42 100644
--- a/resources/web/guide/css/common.css
+++ b/resources/web/guide/css/common.css
@@ -101,86 +101,16 @@ body
 
 #AcceptArea
 {
-	height:12%;
-	padding: 0mm 10mm;
+	height:var(--dialog-button-sizer-height); /*----ORCA Use fixed size to prevent position change----*/
+	max-height:var(--dialog-button-sizer-height);
+	min-height:var(--dialog-button-sizer-height);
+	padding: 0 var(--dialog-button-gap);
 	text-align: left;
 	display: flex;
 	justify-content:flex-end;
 	align-items: center;	
 }
 
-
-/*--Btn--*/
-.NormalBtn
-{
-	padding: 3mm 9mm;
-	font-size: 14px;
-	text-align: center;
-	background-color: #009688;
-	border-radius: 16px;
-	color: #fff;
-	cursor: pointer;
-	margin-left: 10px;
-}
-
-.NormalBtn:hover
-{
-	background-color:#4db6ac;
-}
-
-.GrayBtn
-{
-	padding: 3mm 9mm;
-	font-size: 14px;
-	text-align: center;
-	/* border: 1px solid #575757; */ /* ORCA match button style */
-	border-radius: 18px;
-	background-color: #D9D9D9;
-	color: #000;					/* ORCA match button style */
-	cursor: pointer;
-	margin-left: 10px;	
-}
-
-.GrayBtn:hover
-{
-	background-color:#CCCCCC;		/* ORCA match button style */
-}
-
-.SmallBtn
-{
-	padding: 2px 4mm;
-	font-size: 14px;
-	text-align: center;
-	background-color: #D9D9D9;
-	border-radius: 6px;
-	color: #000;
-	cursor: pointer;
-	display: inline-block;
-}
-
-.SmallBtn:hover
-{
-	background-color: #CCCCCC;
-}
-
-
-.SmallBtn_Green
-{
-	padding: 2px 4mm;
-	font-size: 14px;
-	text-align: center;
-	background-color: #009688;
-	border-radius: 6px;
-	color: #fff;
-	cursor: pointer;
-	display: inline-block;
-}
-
-.SmallBtn_Green:hover
-{
-	background-color: #4db6ac;
-}
-
 /*---HyperLink---*/
 .HyperLink
 {
@@ -235,7 +165,6 @@ input[type="checkbox"]:checked::before {
     transform: scale(1);
 }
 
-
 /*----------------Light Mode-------------------*/
 
 
diff --git a/resources/web/guide/css/dark.css b/resources/web/guide/css/dark.css
index 4ba7e79baf..63b0689e79 100644
--- a/resources/web/guide/css/dark.css
+++ b/resources/web/guide/css/dark.css
@@ -37,20 +37,6 @@ input[type=checkbox]:checked{
 	background-color:#009688;
 }
 
-/*-----Button-----*/
-.GrayBtn, .SmallBtn /* ORCA match button style GrayBtn & SmallBtn */
-{
-	background-color:#3E3E45;
-	/* border: 1px solid #B9B9BC; */
-	color: #FFFFFF;	
-}
-
-.GrayBtn:hover, .SmallBtn:hover /* ORCA match button style GrayBtn & SmallBtn */
-{
-	background-color:#49494E;
-	color: #FFFFFF;
-}
-
 /*-------Text------*/
 
 .TextS1
diff --git a/resources/web/homepage/css/dark.css b/resources/web/homepage/css/dark.css
index 69df4c34a0..c823843785 100644
--- a/resources/web/homepage/css/dark.css
+++ b/resources/web/homepage/css/dark.css
@@ -31,12 +31,6 @@ body
 
 
 /*----Left Menu Button----*/
-#LogoutBtn:hover
-{
-	background: #223C3C;
-	color: #efeff0;
-}
-
 .BtnItem
 {
 	color:#B3B3B5;
@@ -71,11 +65,6 @@ body
 	background-color: #223C3C;
 }
 
-#RecentClearAllBtn:hover
-{
-	color: #000;
-}
-
 .FileImg
 {
 	background-color: #36363C; /*ORCA use darker color for dark theme for thumbnails*/
diff --git a/resources/web/homepage/css/home.css b/resources/web/homepage/css/home.css
index f85275d207..ce78dc6223 100644
--- a/resources/web/homepage/css/home.css
+++ b/resources/web/homepage/css/home.css
@@ -100,16 +100,6 @@ body
 	justify-content: center;	/*and use login button in new line*/
 	user-select: none;
 }
-#LoginBtn
-{
-	cursor:pointer;
-}
-
-#LoginBtn:hover
-{
-	font-size:17px;
-}
-
 
 #NoPluginTip
 {
@@ -167,24 +157,9 @@ body
 
 #LogoutBtn
 {
-	font-size: 14px;
-	height: 24px;
-	line-height: 24px;
-	color: #4db6ac;
-	border: 1px solid  #009688;
-	border-radius: 4px;
-	cursor: pointer;
 	margin-top: 5px;
-	padding: 0px 8px;
 }
 
-#LogoutBtn:hover
-{
-	background: #00f0d8;
-	color: #fff;
-}
-
-
 /*------------------*/
 #BtnArea
 {
@@ -357,22 +332,10 @@ body
 
 #RecentClearAllBtn
 {
-	border-width: 1px;
-	border-style: solid;
-	padding: 0px 10px;
-	border-radius: 6px;
-	line-height: 26px;
-	height: 26px;
 	margin-left: 20px;
-	cursor: pointer;
 	display: none;
 }
 
-#RecentClearAllBtn:hover
-{
-	background-color:#CDCECE;
-}
-
 #RecentTitle
 {
 	
diff --git a/resources/web/homepage/index.html b/resources/web/homepage/index.html
index 72e65e4b6f..d8540b1bbb 100644
--- a/resources/web/homepage/index.html
+++ b/resources/web/homepage/index.html
@@ -5,6 +5,7 @@
 <meta http-equiv="Cache-Control" content="max-age=7200" />
 <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport" />	
 <title>homepage</title>
+<link rel="stylesheet" type="text/css" href="../include/global.css" />	<!-- ORCA One for all-->
 <link rel="stylesheet" type="text/css" href="./css/home.css" />
 <link rel="stylesheet" type="text/css" href="./css/dark.css" />	
 
@@ -23,7 +24,7 @@
 	<div id="LoginArea">
 	<div id="Login1">
 		<div id="Icon1"><img id="BBLIcon" src="../image/logo.png" /></div> <!-- ORCA use square icon for better consistency on UI -->
-		<div id="LoginBtn" class="TextS1" style="font-weight: 700;" onClick="OnLoginOrRegister()"><span class="trans" tid="t26">login</span>/<span class="trans" tid="t27">register</span></div>
+		<div id="LoginBtn" class="ButtonStyleRegular ButtonTypeWindow" onClick="OnLoginOrRegister()"><span class="trans" tid="t26">login</span> / <span class="trans" tid="t27">register</span></div>
 	</div>
 		
 	<div id="Login2">
@@ -31,7 +32,7 @@
 			<img id="UserAvatarIcon" src="img/c.jpg" onerror="this.onerror=null;this.src='img/c.jpg';" />
 		</div>
 		<div id="UserName" class="TextS1"></div>
-		<div id="LogoutBtn" class="Btn trans" tid="t50" onClick="OnLogOut()">log out</div>
+		<div id="LogoutBtn" class="ButtonStyleAlert ButtonTypeWindow trans" tid="t50" onClick="OnLogOut()">log out</div>
 	</div>	
 		
 	<div id="NoPluginTip">	
@@ -80,7 +81,7 @@
 	<div id="RecentFileArea">
 		<div id="RecentTitleBlock">
 		    <div id="RecentTitle" class="Content-Title trans TextS1" tid="t35">recent open</div>
-			<div id="RecentClearAllBtn" class="trans TextS1" tid="t12" onClick="OnDeleteAllRecentFiles()">Clear all</div>
+			<div id="RecentClearAllBtn" class="ButtonStyleRegular ButtonTypeWindow trans" tid="t12" onClick="OnDeleteAllRecentFiles()">Clear all</div>
 		</div>
 		<div id="FileList">
 <!--		    <div class="FileItem" onClick="OnOpenRecentFile('aaaa')" fpath='d:\model\11.3mf'>
diff --git a/resources/web/include/global.css b/resources/web/include/global.css
new file mode 100644
index 0000000000..e1473aa075
--- /dev/null
+++ b/resources/web/include/global.css
@@ -0,0 +1,73 @@
+/*----ORCA UNIFIED STYLING FOR ALL CONTROLS----*/
+
+/*----GLOBAL VARIABLES ----*/
+:root {
+	--dialog-button-sizer-height : 62px; /*----32 + 15 * 2----*/
+	--dialog-button-gap          : 15px;
+}
+
+/*----GLOBAL COLORS ----*/
+:root { 
+	--main-color         : #009688;
+	--main-color-hover   : #26A69A;
+	--button-fg-light    : #FEFEFE;
+	--button-fg-text     : #262E30;
+	--button-fg-disabled : #6B6B6B;
+	--button-bg-normal   : #DFDFDF;
+	--button-bg-hover    : #D4D4D4;
+	--button-bg-disabled : var(--button-bg-normal);
+	--button-bg-alert    : #E14747;
+}
+  
+@media (prefers-color-scheme: dark) { 
+:root {
+	--main-color         : #00675B;
+	--main-color-hover   : #008172;
+	--button-fg-light    : #FEFEFE;
+	--button-fg-text     : #EFEFF0;
+	--button-fg-disabled : #818183;
+	--button-bg-normal   : #3E3E45;
+	--button-bg-hover    : #4D4D54;
+	--button-bg-disabled : var(--button-bg-normal);
+	--button-bg-alert    : #E14747;
+}
+}
+
+/*----BUTTONS ----*/
+/*----Values slightly different since renderer is different----*/
+/*----Currently no support for focus border----*/
+.ButtonTypeCompact   { font-size: 11px; padding: 0px 8px ; border-radius: 12px; line-height: 23px; height: 24px; text-align: center}
+.ButtonTypeWindow    { font-size: 13px; padding: 0px 11px; border-radius: 12px; line-height: 23px; height: 24px; text-align: center}
+.ButtonTypeChoice    { font-size: 15px; padding: 0px 13px; border-radius: 4px ; line-height: 31px; height: 32px; text-align: center}
+.ButtonTypeParameter { font-size: 15px; padding: 0px 12px; border-radius: 4px ; line-height: 25px; height: 26px; text-align: center}
+.ButtonTypeExpanded  { font-size: 15px; padding: 0px 12px; border-radius: 4px ; line-height: 31px; height: 32px; text-align: center}
+
+.ButtonTypeWindow,
+.ButtonTypeCompact {
+	min-width: 36px; /*----58 - 11*2(padding)----*/
+}
+
+.ButtonTypeWindow.ButtonStyleConfirm { /*---- Commonly used as "All" button before "Clear All" button----*/
+	margin-right:10px;
+}
+
+.ButtonTypeChoice {
+	min-width: 74px; /*----100 - 13*2(padding)----*/
+	margin-left:var(--dialog-button-gap);
+}
+
+.ButtonTypeExpanded {
+	width: 100%;
+}
+
+.ButtonTypeExpanded {
+	width: 120px;
+}
+
+.ButtonStyleConfirm        { background: var(--main-color        ); color: var(--button-fg-light   )}
+.ButtonStyleConfirm:hover  { background: var(--main-color-hover  ); color: var(--button-fg-light   )}
+.ButtonStyleRegular        { background: var(--button-bg-normal  ); color: var(--button-fg-text    )}
+.ButtonStyleRegular:hover  { background: var(--button-bg-hover   ); color: var(--button-fg-text    )}
+.ButtonStyleAlert          { background: var(--button-bg-normal  ); color: var(--button-fg-text    )}
+.ButtonStyleAlert:hover    { background: var(--button-bg-alert   ); color: var(--button-fg-light   )}
+.ButtonStyleDisabled       { background: var(--button-bg-disabled); color: var(--button-fg-disabled)}
diff --git a/resources/web/login/css/login.css b/resources/web/login/css/login.css
index 721b5e0d17..4ec6c8edd1 100644
--- a/resources/web/login/css/login.css
+++ b/resources/web/login/css/login.css
@@ -25,18 +25,6 @@ body
 	background-color: #fff;
 }
 
-.NormalBtn
-{
-	padding: 3mm 10mm;
-	font-size: 14px;
-	text-align: center;
-	background-color: #009688;
-	border-radius: 20px;
-	color: #fff;
-	cursor: pointer;
-	margin-left: 10px;
-}
-
 #ErrorBlock
 {
 	display:flex;
diff --git a/resources/web/login/error.html b/resources/web/login/error.html
index e3554e2fc1..70cf26c6d8 100644
--- a/resources/web/login/error.html
+++ b/resources/web/login/error.html
@@ -4,6 +4,7 @@
 <meta charset="utf-8">
 <meta http-equiv="Cache-Control" content="max-age=7200" />
 <title>Network Error</title>
+<link rel="stylesheet" type="text/css" href="../include/global.css" />	<!-- ORCA One for all-->
 <link rel="stylesheet" type="text/css" href="css/login.css" />
 <script type="text/javascript" src="js/jquery-3.6.0.min.js"></script>
 <script type="text/javascript" src="../data/text.js"></script>	
@@ -15,7 +16,7 @@
 <div id="ErrorBlock">
 	<img id="ErrorIcon" src="disconnect3.png" />
 	<div id="ErrorTip" class="trans" title="t40" >Network disconnect, please check and try again later.</div>
-	<div id="ErrorBtn" class="NormalBtn">Retry</div>
+	<div id="ErrorBtn" class="ButtonStyleRegular ButtonTypeChoice">Retry</div>
 </div>
 </body>
 </html>
diff --git a/resources/web/model/css/dark.css b/resources/web/model/css/dark.css
index e6ee245e38..8df6946fc1 100644
--- a/resources/web/model/css/dark.css
+++ b/resources/web/model/css/dark.css
@@ -66,8 +66,3 @@ a
 {
 	background-color:#36363C;
 }
-
-#AddModelInfoBtn:hover
-{
-	color: #000;
-}
diff --git a/resources/web/model/index.html b/resources/web/model/index.html
index 7a78373540..70070d0460 100644
--- a/resources/web/model/index.html
+++ b/resources/web/model/index.html
@@ -17,6 +17,7 @@
 	
 <link rel="stylesheet" type="text/css" href="model.css" />	
 <link rel="stylesheet" type="text/css" href="./css/dark.css" />	
+<link rel="stylesheet" type="text/css" href="../include/global.css" /> <!-- ORCA One for all-->
 	
 <script type="text/javascript" src="test.js"></script>
 <script type="text/javascript" src="model.js"></script>	
@@ -26,7 +27,7 @@
 <div id="EmptyArea">
 	<div><img src="img/null.png"></div>
 	<div class="Text_Title Text_Bold trans" tid='orca2'>no model information</div>
-	<div id="AddModelInfoBtn" class="trans TextS1" tid='orca1' onClick="OnClickEditProjectInfo()">Edit Project Info</div>
+	<div id="AddModelInfoBtn" class="ButtonStyleConfirm ButtonTypeWindow trans" tid='orca1' onClick="OnClickEditProjectInfo()">Edit Project Info</div>
 </div>
 	
 <div id="WholeArea">
diff --git a/resources/web/model/model.css b/resources/web/model/model.css
index b3bfac604c..e3cd4d7a51 100644
--- a/resources/web/model/model.css
+++ b/resources/web/model/model.css
@@ -378,17 +378,5 @@ body
 
 #AddModelInfoBtn
 {
-	border-width: 1px;
-	border-style: solid;
-	padding: 0px 10px;
-	border-radius: 6px;
-	line-height: 26px;
-	height: 26px;
 	margin-top: 20px;
-	cursor: pointer;
-}
-
-#AddModelInfoBtn:hover
-{
-	background-color:#CDCECE;
-}
+}
\ No newline at end of file
diff --git a/scripts/run_unit_tests.sh b/scripts/run_unit_tests.sh
index 081467b300..292c6c9d3f 100755
--- a/scripts/run_unit_tests.sh
+++ b/scripts/run_unit_tests.sh
@@ -9,4 +9,4 @@ ROOT_DIR="$(dirname "$0")/.."
 
 cd "${ROOT_DIR}" || exit 1
 
-ctest --test-dir build/tests --output-junit "$(pwd)/ctest_results.xml" --output-on-failure -j
+ctest --test-dir build/tests -L "Http|PlaceholderParser" --output-junit "$(pwd)/ctest_results.xml" --output-on-failure -j
diff --git a/src/libslic3r/AppConfig.cpp b/src/libslic3r/AppConfig.cpp
index e592155d14..16f6a4a606 100644
--- a/src/libslic3r/AppConfig.cpp
+++ b/src/libslic3r/AppConfig.cpp
@@ -111,6 +111,11 @@ void AppConfig::set_defaults()
         if (get("background_processing").empty())
             set_bool("background_processing", false);
 #endif
+        if (get("auto_slice_after_change").empty())
+            set_bool("auto_slice_after_change", false);
+
+        if (get("auto_slice_change_delay_seconds").empty())
+            set("auto_slice_change_delay_seconds", "1");
 
         if (get("drop_project_action").empty())
             set_bool("drop_project_action", true);
diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp
index 3e3fd6f9cf..707dadd9f9 100644
--- a/src/libslic3r/GCode.cpp
+++ b/src/libslic3r/GCode.cpp
@@ -2727,8 +2727,8 @@ void GCode::_do_export(Print& print, GCodeOutputStream &file, ThumbnailsGenerato
 
         auto probe_dist_x  = std::max(1., m_config.bed_mesh_probe_distance.value.x());
         auto probe_dist_y  = std::max(1., m_config.bed_mesh_probe_distance.value.y());
-        int  probe_count_x = std::max(3, (int) std::ceil(mesh_bbox.size().x() / probe_dist_x));
-        int  probe_count_y = std::max(3, (int) std::ceil(mesh_bbox.size().y() / probe_dist_y));
+        int  probe_count_x = std::max(3, (int) std::ceil(mesh_bbox.size().x() / probe_dist_x) + 1);
+        int  probe_count_y = std::max(3, (int) std::ceil(mesh_bbox.size().y() / probe_dist_y) + 1);
         auto bed_mesh_algo = "bicubic";
         if (probe_count_x * probe_count_y <= 6) { // lagrange needs up to a total of 6 mesh points
             bed_mesh_algo = "lagrange";
@@ -4251,8 +4251,8 @@ LayerResult GCode::process_layer(
     bool is_multi_extruder = m_config.nozzle_diameter.size() > 1;
 
     bool need_insert_timelapse_gcode_for_traditional = false;
-    if (!m_wipe_tower || !m_wipe_tower->enable_timelapse_print()) {
-        need_insert_timelapse_gcode_for_traditional = ((is_i3_printer && !m_spiral_vase)|| is_multi_extruder);
+    if ((!m_wipe_tower || !m_wipe_tower->enable_timelapse_print()) && (is_BBL_Printer() || !m_config.time_lapse_gcode.value.empty())) {
+        need_insert_timelapse_gcode_for_traditional = ((is_i3_printer && !m_spiral_vase) || is_multi_extruder);
     }
 
     bool has_insert_timelapse_gcode = false;
@@ -4268,19 +4268,18 @@ LayerResult GCode::process_layer(
     gcode += this->change_layer(print_z);  // this will increase m_layer_index
     m_layer = &layer;
     m_object_layer_over_raft = false;
-    if(is_BBL_Printer()){
-    } else {
-        if (!m_config.time_lapse_gcode.value.empty()) {
-            DynamicConfig config;
-            config.set_key_value("layer_num", new ConfigOptionInt(m_layer_index));
-            config.set_key_value("layer_z", new ConfigOptionFloat(print_z));
-            config.set_key_value("max_layer_z", new ConfigOptionFloat(m_max_layer_z));
-            gcode += this->placeholder_parser_process("timelapse_gcode", print.config().time_lapse_gcode.value, m_writer.filament()->id(),
-                                                      &config) +
-                     "\n";
-        }
+
+    if (!m_config.time_lapse_gcode.value.empty() && !is_BBL_Printer()) {
+        DynamicConfig config;
+        config.set_key_value("layer_num", new ConfigOptionInt(m_layer_index));
+        config.set_key_value("layer_z", new ConfigOptionFloat(print_z));
+        config.set_key_value("max_layer_z", new ConfigOptionFloat(m_max_layer_z));
+        gcode += this->placeholder_parser_process("timelapse_gcode",
+             print.config().time_lapse_gcode.value, m_writer.filament()->id(), &config)
+             + "\n";
     }
-    if (! m_config.layer_change_gcode.value.empty()) {
+
+    if (!m_config.layer_change_gcode.value.empty()) {
         DynamicConfig config;
         config.set_key_value("most_used_physical_extruder_id", new ConfigOptionInt(m_config.physical_extruder_map.get_at(most_used_extruder)));
         config.set_key_value("layer_num", new ConfigOptionInt(m_layer_index));
@@ -4729,7 +4728,7 @@ LayerResult GCode::process_layer(
 
         auto timelapse_pos=m_timelapse_pos_picker.pick_pos(ctx);
 
-        std::string timepals_gcode;
+        std::string timelapse_gcode;
         if (!print.config().time_lapse_gcode.value.empty()) {
             DynamicConfig config;
             config.set_key_value("layer_num", new ConfigOptionInt(m_layer_index));
@@ -4740,17 +4739,18 @@ LayerResult GCode::process_layer(
             config.set_key_value("timelapse_pos_x", new ConfigOptionInt((int)timelapse_pos.x()));
             config.set_key_value("timelapse_pos_y", new ConfigOptionInt((int)timelapse_pos.y()));
             config.set_key_value("has_timelapse_safe_pos", new ConfigOptionBool(timelapse_pos != DefaultTimelapsePos));
-            timepals_gcode = this->placeholder_parser_process("timelapse_gcode", print.config().time_lapse_gcode.value, m_writer.filament()->id(), &config) + "\n";
+            timelapse_gcode = this->placeholder_parser_process("timelapse_gcode", print.config().time_lapse_gcode.value, m_writer.filament()->id(), &config) + "\n";
         }
-        if (!timepals_gcode.empty()) {
-        m_writer.set_current_position_clear(false);
 
-        double temp_z_after_tool_change;
-        if (GCodeProcessor::get_last_z_from_gcode(timepals_gcode, temp_z_after_tool_change)) {
-            Vec3d pos = m_writer.get_position();
-            pos(2)    = temp_z_after_tool_change;
-            m_writer.set_position(pos);
-        }
+        if (!timelapse_gcode.empty()) {
+            m_writer.set_current_position_clear(false);
+
+            double temp_z_after_tool_change;
+            if (GCodeProcessor::get_last_z_from_gcode(timelapse_gcode, temp_z_after_tool_change)) {
+                Vec3d pos = m_writer.get_position();
+                pos(2)    = temp_z_after_tool_change;
+                m_writer.set_position(pos);
+            }
         }
 
         // (layer_object_label_ids.size() < 64) this restriction comes from _encode_label_ids_to_base64()
@@ -4771,13 +4771,13 @@ LayerResult GCode::process_layer(
             std::string end_str = std::string("; object ids of this layer") + std::to_string(m_layer_index + 1) + (" end: ") + oss.str() + "\n";
             end_str   += "M625\n";
 
-            timepals_gcode = start_str + timepals_gcode + end_str;
+            timelapse_gcode = start_str + timelapse_gcode + end_str;
         }
 
-        return timepals_gcode;
+        return timelapse_gcode;
     };
 
-    if (!need_insert_timelapse_gcode_for_traditional) { // Equivalent to the timelapse gcode placed in layer_change_gcode
+    if (!need_insert_timelapse_gcode_for_traditional  && is_BBL_Printer()) { // Equivalent to the timelapse gcode placed in layer_change_gcode
         if (FILAMENT_CONFIG(retract_when_changing_layer)) {
             gcode += this->retract(false, false, auto_lift_type, true);
         }
@@ -4873,10 +4873,12 @@ LayerResult GCode::process_layer(
 
             gcode_toolchange = this->set_extruder(extruder_id, print_z);
         }
+
         if (!gcode_toolchange.empty()) {
             // Disable vase mode for layers that has toolchange
             result.spiral_vase_enable = false;
         }
+        
         gcode += std::move(gcode_toolchange);
 
         // let analyzer tag generator aware of a role type change
@@ -6184,10 +6186,16 @@ std::string GCode::_extrude(const ExtrusionPath &path, std::string description,
             );
         }
 
-        // if still in avoidance mode and under “max”, clamp to “min”
-        if (m_resonance_avoidance
-            && speed <= m_config.max_resonance_avoidance_speed.value) {
-            speed = std::min(speed, m_config.min_resonance_avoidance_speed.value);
+            // if still in avoidance mode and under "max", adjust speed:
+            // - speeds in lower half of range: clamp down to "min"
+            // - speeds in upper half of range: boost up to "max"
+        if (m_resonance_avoidance && speed < m_config.max_resonance_avoidance_speed.value) {
+            if (speed < m_config.min_resonance_avoidance_speed.value +
+                            ((m_config.max_resonance_avoidance_speed.value - m_config.min_resonance_avoidance_speed.value) / 2)) {
+                speed = std::min(speed, m_config.min_resonance_avoidance_speed.value);
+            } else {
+                speed = m_config.max_resonance_avoidance_speed.value;
+            }
         }
 
         // reset flag for next segment
diff --git a/src/libslic3r/GCodeWriter.cpp b/src/libslic3r/GCodeWriter.cpp
index 6340a7af5c..f3d218750b 100644
--- a/src/libslic3r/GCodeWriter.cpp
+++ b/src/libslic3r/GCodeWriter.cpp
@@ -42,6 +42,7 @@ void GCodeWriter::apply_print_config(const PrintConfig &print_config)
     };
     m_max_jerk_z = print_config.machine_max_jerk_z.values.front();
     m_max_jerk_e = print_config.machine_max_jerk_e.values.front();
+    m_resolution = print_config.resolution.value;
 }
 
 void GCodeWriter::set_extruders(std::vector<unsigned int> extruder_ids)
@@ -787,8 +788,18 @@ std::string GCodeWriter::_spiral_travel_to_z(double z, const Vec2d &ij_offset, c
 
     if (!this->config.enable_arc_fitting) { // Orca: if arc fitting is disabled, approximate the arc with small linear segments
         std::ostringstream oss;
-        const double z_start = m_pos(2);                // starting Z height
-        const int segments = 24;                        // number of linear segments to use for approximating the arc
+        const double z_start = m_pos(2); // starting Z height
+
+        // --------------------------------------------------------------------
+        // Determine number of segments based on Resolution
+        // --------------------------------------------------------------------
+        const double ref_resolution = 0.01; // reference resolution in mm
+        const double ref_segments  = 16.0;  // reference number of segments at reference resolution
+        
+        // number of linear segments to use for approximating the arc, clamp between 4 and 24
+        const int segments = std::clamp(int(std::round(ref_segments * (ref_resolution / m_resolution))), 4, 24);
+        // --------------------------------------------------------------------
+
         const double px = m_pos(0) - m_x_offset;        // take plate offset into consideration
         const double py = m_pos(1) - m_y_offset;        // take plate offset into consideration
         const double cx = px + ij_offset(0);            // center x
diff --git a/src/libslic3r/GCodeWriter.hpp b/src/libslic3r/GCodeWriter.hpp
index 729c89263e..32e737164d 100644
--- a/src/libslic3r/GCodeWriter.hpp
+++ b/src/libslic3r/GCodeWriter.hpp
@@ -168,6 +168,9 @@ public:
     //BBS: x, y offset for gcode generated
     double          m_x_offset{ 0 };
     double          m_y_offset{ 0 };
+
+    // Orca: slicing resolution in mm
+    double          m_resolution = 0.01;
     
     std::string m_gcode_label_objects_start;
     std::string m_gcode_label_objects_end;
diff --git a/src/libslic3r/PlaceholderParser.cpp b/src/libslic3r/PlaceholderParser.cpp
index 92e4210f3c..f03a5cee38 100644
--- a/src/libslic3r/PlaceholderParser.cpp
+++ b/src/libslic3r/PlaceholderParser.cpp
@@ -1045,8 +1045,8 @@ namespace client
             case coFloatOrPercent:
             {
                 std::string opt_key(opt.it_range.begin(), opt.it_range.end());
-                if (boost::ends_with(opt_key, "extrusion_width")) {
-                    // Extrusion width supports defaults and a complex graph of dependencies.
+                if (boost::ends_with(opt_key, "line_width")) {
+                    // Line width supports defaults and a complex graph of dependencies.
                     output.set_d(Flow::extrusion_width(opt_key, *ctx, static_cast<unsigned int>(ctx->current_extruder_id)));
                 } else if (! static_cast<const ConfigOptionFloatOrPercent*>(opt.opt)->percent) {
                     // Not a percent, just return the value.
@@ -1060,8 +1060,8 @@ namespace client
     			        const ConfigOption *opt_parent = opt_def->ratio_over.empty() ? nullptr : ctx->resolve_symbol(opt_def->ratio_over);
     			        if (opt_parent == nullptr)
     			            ctx->throw_exception("FloatOrPercent variable failed to resolve the \"ratio_over\" dependencies", opt.it_range);
-    			        if (boost::ends_with(opt_def->ratio_over, "extrusion_width")) {
-                    		// Extrusion width supports defaults and a complex graph of dependencies.
+    			        if (boost::ends_with(opt_def->ratio_over, "line_width")) {
+                    		// Line width supports defaults and a complex graph of dependencies.
                             assert(opt_parent->type() == coFloatOrPercent);
                         	v *= Flow::extrusion_width(opt_def->ratio_over, static_cast<const ConfigOptionFloatOrPercent*>(opt_parent), *ctx, static_cast<unsigned int>(ctx->current_extruder_id));
                         	break;
@@ -2197,9 +2197,8 @@ namespace client
                         initializer_list(_r1)[px::bind(&MyContext::vector_variable_new_from_initializer_list, _r1, _a, _b, _1)]
                         // Process it before conditional_expression, as conditional_expression requires a vector reference to be augmented with an index.
                         // Only process such variable references, which return a naked vector variable.
-                    // Orca todo: following code cause strange build errors with MSVC C++17
-                    // |  eps(px::bind(&MyContext::could_be_vector_variable_reference, _b)) >>
-                    //         variable_reference(_r1)[px::val(qi::_pass) = px::bind(&MyContext::vector_variable_new_from_copy, _r1, _a, _b, _1)]
+                    |  eps(px::bind(&MyContext::could_be_vector_variable_reference, _b)) >>
+                            variable_reference(_r1)[qi::_pass = px::bind(&MyContext::vector_variable_new_from_copy, _r1, _a, _b, _1)]
                        // Would NOT consume '(' conditional_expression ')' because such value was consumed with the expression above.
                     |  conditional_expression(_r1)
                             [px::bind(&MyContext::scalar_variable_new_from_scalar_expression, _r1, _a, _b, _1)]
diff --git a/src/libslic3r/Preset.cpp b/src/libslic3r/Preset.cpp
index f5b0d1c713..3ca75d28f3 100644
--- a/src/libslic3r/Preset.cpp
+++ b/src/libslic3r/Preset.cpp
@@ -161,11 +161,18 @@ void extend_default_config_length(DynamicPrintConfig& config, const bool set_nil
     int process_variant_length = default_param_length;
     int machine_variant_length = default_param_length;
 
+    // Orca: use nozzle/extruder count as the default printer variant length
+    // because non-BBL multi-extruder printers currently do not support extruder variant.
+    if (config.has("nozzle_diameter")) {
+        auto* nozzle_diameter = dynamic_cast<const ConfigOptionFloats*>(config.option("nozzle_diameter"));
+        machine_variant_length = nozzle_diameter->values.size();
+    }
+
     if(config.has("filament_extruder_variant"))
         filament_variant_length = config.option<ConfigOptionStrings>("filament_extruder_variant")->size();
     if(config.has("print_extruder_variant"))
         process_variant_length = config.option<ConfigOptionStrings>("print_extruder_variant")->size();
-    if(config.has("printer_extruder_variant"))
+    if(config.has("printer_extruder_variant"))  // Use existing variant list if specified, so BBL's multi-variant profiles still works
         machine_variant_length = config.option<ConfigOptionStrings>("printer_extruder_variant")->size();
 
     auto replace_nil_and_resize = [&](const std::string & key, int length){
diff --git a/src/libslic3r/PresetBundle.cpp b/src/libslic3r/PresetBundle.cpp
index c123cf53d0..b3efae168f 100644
--- a/src/libslic3r/PresetBundle.cpp
+++ b/src/libslic3r/PresetBundle.cpp
@@ -2751,6 +2751,8 @@ Preset *PresetBundle::get_similar_printer_preset(std::string printer_model, std:
 {
     if (printer_model.empty())
         printer_model = printers.get_selected_preset().config.opt_string("printer_model");
+    if (printer_model.empty()) // ORCA ensure a compatible model exist. fixes switches to blank preset if preset has no inherited value
+        return nullptr;
     auto printer_variant_old = printers.get_selected_preset().config.opt_string("printer_variant");
     std::map<std::string, Preset*> printer_presets;
     for (auto &preset : printers.m_presets) {
@@ -2761,7 +2763,8 @@ Preset *PresetBundle::get_similar_printer_preset(std::string printer_model, std:
     }
     if (printer_presets.empty())
         return nullptr;
-    auto prefer_printer = printers.get_selected_preset().name;
+    auto prefer_printer = printers.get_selected_preset().alias; //.name ORCA use alias instead "name" for calling system presets. otherwise nozzle combo will not change printer presets if they custom named
+
     if (!printer_variant.empty())
         boost::replace_all(prefer_printer, printer_variant_old, printer_variant);
     else if (auto n = prefer_printer.find(printer_variant_old); n != std::string::npos)
diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp
index 3e48103915..2fb29fc2cd 100644
--- a/src/libslic3r/PrintConfig.cpp
+++ b/src/libslic3r/PrintConfig.cpp
@@ -7646,6 +7646,9 @@ std::set<std::string> filament_options_with_variant = {
     "filament_retraction_length",
     "filament_z_hop",
     "filament_z_hop_types",
+    "filament_retract_lift_above",
+    "filament_retract_lift_below",
+    "filament_retract_lift_enforce",
     "filament_retract_restart_extra",
     "filament_retraction_speed",
     "filament_deretraction_speed",
@@ -7664,7 +7667,11 @@ std::set<std::string> filament_options_with_variant = {
     "filament_flush_volumetric_speed",
     "filament_flush_temp",
     "volumetric_speed_coefficients",
-    "filament_adaptive_volumetric_speed"
+    "filament_adaptive_volumetric_speed",
+    "filament_ironing_flow",
+    "filament_ironing_spacing",
+    "filament_ironing_inset",
+    "filament_ironing_speed"
 };
 
 // Parameters that are the same as the number of extruders
@@ -7996,8 +8003,41 @@ size_t DynamicPrintConfig::get_parameter_size(const std::string& param_name, siz
     return extruder_nums;
 }
 
+// Orca: Special handling for extruder variants
+// BBL printers have extruder variants pre-defined in system profiles, however for customized multi-extruder profile,
+// we need to set up these parameters automatically, otherwise per-extruder options won't work properly.
+static void extend_extruder_variant(DynamicPrintConfig& config, const unsigned int num_extruders)
+{
+    // 1. Make sure the `extruder_variant_list` is the same length as extruder cnt
+    auto extruder_variant_opt = dynamic_cast<ConfigOptionStrings*>(config.option("extruder_variant_list"));
+    assert(extruder_variant_opt != nullptr);
+    extruder_variant_opt->resize(num_extruders, extruder_variant_opt); // Use the first option as the default value, so all extruders have the same variant
+
+    // 2. Update `printer_extruder_variant` and `printer_extruder_id` based on `extruder_variant_list`
+    auto printer_extruder_id_opt = dynamic_cast<ConfigOptionInts*>(config.option("printer_extruder_id"));
+    assert(printer_extruder_id_opt != nullptr);
+    printer_extruder_id_opt->values.clear();
+    auto printer_extruder_variant_opt = dynamic_cast<ConfigOptionStrings*>(config.option("printer_extruder_variant"));
+    assert(printer_extruder_variant_opt != nullptr);
+    printer_extruder_variant_opt->values.clear();
+    for (int i = 0; i < num_extruders; i++) {
+        // `extruder_variant_list` specifies supported variant of each nozzle/extruder,
+        // each item is a comma separated list of variants (extruder type + nozzle flow type) this extruder supported
+        std::string variant = extruder_variant_opt->get_at(i);
+        std::vector<std::string> variants_list;
+        boost::split(variants_list, variant, boost::is_any_of(","), boost::token_compress_on);
+
+        if (!variants_list.empty()) {
+            printer_extruder_id_opt->values.insert(printer_extruder_id_opt->values.end(), variants_list.size(), i + 1);
+            printer_extruder_variant_opt->values.insert(printer_extruder_variant_opt->values.end(), variants_list.begin(), variants_list.end());
+        }
+    }
+}
+
 void DynamicPrintConfig::set_num_extruders(unsigned int num_extruders)
 {
+    extend_extruder_variant(*this, num_extruders);
+
     const auto &defaults = FullPrintConfig::defaults();
     for (const std::string &key : print_config_def.extruder_option_keys()) {
         if (key == "default_filament_profile")
diff --git a/src/libslic3r/TriangleMeshSlicer.cpp b/src/libslic3r/TriangleMeshSlicer.cpp
index 00b37ebdd5..150c456b8b 100644
--- a/src/libslic3r/TriangleMeshSlicer.cpp
+++ b/src/libslic3r/TriangleMeshSlicer.cpp
@@ -2168,7 +2168,7 @@ static void triangulate_slice(
     float                    z,
     bool                     triangulate,
     bool                     normals_down,
-    const std::map<int, Vec3f*> &section_vertices_map)
+    const std::map<int, Vec3f> &section_vertices_map)
 {
     sort_remove_duplicates(slice_vertices);
 
@@ -2240,7 +2240,7 @@ static void triangulate_slice(
                 int   idx = -1;
                 bool exist = false;
                 for (auto iter = section_vertices_map.begin(); iter != section_vertices_map.end(); iter++) {
-                    if (is_equal(v, *iter->second)) {
+                    if (is_equal(v, iter->second)) {
                         idx   = iter->first;
                         exist = true;
                         break;
@@ -2348,7 +2348,7 @@ void cut_mesh(const indexed_triangle_set& mesh, float z, indexed_triangle_set* u
     IntersectionLines  upper_lines, lower_lines;
     std::vector<int>   upper_slice_vertices, lower_slice_vertices;
     std::vector<Vec3i32> facets_edge_ids = its_face_edge_ids(mesh);
-    std::map<int, Vec3f *> section_vertices_map;
+    std::map<int, Vec3f> section_vertices_map;
 
     for (int facet_idx = 0; facet_idx < int(mesh.indices.size()); ++ facet_idx) {
         const stl_triangle_vertex_indices &facet = mesh.indices[facet_idx];
@@ -2357,8 +2357,8 @@ void cut_mesh(const indexed_triangle_set& mesh, float z, indexed_triangle_set* u
         float max_z = std::max(vertices[0].z(), std::max(vertices[1].z(), vertices[2].z()));
 
         for (size_t i = 0; i < 3; i++) {
-            if (is_equal(z, vertices[i].z()) && section_vertices_map[facet(i)] == nullptr) {
-                section_vertices_map[facet(i)] = new Vec3f(vertices[i].x(), vertices[i].y(), vertices[i].z());
+            if (is_equal(z, vertices[i].z()) && section_vertices_map.find(facet(i)) == section_vertices_map.end()) {
+                section_vertices_map.emplace(facet(i), vertices[i]);
             }
         }
         // intersect facet with cutting plane
@@ -2554,7 +2554,6 @@ void cut_mesh(const indexed_triangle_set& mesh, float z, indexed_triangle_set* u
         }
 #endif // NDEBUG
     }
-    std::map<int, Vec3f*>().swap(section_vertices_map);
 }
 
 } // namespace Slic3r
diff --git a/src/slic3r/GUI/AMSMaterialsSetting.cpp b/src/slic3r/GUI/AMSMaterialsSetting.cpp
index b015185f9d..a649f6b833 100644
--- a/src/slic3r/GUI/AMSMaterialsSetting.cpp
+++ b/src/slic3r/GUI/AMSMaterialsSetting.cpp
@@ -57,32 +57,15 @@ void AMSMaterialsSetting::create()
     m_sizer_button->Add(0, 0, 1, wxEXPAND, 0);
 
     m_button_confirm = new Button(this, _L("Confirm"));
-    m_btn_bg_green   = StateColor(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));
-    m_button_confirm->SetBackgroundColor(m_btn_bg_green);
-    m_button_confirm->SetBorderColor(wxColour(0, 150, 136));
-    m_button_confirm->SetTextColor(wxColour("#FFFFFE"));
-    m_button_confirm->SetMinSize(AMS_MATERIALS_SETTING_BUTTON_SIZE);
-    m_button_confirm->SetCornerRadius(FromDIP(12));
+    m_button_confirm->SetStyle(ButtonStyle::Confirm, ButtonType::Choice);
     m_button_confirm->Bind(wxEVT_BUTTON, &AMSMaterialsSetting::on_select_ok, this);
 
     m_button_reset = new Button(this, _L("Reset"));
-    m_btn_bg_gray = StateColor(std::pair<wxColour, int>(wxColour(206, 206, 206), StateColor::Pressed), std::pair<wxColour, int>(*wxWHITE, StateColor::Focused),
-        std::pair<wxColour, int>(wxColour(238, 238, 238), StateColor::Hovered),
-        std::pair<wxColour, int>(*wxWHITE, StateColor::Normal));
-    m_button_reset->SetBackgroundColor(m_btn_bg_gray);
-    m_button_reset->SetBorderColor(AMS_MATERIALS_SETTING_GREY900);
-    m_button_reset->SetTextColor(AMS_MATERIALS_SETTING_GREY900);
-    m_button_reset->SetMinSize(AMS_MATERIALS_SETTING_BUTTON_SIZE);
-    m_button_reset->SetCornerRadius(FromDIP(12));
+    m_button_reset->SetStyle(ButtonStyle::Regular, ButtonType::Choice);
     m_button_reset->Bind(wxEVT_BUTTON, &AMSMaterialsSetting::on_select_reset, this);
 
     m_button_close = new Button(this, _L("Close"));
-    m_button_close->SetBackgroundColor(m_btn_bg_gray);
-    m_button_close->SetBorderColor(AMS_MATERIALS_SETTING_GREY900);
-    m_button_close->SetTextColor(AMS_MATERIALS_SETTING_GREY900);
-    m_button_close->SetMinSize(AMS_MATERIALS_SETTING_BUTTON_SIZE);
-    m_button_close->SetCornerRadius(FromDIP(12));
+    m_button_close->SetStyle(ButtonStyle::Regular, ButtonType::Choice);
     m_button_close->Bind(wxEVT_BUTTON, &AMSMaterialsSetting::on_select_close, this);
 
     m_sizer_button->Add(m_button_confirm, 0, wxALIGN_CENTER | wxRIGHT, FromDIP(20));
@@ -836,7 +819,7 @@ void AMSMaterialsSetting::update_widgets()
 bool AMSMaterialsSetting::Show(bool show)
 {
     if (show) {
-        m_button_confirm->SetMinSize(AMS_MATERIALS_SETTING_BUTTON_SIZE);
+        m_button_confirm->Rescale(); // ORCA re applies size
         m_input_nozzle_max->GetTextCtrl()->SetSize(wxSize(-1, FromDIP(20)));
         m_input_nozzle_min->GetTextCtrl()->SetSize(wxSize(-1, FromDIP(20)));
         //m_clr_picker->set_color(m_clr_picker->GetParent()->GetBackgroundColour());
@@ -1193,9 +1176,7 @@ void AMSMaterialsSetting::on_select_filament(wxCommandEvent &evt)
     if ( !this->obj || m_filament_selection < 0) {
         m_input_k_val->Enable(false);
         m_input_n_val->Enable(false);
-        m_button_confirm->Disable();
-        m_button_confirm->SetBackgroundColor(wxColour(0x90, 0x90, 0x90));
-        m_button_confirm->SetBorderColor(wxColour(0x90, 0x90, 0x90));
+        m_button_confirm->Disable(); // ORCA No need to change style
         m_comboBox_cali_result->Clear();
         m_comboBox_cali_result->SetValue(wxEmptyString);
         m_input_k_val->GetTextCtrl()->SetValue(wxEmptyString);
@@ -1204,10 +1185,7 @@ void AMSMaterialsSetting::on_select_filament(wxCommandEvent &evt)
         return;
     }
     else {
-        m_button_confirm->SetBackgroundColor(m_btn_bg_green);
-        m_button_confirm->SetBorderColor(wxColour(0, 150, 136));
-        m_button_confirm->SetTextColor(wxColour("#FFFFFE"));
-        m_button_confirm->Enable(true);
+        m_button_confirm->Enable(true);  // ORCA No need to change style
     }
 
     //filament id
@@ -1357,12 +1335,9 @@ void AMSMaterialsSetting::on_dpi_changed(const wxRect &suggested_rect)
     degree->msw_rescale();
     bitmap_max_degree->SetBitmap(degree->bmp());
     bitmap_min_degree->SetBitmap(degree->bmp());
-    m_button_reset->SetMinSize(AMS_MATERIALS_SETTING_BUTTON_SIZE);
-    m_button_reset->SetCornerRadius(FromDIP(12));
-    m_button_confirm->SetMinSize(AMS_MATERIALS_SETTING_BUTTON_SIZE);
-    m_button_confirm->SetCornerRadius(FromDIP(12));
-    m_button_close->SetMinSize(AMS_MATERIALS_SETTING_BUTTON_SIZE);
-    m_button_close->SetCornerRadius(FromDIP(12));
+    m_button_reset->Rescale(); // ORCA
+    m_button_confirm->Rescale(); // ORCA
+    m_button_close->Rescale(); // ORCA
     this->Refresh();
 }
 
diff --git a/src/slic3r/GUI/BBLStatusBarSend.cpp b/src/slic3r/GUI/BBLStatusBarSend.cpp
index 3081215480..d6d38fd019 100644
--- a/src/slic3r/GUI/BBLStatusBarSend.cpp
+++ b/src/slic3r/GUI/BBLStatusBarSend.cpp
@@ -39,25 +39,8 @@ BBLStatusBarSend::BBLStatusBarSend(wxWindow *parent, int id)
 
     //StateColor btn_bd_white(std::pair<wxColour, int>(*wxWHITE, StateColor::Disabled), std::pair<wxColour, int>(wxColour(38, 46, 48), StateColor::Enabled));
 
-    StateColor btn_bt_white(std::pair<wxColour, int>(wxColour(0x90, 0x90, 0x90), StateColor::Disabled),
-        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_bd_white(std::pair<wxColour, int>(wxColour(255, 255, 254), StateColor::Disabled),
-        std::pair<wxColour, int>(wxColour(38, 46, 48), StateColor::Enabled));
-
-
-    StateColor btn_txt_white(std::pair<wxColour, int>(wxColour("#FFFFFE"), StateColor::Disabled), std::pair<wxColour, int>(wxColour(38, 46, 48), StateColor::Normal));
-
     m_cancelbutton = new Button(m_self, _L("Cancel"));
-    m_cancelbutton->SetSize(wxSize(m_self->FromDIP(58), m_self->FromDIP(22)));
-    m_cancelbutton->SetMinSize(wxSize(m_self->FromDIP(58), m_self->FromDIP(22)));
-    m_cancelbutton->SetMaxSize(wxSize(m_self->FromDIP(58), m_self->FromDIP(22)));
-    m_cancelbutton->SetBackgroundColor(btn_bt_white);
-    m_cancelbutton->SetBorderColor(btn_bd_white);
-    m_cancelbutton->SetTextColor(btn_txt_white);
-    m_cancelbutton->SetCornerRadius(m_self->FromDIP(12));
+    m_cancelbutton->SetStyle(ButtonStyle::Regular, ButtonType::Choice);
     m_cancelbutton->Bind(wxEVT_BUTTON,
         [this](wxCommandEvent &evt) {
         cancel();
diff --git a/src/slic3r/GUI/BindDialog.cpp b/src/slic3r/GUI/BindDialog.cpp
index 2b09003e56..7610fbe820 100644
--- a/src/slic3r/GUI/BindDialog.cpp
+++ b/src/slic3r/GUI/BindDialog.cpp
@@ -135,32 +135,14 @@ PingCodeBindDialog::PingCodeBindDialog(Plater* plater /*= nullptr*/)
     wxBoxSizer* m_sizer_button = new wxBoxSizer(wxHORIZONTAL);
     m_sizer_button->Add(0, 0, 1, wxEXPAND, 5);
     m_button_bind = new Button(request_bind_panel, _L("Confirm"));
-
-    StateColor btn_bg_green(std::pair<wxColour, int>(wxColour(206, 206, 206), StateColor::Disabled),
-        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));
-    m_button_bind->SetBackgroundColor(btn_bg_green);
-    m_button_bind->SetBorderColor(*wxWHITE);
-    m_button_bind->SetTextColor(wxColour("#FFFFFE"));
-    m_button_bind->SetSize(BIND_DIALOG_BUTTON_SIZE);
-    m_button_bind->SetMinSize(BIND_DIALOG_BUTTON_SIZE);
-    m_button_bind->SetCornerRadius(FromDIP(12));
+    m_button_bind->SetStyle(ButtonStyle::Confirm, ButtonType::Choice);
     m_button_bind->Enable(false);
 
-    StateColor btn_bg_white(std::pair<wxColour, int>(wxColour(206, 206, 206), StateColor::Hovered),
-        std::pair<wxColour, int>(*wxWHITE, StateColor::Normal));
-
     m_button_cancel = new Button(request_bind_panel, _L("Cancel"));
-    m_button_cancel->SetBackgroundColor(btn_bg_white);
-    m_button_cancel->SetBorderColor(BIND_DIALOG_GREY900);
-    m_button_cancel->SetSize(BIND_DIALOG_BUTTON_SIZE);
-    m_button_cancel->SetMinSize(BIND_DIALOG_BUTTON_SIZE);
-    m_button_cancel->SetTextColor(BIND_DIALOG_GREY900);
-    m_button_cancel->SetCornerRadius(FromDIP(12));
+    m_button_cancel->SetStyle(ButtonStyle::Regular, ButtonType::Choice);
 
     m_sizer_button->Add(m_button_bind, 0, wxALIGN_CENTER, 0);
-    m_sizer_button->Add(0, 0, 0, wxLEFT, FromDIP(13));
+    m_sizer_button->Add(0, 0, 0, wxLEFT, ButtonProps::ChoiceButtonGap());
     m_sizer_button->Add(m_button_cancel, 0, wxALIGN_CENTER, 0);
 
 
@@ -179,7 +161,7 @@ PingCodeBindDialog::PingCodeBindDialog(Plater* plater /*= nullptr*/)
     sizer_request->Add(0, 0, 0, wxTOP, FromDIP(5));
     sizer_request->Add(ping_code_input, 0, wxLEFT, FromDIP(10));
     sizer_request->Add(0, 0, 0, wxTOP, FromDIP(10));
-    sizer_request->Add(m_sizer_button, 0, wxALIGN_RIGHT | wxRIGHT | wxBOTTOM, FromDIP(15));
+    sizer_request->Add(m_sizer_button, 0, wxALIGN_RIGHT | wxRIGHT | wxBOTTOM, ButtonProps::ChoiceButtonGap());
     request_bind_panel->SetSizer(sizer_request);
     request_bind_panel->Layout();
     request_bind_panel->Fit();
@@ -197,12 +179,8 @@ PingCodeBindDialog::PingCodeBindDialog(Plater* plater /*= nullptr*/)
     m_sizer_binding_button->Add(0, 0, 1, wxEXPAND, 5);
 
     m_button_close = new Button(binding_panel, _L("Close"));
-    m_button_close->SetBackgroundColor(btn_bg_white);
-    m_button_close->SetBorderColor(BIND_DIALOG_GREY900);
-    m_button_close->SetSize(BIND_DIALOG_BUTTON_SIZE);
-    m_button_close->SetMinSize(BIND_DIALOG_BUTTON_SIZE);
-    m_button_close->SetTextColor(BIND_DIALOG_GREY900);
-    m_button_close->SetCornerRadius(FromDIP(12));
+    m_button_close->SetStyle(ButtonStyle::Regular, ButtonType::Choice);
+
     m_sizer_binding_button->Add(m_button_close, 0, wxALIGN_CENTER, 0);
 
     auto sizer_binding = new wxBoxSizer(wxVERTICAL);
@@ -211,7 +189,7 @@ PingCodeBindDialog::PingCodeBindDialog(Plater* plater /*= nullptr*/)
     sizer_binding->Add(0, 0, 0, wxTOP, FromDIP(10));
     sizer_binding->Add(m_loading_tip_txt, 0, wxALIGN_CENTER, 0);
     sizer_binding->Add(0, 0, 0, wxTOP, FromDIP(30));
-    sizer_binding->Add(m_sizer_binding_button, 0, wxALIGN_RIGHT | wxRIGHT, FromDIP(20));
+    sizer_binding->Add(m_sizer_binding_button, 0, wxALIGN_RIGHT | wxRIGHT | wxBOTTOM, ButtonProps::ChoiceButtonGap());
     binding_panel->SetSizer(sizer_binding);
     binding_panel->Layout();
     binding_panel->Fit();
@@ -484,7 +462,7 @@ PingCodeBindDialog::~PingCodeBindDialog() {
          wxString txt = _L("Thank you for purchasing a Bambu Lab device. Before using your Bambu Lab device, please read the terms and conditions. "
                            "By clicking to agree to use your Bambu Lab device, you agree to abide by the Privacy Policy and Terms of Use (collectively, the \"Terms\"). "
                            "If you do not comply with or agree to the Bambu Lab Privacy Policy, please do not use Bambu Lab equipment and services.");
-         ConfirmBeforeSendDialog confirm_dlg(this, wxID_ANY, _L("Terms and Conditions"), ConfirmBeforeSendDialog::ButtonStyle::ONLY_CONFIRM);
+         ConfirmBeforeSendDialog confirm_dlg(this, wxID_ANY, _L("Terms and Conditions"), ConfirmBeforeSendDialog::VisibleButtons::ONLY_CONFIRM); // ORCA VisibleButtons instead ButtonStyle 
          confirm_dlg.update_text(txt);
          confirm_dlg.CenterOnParent();
          confirm_dlg.on_show();
@@ -553,7 +531,7 @@ PingCodeBindDialog::~PingCodeBindDialog() {
                            "Personal Data by which an individual can be identified directly or indirectly, including "
                            "without limitation names, addresses, payment information, or phone numbers. By enabling "
                            "this service, you agree to these terms and the statement about Privacy Policy.");
-         ConfirmBeforeSendDialog confirm_dlg(this, wxID_ANY, _L("Statement on User Experience Improvement Plan"), ConfirmBeforeSendDialog::ButtonStyle::ONLY_CONFIRM);
+         ConfirmBeforeSendDialog confirm_dlg(this, wxID_ANY, _L("Statement on User Experience Improvement Plan"), ConfirmBeforeSendDialog::VisibleButtons::ONLY_CONFIRM); // ORCA VisibleButtons instead ButtonStyle 
 
          wxString model_id_text;
 
@@ -683,35 +661,15 @@ PingCodeBindDialog::~PingCodeBindDialog() {
      auto        button_panel   = new wxPanel(m_simplebook, wxID_ANY, wxDefaultPosition, BIND_DIALOG_BUTTON_PANEL_SIZE);
      button_panel->SetBackgroundColour(*wxWHITE);
      wxBoxSizer *m_sizer_button = new wxBoxSizer(wxHORIZONTAL);
-     m_sizer_button->Add(0, 0, 1, wxEXPAND, 5);
      m_button_bind = new Button(button_panel, _L("Confirm"));
-
-     StateColor btn_bg_green(std::pair<wxColour, int>(wxColour(206, 206, 206), StateColor::Disabled),
-         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));
-     m_button_bind->SetBackgroundColor(btn_bg_green);
-     m_button_bind->SetBorderColor(*wxWHITE);
-     m_button_bind->SetTextColor(wxColour("#FFFFFE"));
-     m_button_bind->SetSize(BIND_DIALOG_BUTTON_SIZE);
-     m_button_bind->SetMinSize(BIND_DIALOG_BUTTON_SIZE);
-     m_button_bind->SetCornerRadius(FromDIP(12));
+     m_button_bind->SetStyle(ButtonStyle::Confirm, ButtonType::Choice);
      m_button_bind->Enable(false);
 
-
-     StateColor btn_bg_white(std::pair<wxColour, int>(wxColour(206, 206, 206), StateColor::Hovered),
-                            std::pair<wxColour, int>(*wxWHITE, StateColor::Normal));
-
      m_button_cancel = new Button(button_panel, _L("Cancel"));
-     m_button_cancel->SetBackgroundColor(btn_bg_white);
-     m_button_cancel->SetBorderColor(BIND_DIALOG_GREY900);
-     m_button_cancel->SetSize(BIND_DIALOG_BUTTON_SIZE);
-     m_button_cancel->SetMinSize(BIND_DIALOG_BUTTON_SIZE);
-     m_button_cancel->SetTextColor(BIND_DIALOG_GREY900);
-     m_button_cancel->SetCornerRadius(FromDIP(12));
+     m_button_cancel->SetStyle(ButtonStyle::Regular, ButtonType::Choice);
 
      m_sizer_button->Add(m_button_bind, 0, wxALIGN_CENTER, 0);
-     m_sizer_button->Add(0, 0, 0, wxLEFT, FromDIP(13));
+     m_sizer_button->AddSpacer(ButtonProps::ChoiceButtonGap());
      m_sizer_button->Add(m_button_cancel, 0, wxALIGN_CENTER, 0);
      button_panel->SetSizer(m_sizer_button);
      button_panel->Layout();
@@ -730,8 +688,7 @@ PingCodeBindDialog::~PingCodeBindDialog() {
      m_sizer_main->Add(m_panel_agreement, 0, wxALIGN_CENTER, 0);
      m_sizer_main->Add(0, 0, 0, wxTOP, FromDIP(10));
      m_sizer_main->Add(m_sw_bind_failed_info, 0, wxALIGN_CENTER, 0);
-     m_sizer_main->Add(m_simplebook, 0, wxALIGN_CENTER, 0);
-     m_sizer_main->Add(0, 0, 0, wxTOP, FromDIP(20));
+     m_sizer_main->Add(m_simplebook, 0, wxALIGN_RIGHT | wxRIGHT | wxBOTTOM, ButtonProps::ChoiceButtonGap());
 
      SetSizer(m_sizer_main);
      Layout();
@@ -891,8 +848,8 @@ PingCodeBindDialog::~PingCodeBindDialog() {
 
 void BindMachineDialog::on_dpi_changed(const wxRect &suggested_rect)
 {
-    m_button_bind->SetMinSize(BIND_DIALOG_BUTTON_SIZE);
-    m_button_cancel->SetMinSize(BIND_DIALOG_BUTTON_SIZE);
+    m_button_bind->Rescale(); // ORCA
+    m_button_cancel->Rescale(); // ORCA
 }
 
 void BindMachineDialog::update_machine_info(MachineObject* info)
@@ -1040,34 +997,18 @@ UnBindMachineDialog::UnBindMachineDialog(Plater *plater /*= nullptr*/)
 
      m_sizer_button->Add(0, 0, 1, wxEXPAND, 5);
      m_button_unbind = new Button(this, _L("Confirm"));
-     StateColor btn_bg_green(std::pair<wxColour, int>(wxColour(38, 166, 154), StateColor::Hovered),
-                             std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal));
-     m_button_unbind->SetBackgroundColor(btn_bg_green);
-     m_button_unbind->SetBorderColor(wxColour(0, 150, 136));
-     m_button_unbind->SetTextColor(wxColour("#FFFFFE"));
-     m_button_unbind->SetSize(BIND_DIALOG_BUTTON_SIZE);
-     m_button_unbind->SetMinSize(BIND_DIALOG_BUTTON_SIZE);
-     m_button_unbind->SetCornerRadius(FromDIP(12));
-
-
-     StateColor btn_bg_white(std::pair<wxColour, int>(wxColour(206, 206, 206), StateColor::Hovered),
-                            std::pair<wxColour, int>(*wxWHITE, StateColor::Normal));
+     m_button_unbind->SetStyle(ButtonStyle::Confirm, ButtonType::Choice);
 
      m_button_cancel = new Button(this, _L("Cancel"));
-     m_button_cancel->SetBackgroundColor(btn_bg_white);
-     m_button_cancel->SetBorderColor(BIND_DIALOG_GREY900);
-     m_button_cancel->SetSize(BIND_DIALOG_BUTTON_SIZE);
-     m_button_cancel->SetMinSize(BIND_DIALOG_BUTTON_SIZE);
-     m_button_cancel->SetTextColor(BIND_DIALOG_GREY900);
-     m_button_cancel->SetCornerRadius(FromDIP(12));
+     m_button_cancel->SetStyle(ButtonStyle::Regular, ButtonType::Choice);
 
      m_sizer_button->Add(m_button_unbind, 0, wxALIGN_CENTER, 0);
-     m_sizer_button->Add(0, 0, 0, wxLEFT, FromDIP(13));
+     m_sizer_button->Add(0, 0, 0, wxLEFT, ButtonProps::ChoiceButtonGap());
      m_sizer_button->Add(m_button_cancel, 0, wxALIGN_CENTER, 0);
 
      m_sizer_main->Add(m_status_text, 0, wxALIGN_CENTER, 0);
      m_sizer_main->Add(0, 0, 0, wxTOP, FromDIP(10));
-     m_sizer_main->Add(m_sizer_button, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(30));
+     m_sizer_main->Add(m_sizer_button, 0, wxALIGN_RIGHT | wxRIGHT, ButtonProps::ChoiceButtonGap());
      m_sizer_main->Add(0, 0, 0, wxTOP, FromDIP(20));
 
      SetSizer(m_sizer_main);
@@ -1133,8 +1074,8 @@ void UnBindMachineDialog::on_unbind_printer(wxCommandEvent &event)
 
  void UnBindMachineDialog::on_dpi_changed(const wxRect &suggested_rect)
 {
-      m_button_unbind->SetMinSize(BIND_DIALOG_BUTTON_SIZE);
-      m_button_cancel->SetMinSize(BIND_DIALOG_BUTTON_SIZE);
+      m_button_unbind->Rescale(); // ORCA
+      m_button_cancel->Rescale(); // ORCA
 }
 
 void UnBindMachineDialog::on_show(wxShowEvent &event)
diff --git a/src/slic3r/GUI/CaliHistoryDialog.cpp b/src/slic3r/GUI/CaliHistoryDialog.cpp
index 1035d9f55b..1dee391ae1 100644
--- a/src/slic3r/GUI/CaliHistoryDialog.cpp
+++ b/src/slic3r/GUI/CaliHistoryDialog.cpp
@@ -7,6 +7,7 @@
 #include "format.hpp"
 #include "MsgDialog.hpp"
 #include "slic3r/Utils/CalibUtils.hpp"
+#include "Widgets/DialogButtons.hpp"
 #include <wx/gbsizer.h>
 
 #include "Plater.hpp"
@@ -114,15 +115,7 @@ HistoryWindow::HistoryWindow(wxWindow* parent, const std::vector<PACalibResult>&
     scroll_window->SetSizer(scroll_sizer);
 
     Button *   mew_btn = new Button(scroll_window, _L("New"));
-    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));
-    mew_btn->SetBackgroundColour(*wxWHITE);
-    mew_btn->SetBackgroundColor(btn_bg_green);
-    mew_btn->SetBorderColor(wxColour(0, 150, 136));
-    mew_btn->SetTextColor(wxColour("#FFFFFE"));
-    mew_btn->SetMinSize(wxSize(FromDIP(100), FromDIP(24)));
-    mew_btn->SetMaxSize(wxSize(FromDIP(100), FromDIP(24)));
-    mew_btn->SetCornerRadius(FromDIP(12));
+    mew_btn->SetStyle(ButtonStyle::Confirm, ButtonType::Window);
     mew_btn->Bind(wxEVT_BUTTON, &HistoryWindow::on_click_new_button, this);
 
     scroll_sizer->Add(mew_btn, 0, wxLEFT, FromDIP(20));
@@ -379,9 +372,7 @@ void HistoryWindow::sync_history_data() {
         auto n_value = new Label(m_history_data_panel, n_str);
         n_value->Hide();
         auto delete_button = new Button(m_history_data_panel, _L("Delete"));
-        delete_button->SetBackgroundColour(*wxWHITE);
-        delete_button->SetMinSize(wxSize(-1, FromDIP(24)));
-        delete_button->SetCornerRadius(FromDIP(12));
+        delete_button->SetStyle(ButtonStyle::Alert, ButtonType::Window);
         delete_button->Bind(wxEVT_BUTTON, [this, gbSizer, i, &result](auto& e) {
             if (m_ui_op_lock) {
                 return;
@@ -405,15 +396,7 @@ void HistoryWindow::sync_history_data() {
             });
 
         auto edit_button = new Button(m_history_data_panel, _L("Edit"));
-        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));
-        edit_button->SetBackgroundColour(*wxWHITE);
-        edit_button->SetBackgroundColor(btn_bg_green);
-        edit_button->SetBorderColor(wxColour(0, 150, 136));
-        edit_button->SetTextColor(wxColour("#FFFFFE"));
-        edit_button->SetMinSize(wxSize(-1, FromDIP(24)));
-        edit_button->SetCornerRadius(FromDIP(12));
+        edit_button->SetStyle(ButtonStyle::Confirm, ButtonType::Window);
         edit_button->Bind(wxEVT_BUTTON, [this, result, k_value, name_value, edit_button](auto& e) {
             if (m_ui_op_lock) return;
 
@@ -580,29 +563,11 @@ EditCalibrationHistoryDialog::EditCalibrationHistoryDialog(wxWindow
 
     panel_sizer->AddSpacer(FromDIP(25));
 
-    auto btn_sizer = new wxBoxSizer(wxHORIZONTAL);
-    Button* save_btn = new Button(top_panel, _L("Save"));
-    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));
-    save_btn->SetBackgroundColour(*wxWHITE);
-    save_btn->SetBackgroundColor(btn_bg_green);
-    save_btn->SetBorderColor(wxColour(0, 150, 136));
-    save_btn->SetTextColor(wxColour("#FFFFFE"));
-    save_btn->SetMinSize(wxSize(-1, FromDIP(24)));
-    save_btn->SetCornerRadius(FromDIP(12));
-    Button* cancel_btn = new Button(top_panel, _L("Cancel"));
-    cancel_btn->SetBackgroundColour(*wxWHITE);
-    cancel_btn->SetMinSize(wxSize(-1, FromDIP(24)));
-    cancel_btn->SetCornerRadius(FromDIP(12));
-    save_btn->Bind(wxEVT_BUTTON, &EditCalibrationHistoryDialog::on_save, this);
-    cancel_btn->Bind(wxEVT_BUTTON, &EditCalibrationHistoryDialog::on_cancel, this);
-    btn_sizer->AddStretchSpacer();
-    btn_sizer->Add(save_btn);
-    btn_sizer->AddSpacer(FromDIP(20));
-    btn_sizer->Add(cancel_btn);
-    panel_sizer->Add(btn_sizer, 0, wxEXPAND, 0);
-
+    auto dlg_btns = new DialogButtons(top_panel, {"OK", "Cancel"});
+    dlg_btns->GetOK()->SetLabel(_L("Save"));
+    dlg_btns->GetOK()->Bind(wxEVT_BUTTON, &EditCalibrationHistoryDialog::on_save, this);
+    dlg_btns->GetCANCEL()->Bind(wxEVT_BUTTON, &EditCalibrationHistoryDialog::on_cancel, this);
+    panel_sizer->Add(dlg_btns, 0, wxEXPAND, 0);
 
     main_sizer->Add(top_panel, 1, wxEXPAND | wxALL, FromDIP(20));
 
@@ -844,27 +809,10 @@ NewCalibrationHistoryDialog::NewCalibrationHistoryDialog(wxWindow *parent, const
 
     panel_sizer->AddSpacer(FromDIP(25));
 
-    auto       btn_sizer = new wxBoxSizer(wxHORIZONTAL);
-    Button *   ok_btn  = new Button(top_panel, _L("OK"));
-    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));
-    ok_btn->SetBackgroundColour(*wxWHITE);
-    ok_btn->SetBackgroundColor(btn_bg_green);
-    ok_btn->SetBorderColor(wxColour(0, 150, 136));
-    ok_btn->SetTextColor(wxColour("#FFFFFE"));
-    ok_btn->SetMinSize(wxSize(-1, FromDIP(24)));
-    ok_btn->SetCornerRadius(FromDIP(12));
-    Button *cancel_btn = new Button(top_panel, _L("Cancel"));
-    cancel_btn->SetBackgroundColour(*wxWHITE);
-    cancel_btn->SetMinSize(wxSize(-1, FromDIP(24)));
-    cancel_btn->SetCornerRadius(FromDIP(12));
-    ok_btn->Bind(wxEVT_BUTTON, &NewCalibrationHistoryDialog::on_ok, this);
-    cancel_btn->Bind(wxEVT_BUTTON, &NewCalibrationHistoryDialog::on_cancel, this);
-    btn_sizer->AddStretchSpacer();
-    btn_sizer->Add(ok_btn);
-    btn_sizer->AddSpacer(FromDIP(20));
-    btn_sizer->Add(cancel_btn);
-    panel_sizer->Add(btn_sizer, 0, wxEXPAND, 0);
+    auto dlg_btns = new DialogButtons(top_panel, {"OK", "Cancel"});
+    dlg_btns->GetOK()->Bind(wxEVT_BUTTON, &NewCalibrationHistoryDialog::on_ok, this);
+    dlg_btns->GetCANCEL()->Bind(wxEVT_BUTTON, &NewCalibrationHistoryDialog::on_cancel, this);
+    panel_sizer->Add(dlg_btns, 0, wxEXPAND, 0);
 
     main_sizer->Add(top_panel, 1, wxEXPAND | wxALL, FromDIP(20));
 
diff --git a/src/slic3r/GUI/Calibration.cpp b/src/slic3r/GUI/Calibration.cpp
index a23dc07c0e..4b32d10a02 100644
--- a/src/slic3r/GUI/Calibration.cpp
+++ b/src/slic3r/GUI/Calibration.cpp
@@ -141,16 +141,8 @@ CalibrationDialog::CalibrationDialog(Plater *plater)
     m_calibration_flow->SetMinSize(wxSize(CALI_FLOW_CONTENT_WIDTH, FromDIP(160)));
     m_calibration_flow->SetSize(wxSize(CALI_FLOW_CONTENT_WIDTH, FromDIP(160)));
 
-    StateColor btn_bg_green(std::pair<wxColour, int>(AMS_CONTROL_DISABLE_COLOUR, StateColor::Disabled), std::pair<wxColour, int>(wxColour(0, 137, 123), StateColor::Pressed),
-                            std::pair<wxColour, int>(wxColour(38, 166, 154), StateColor::Hovered), std::pair<wxColour, int>(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal));
-    StateColor btn_bd_green(std::pair<wxColour, int>(AMS_CONTROL_WHITE_COLOUR, StateColor::Disabled), std::pair<wxColour, int>(AMS_CONTROL_BRAND_COLOUR, StateColor::Enabled));
-
     m_calibration_btn = new Button(cali_right_panel, _L("Start Calibration"));
-    m_calibration_btn->SetBackgroundColor(btn_bg_green);
-    m_calibration_btn->SetBorderColor(btn_bd_green);
-    m_calibration_btn->SetTextColor(wxColour("#FFFFFE"));
-    m_calibration_btn->SetSize(wxSize(FromDIP(128), FromDIP(26)));
-    m_calibration_btn->SetMinSize(wxSize(FromDIP(128), FromDIP(26)));
+    m_calibration_btn->SetStyle(ButtonStyle::Confirm, ButtonType::Choice);
 
     cali_right_sizer_v->Add(cali_text_right_top, 0, wxALIGN_CENTER, 0);
     cali_right_sizer_v->Add(0, 0, 0, wxTOP, FromDIP(7));
diff --git a/src/slic3r/GUI/CloneDialog.cpp b/src/slic3r/GUI/CloneDialog.cpp
index 8688317f42..2c6f282432 100644
--- a/src/slic3r/GUI/CloneDialog.cpp
+++ b/src/slic3r/GUI/CloneDialog.cpp
@@ -42,13 +42,10 @@ CloneDialog::CloneDialog(wxWindow *parent)
     m_progress->Hide();
     bottom_sizer->Add(m_progress, 2, wxEXPAND | wxLEFT | wxALIGN_CENTER_VERTICAL, FromDIP(10));
 
-    // used next button to get automatic left alignment
-    // will add a left_align_first_n parameter to DialogButtons. current method not good
-    auto dlg_btns = new DialogButtons(this, {"Next", "OK", "Cancel"});
+    auto dlg_btns = new DialogButtons(this, {"Fill", "OK", "Cancel"}, "", 1 /*left_aligned*/);
 
-    dlg_btns->GetNEXT()->SetLabel(_L("Fill"));
-    dlg_btns->GetNEXT()->SetToolTip(_L("Fill bed with copies"));
-    dlg_btns->GetNEXT()->Bind(wxEVT_BUTTON, [this](wxCommandEvent &e) {
+    dlg_btns->GetFIRST()->SetToolTip(_L("Fill bed with copies"));
+    dlg_btns->GetFIRST()->Bind(wxEVT_BUTTON, [this](wxCommandEvent &e) {
         m_plater->fill_bed_with_instances();
         EndModal(wxID_OK);
     });
@@ -63,7 +60,7 @@ CloneDialog::CloneDialog(wxWindow *parent)
         m_progress->Show();
 
         dlg_btns->GetOK()->Hide();
-        dlg_btns->GetNEXT()->Hide();
+        dlg_btns->GetFIRST()->Hide();
 
         this->Layout();
         v_sizer->Fit(this);
diff --git a/src/slic3r/GUI/ConnectPrinter.cpp b/src/slic3r/GUI/ConnectPrinter.cpp
index 252899a4d9..9ba64e7ca7 100644
--- a/src/slic3r/GUI/ConnectPrinter.cpp
+++ b/src/slic3r/GUI/ConnectPrinter.cpp
@@ -49,24 +49,7 @@ ConnectPrinterDialog::ConnectPrinterDialog(wxWindow *parent, wxWindowID id, cons
     sizer_connect->Add(FromDIP(20), 0);
 
     m_button_confirm = new Button(this, _L("Confirm"));
-    m_button_confirm->SetFont(Label::Body_12);
-    m_button_confirm->SetMinSize(wxSize(-1, FromDIP(24)));
-    m_button_confirm->SetCornerRadius(FromDIP(12));
-    m_button_confirm->SetTextColor(wxColour("#FFFFFE"));
-
-    StateColor btn_bg(
-        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)
-    );
-
-    StateColor btn_bd(std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal));
-
-    StateColor btn_text(std::pair<wxColour, int>(wxColour(255, 255, 255), StateColor::Normal));
-
-    m_button_confirm->SetBackgroundColor(btn_bg);
-    m_button_confirm->SetBorderColor(btn_bd);
-    m_button_confirm->SetTextColor(btn_text);
+    m_button_confirm->SetStyle(ButtonStyle::Confirm, ButtonType::Choice);
 
     sizer_connect->Add(m_button_confirm, 0, wxALL | wxALIGN_CENTER_VERTICAL, 0);
     
@@ -193,8 +176,7 @@ void ConnectPrinterDialog::on_dpi_changed(const wxRect &suggested_rect)
     m_textCtrl_code->GetTextCtrl()->SetSize(wxSize(-1, FromDIP(22)));
     m_textCtrl_code->GetTextCtrl()->SetMinSize(wxSize(-1, FromDIP(22)));
 
-    m_button_confirm->SetCornerRadius(FromDIP(12));
-    m_button_confirm->Rescale();
+    m_button_confirm->Rescale(); // ORCA No need to set style again
     
     Layout();
     this->Refresh();
diff --git a/src/slic3r/GUI/CreatePresetsDialog.cpp b/src/slic3r/GUI/CreatePresetsDialog.cpp
index 5c64733d75..7eb3beda82 100644
--- a/src/slic3r/GUI/CreatePresetsDialog.cpp
+++ b/src/slic3r/GUI/CreatePresetsDialog.cpp
@@ -2737,7 +2737,7 @@ wxBoxSizer *CreatePrinterPresetDialog::create_presets_template_item(wxWindow *pa
 
 wxWindow *CreatePrinterPresetDialog::create_page2_dialog_buttons(wxWindow *parent)
 {
-    auto dlg_btns = new DialogButtons(parent, {"Return", "OK", "Cancel"});
+    auto dlg_btns = new DialogButtons(parent, {"Return", "OK", "Cancel"}, "", 1 /*left_aligned*/);
 
     dlg_btns->GetRETURN()->Bind(wxEVT_BUTTON, [this](wxCommandEvent &e) { show_page1(); });
 
@@ -4741,9 +4741,9 @@ wxBoxSizer *EditFilamentPresetDialog::create_preset_tree_sizer()
 
 wxWindow *EditFilamentPresetDialog::create_dialog_buttons()
 {
-    auto dlg_btns = new DialogButtons(this, {"Delete", "OK"});
+    auto dlg_btns = new DialogButtons(this, {"Delete", "OK"}, "", 1 /*left_aligned*/);
 
-    dlg_btns->GetButtonFromID(wxID_DELETE)->Bind(wxEVT_BUTTON, ([this](wxCommandEvent &e) {
+    dlg_btns->GetFIRST()->Bind(wxEVT_BUTTON, ([this](wxCommandEvent &e) {
         WarningDialog dlg(this, _L("All the filament presets belong to this filament would be deleted.\n"
                                    "If you are using this filament on your printer, please reset the filament information for that slot."),
                           _L("Delete filament"), wxYES | wxCANCEL | wxCANCEL_DEFAULT | wxCENTRE);
diff --git a/src/slic3r/GUI/DeviceManager.cpp b/src/slic3r/GUI/DeviceManager.cpp
index 763a2d8afe..bbf0b50ca0 100644
--- a/src/slic3r/GUI/DeviceManager.cpp
+++ b/src/slic3r/GUI/DeviceManager.cpp
@@ -4319,7 +4319,7 @@ int MachineObject::parse_json(std::string tunnel, std::string payload, bool key_
 void MachineObject::set_ctt_dlg( wxString text){
     if (!m_set_ctt_dlg) {
         m_set_ctt_dlg = true;
-        auto print_error_dlg = new GUI::SecondaryCheckDialog(nullptr, wxID_ANY, _L("Warning"), GUI::SecondaryCheckDialog::ButtonStyle::ONLY_CONFIRM);
+        auto print_error_dlg = new GUI::SecondaryCheckDialog(nullptr, wxID_ANY, _L("Warning"), GUI::SecondaryCheckDialog::VisibleButtons::ONLY_CONFIRM); // ORCA VisibleButtons instead ButtonStyle 
         print_error_dlg->update_text(text);
         print_error_dlg->Bind(wxEVT_SHOW, [this](auto& e) {
             if (!e.IsShown()) {
diff --git a/src/slic3r/GUI/ExtrusionCalibration.cpp b/src/slic3r/GUI/ExtrusionCalibration.cpp
index fc8e294283..0ff93bf9c4 100644
--- a/src/slic3r/GUI/ExtrusionCalibration.cpp
+++ b/src/slic3r/GUI/ExtrusionCalibration.cpp
@@ -171,37 +171,16 @@ void ExtrusionCalibration::create()
     m_error_text->Hide();
 
     m_button_cali = new Button(m_step_1_panel, _L("Start calibration"));
-    m_btn_bg_green = StateColor(std::pair<wxColour, int>(wxColour(238, 238, 238), StateColor::Disabled), 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));
-    m_button_cali->SetBackgroundColor(m_btn_bg_green);
-    m_button_cali->SetFont(Label::Body_13);
-    m_button_cali->SetBorderColor({ std::pair<wxColour, int>(wxColour(238, 238, 238), StateColor::Disabled), std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Enabled) });
-    m_button_cali->SetTextColor({ std::pair<wxColour, int>(wxColour(172, 172, 172), StateColor::Disabled), std::pair<wxColour, int>(EXTRUSION_CALIBRATION_GREY200, StateColor::Enabled) });
-    m_button_cali->SetCornerRadius(FromDIP(12));
-    m_button_cali->SetMinSize(wxSize(-1, FromDIP(24)));
+    m_button_cali->SetStyle(ButtonStyle::Confirm, ButtonType::Choice);
     m_button_cali->Bind(wxEVT_BUTTON, &ExtrusionCalibration::on_click_cali, this);
 
     m_cali_cancel = new Button(m_step_1_panel, _L("Cancel"));
-    m_btn_bg_green = StateColor(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));
-    m_cali_cancel->SetBackgroundColor(m_btn_bg_green);
-    m_cali_cancel->SetBorderColor(wxColour(0, 150, 136));
-    m_cali_cancel->SetTextColor(EXTRUSION_CALIBRATION_GREY200);
-    m_cali_cancel->SetMinSize(EXTRUSION_CALIBRATION_BUTTON_SIZE);
-    m_cali_cancel->SetCornerRadius(FromDIP(12));
+    m_cali_cancel->SetStyle(ButtonStyle::Regular, ButtonType::Choice);
     m_cali_cancel->Hide();
     m_cali_cancel->Bind(wxEVT_BUTTON, &ExtrusionCalibration::on_click_cancel, this);
 
     m_button_next_step = new Button(m_step_1_panel, _L("Next"));
-    m_btn_bg_gray = StateColor(std::pair<wxColour, int>(wxColour(206, 206, 206), StateColor::Pressed), std::pair<wxColour, int>(*wxWHITE, StateColor::Focused),
-        std::pair<wxColour, int>(wxColour(238, 238, 238), StateColor::Hovered),
-        std::pair<wxColour, int>(*wxWHITE, StateColor::Normal));
-    m_button_next_step->SetBackgroundColor(m_btn_bg_gray);
-    m_button_next_step->SetFont(Label::Body_13);
-    m_button_next_step->SetBorderColor(EXTRUSION_CALIBRATION_GREY900);
-    m_button_next_step->SetTextColor(EXTRUSION_CALIBRATION_GREY900);
-    m_button_next_step->SetMinSize(EXTRUSION_CALIBRATION_BUTTON_SIZE);
-    m_button_next_step->SetCornerRadius(FromDIP(12));
+    m_button_next_step->SetStyle(ButtonStyle::Regular, ButtonType::Choice);
     m_button_next_step->Bind(wxEVT_BUTTON, &ExtrusionCalibration::on_click_next, this);
     m_button_next_step->Hide();
 
@@ -257,23 +236,11 @@ void ExtrusionCalibration::create()
 
     // save button
     m_button_save_result = new Button(m_step_2_panel, _L("Save"));
-    m_btn_bg_green = StateColor(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));
-    m_button_save_result->SetBackgroundColor(m_btn_bg_green);
-    m_button_save_result->SetFont(Label::Body_13);
-    m_button_save_result->SetBorderColor(wxColour(0, 150, 136));
-    m_button_save_result->SetTextColor(EXTRUSION_CALIBRATION_GREY200);
-    m_button_save_result->SetMinSize(EXTRUSION_CALIBRATION_BUTTON_SIZE);
-    m_button_save_result->SetCornerRadius(FromDIP(12));
+    m_button_save_result->SetStyle(ButtonStyle::Confirm, ButtonType::Choice);
     m_button_save_result->Bind(wxEVT_BUTTON, &ExtrusionCalibration::on_click_save, this);
 
     m_button_last_step = new Button(m_step_2_panel, _L("Last Step")); // Back for english
-    m_button_last_step->SetBackgroundColor(m_btn_bg_gray);
-    m_button_last_step->SetFont(Label::Body_13);
-    m_button_last_step->SetBorderColor(EXTRUSION_CALIBRATION_GREY900);
-    m_button_last_step->SetTextColor(EXTRUSION_CALIBRATION_GREY900);
-    m_button_last_step->SetMinSize(EXTRUSION_CALIBRATION_BUTTON_SIZE);
-    m_button_last_step->SetCornerRadius(FromDIP(12));
+    m_button_last_step->SetStyle(ButtonStyle::Regular, ButtonType::Choice);
     m_button_last_step->Bind(wxEVT_BUTTON, &ExtrusionCalibration::on_click_last, this);
 
 
diff --git a/src/slic3r/GUI/ExtrusionCalibration.hpp b/src/slic3r/GUI/ExtrusionCalibration.hpp
index a1655caae9..c7b6c28c8d 100644
--- a/src/slic3r/GUI/ExtrusionCalibration.hpp
+++ b/src/slic3r/GUI/ExtrusionCalibration.hpp
@@ -91,9 +91,6 @@ protected:
     int get_bed_temp(DynamicPrintConfig* config);
 
 protected:
-    StateColor          m_btn_bg_green;
-    StateColor          m_btn_bg_gray;
-
     wxPanel*            m_step_1_panel;
     wxPanel*            m_step_2_panel;
 
diff --git a/src/slic3r/GUI/FilamentPickerDialog.cpp b/src/slic3r/GUI/FilamentPickerDialog.cpp
index 7a944a1493..b8edc4b7c8 100644
--- a/src/slic3r/GUI/FilamentPickerDialog.cpp
+++ b/src/slic3r/GUI/FilamentPickerDialog.cpp
@@ -7,6 +7,7 @@
 #include "Widgets/Label.hpp"
 #include "Widgets/Button.hpp"
 #include "Widgets/StateColor.hpp"
+#include "Widgets/DialogButtons.hpp"
 #include "wxExtensions.hpp"
 #include <wx/wx.h>
 #include <wx/sizer.h>
@@ -97,8 +98,11 @@ FilamentPickerDialog::FilamentPickerDialog(wxWindow *parent, const wxString& fil
     main_sizer->AddSpacer(FromDIP(8));
 
     // OK / Cancel buttons
-    wxBoxSizer* btn_sizer = CreateButtonPanel();
-    main_sizer->Add(btn_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(10));
+    auto dlg_btns = new DialogButtons(this, {"OK", "Cancel"});
+    m_ok_btn = dlg_btns->GetOK();
+    m_cancel_btn = dlg_btns->GetCANCEL();
+
+    main_sizer->Add(dlg_btns, 0, wxEXPAND);
     container_sizer->Add(main_sizer, 1, wxEXPAND | wxALL, FromDIP(16));
 
     SetSizer(container_sizer);
@@ -542,61 +546,6 @@ void FilamentPickerDialog::CreateMoreInfoButton()
     m_more_btn->SetCornerRadius(FromDIP(0));
 }
 
-wxBoxSizer* FilamentPickerDialog::CreateButtonPanel()
-{
-    wxBoxSizer* btn_sizer = new wxBoxSizer(wxHORIZONTAL);
-
-    // Add spacer to push buttons to the right
-    btn_sizer->AddStretchSpacer();
-
-    // standard button color style
-    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)
-    );
-    StateColor btn_bd_green(
-        std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal)
-    );
-    StateColor btn_text_green(
-        std::pair<wxColour, int>(wxColour(255, 255, 254), StateColor::Normal)
-    );
-
-    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>(wxColour(255, 255, 255), StateColor::Normal)
-    );
-    StateColor btn_bd_white(
-        std::pair<wxColour, int>(wxColour(38, 46, 48), StateColor::Normal)
-    );
-    StateColor btn_text_white(
-        std::pair<wxColour, int>(wxColour(38, 46, 48), StateColor::Normal)
-    );
-
-    // Create Cancel button using project's Button class
-    m_cancel_btn = new Button(this, _L("Cancel"), "", 0, 0, wxID_CANCEL);
-    m_cancel_btn->SetMinSize(wxSize(FromDIP(55), FromDIP(24)));
-    m_cancel_btn->SetCornerRadius(FromDIP(12));
-    m_cancel_btn->SetBackgroundColor(btn_bg_white);
-    m_cancel_btn->SetBorderColor(btn_bd_white);
-    m_cancel_btn->SetTextColor(btn_text_white);
-    btn_sizer->Add(m_cancel_btn, 0, wxEXPAND, 0);
-    btn_sizer->AddSpacer(FromDIP(10));
-
-    // Create OK button using project's Button class
-    m_ok_btn = new Button(this, _L("OK"), "", 0, 0, wxID_OK);
-    m_ok_btn->SetMinSize(wxSize(FromDIP(55), FromDIP(24)));
-    m_ok_btn->SetCornerRadius(FromDIP(12));
-    m_ok_btn->SetBackgroundColor(btn_bg_green);
-    m_ok_btn->SetBorderColor(btn_bd_green);
-    m_ok_btn->SetTextColor(btn_text_green);
-    m_ok_btn->SetFocus();
-    btn_sizer->Add(m_ok_btn, 0, wxEXPAND, 0);
-
-    return btn_sizer;
-}
-
 wxColourData FilamentPickerDialog::GetSingleColorData()
 {
     wxColourData data;
diff --git a/src/slic3r/GUI/FilamentPickerDialog.hpp b/src/slic3r/GUI/FilamentPickerDialog.hpp
index c17875c71d..2a1412c947 100644
--- a/src/slic3r/GUI/FilamentPickerDialog.hpp
+++ b/src/slic3r/GUI/FilamentPickerDialog.hpp
@@ -55,7 +55,6 @@ private:
     wxScrolledWindow* CreateColorGrid();
     wxBoxSizer* CreateSeparatorLine();
     void CreateMoreInfoButton();
-    wxBoxSizer* CreateButtonPanel();
     void BindEvents();
 
     // Preview panel helper methods
diff --git a/src/slic3r/GUI/GCodeViewer.cpp b/src/slic3r/GUI/GCodeViewer.cpp
index 98cbcc0e54..ba336e9ee5 100644
--- a/src/slic3r/GUI/GCodeViewer.cpp
+++ b/src/slic3r/GUI/GCodeViewer.cpp
@@ -870,15 +870,23 @@ void GCodeViewer::init(ConfigOptionMode mode, PresetBundle* preset_bundle)
 
     if (preset_bundle)
         m_nozzle_nums = preset_bundle->get_printer_extruder_count();
+        bool multimaterial = preset_bundle->filament_presets.empty() ? 0 : preset_bundle->filament_presets.size() > 1;
 
     // set to color print by default if use multi extruders
     if (m_nozzle_nums > 1) {
-        m_view_type_sel = std::distance(view_type_items.begin(),std::find(view_type_items.begin(), view_type_items.end(), EViewType::Summary));
+        m_view_type_sel = std::distance(view_type_items.begin(),
+                                        std::find(view_type_items.begin(), view_type_items.end(), EViewType::Summary));
         set_view_type(EViewType::Summary);
-    } else {
-        m_view_type_sel = std::distance(view_type_items.begin(),std::find(view_type_items.begin(), view_type_items.end(), EViewType::ColorPrint));
+    } else if (multimaterial) {
+        m_view_type_sel = std::distance(view_type_items.begin(),
+                                        std::find(view_type_items.begin(), view_type_items.end(), EViewType::ColorPrint));
         set_view_type(EViewType::ColorPrint);
+    } else {
+        m_view_type_sel = std::distance(view_type_items.begin(),
+                                        std::find(view_type_items.begin(), view_type_items.end(), EViewType::FeatureType));
+        set_view_type(EViewType::FeatureType);
     }
+
     BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(": finished");
 }
 
diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp
index 0c1cdad36c..00d15ddadd 100644
--- a/src/slic3r/GUI/GLCanvas3D.cpp
+++ b/src/slic3r/GUI/GLCanvas3D.cpp
@@ -240,6 +240,10 @@ void GLCanvas3D::LayersEditing::show_tooltip_information(const GLCanvas3D& canva
     caption_max += GImGui->Style.WindowPadding.x + imgui.scaled(1);
 
 	float  scale       = canvas.get_scale();
+    #ifdef WIN32
+        int dpi = get_dpi_for_window(wxGetApp().GetTopWindow());
+        scale *= (float) dpi / (float) DPI_DEFAULT;
+    #endif // WIN32
     ImVec2 button_size = ImVec2(25 * scale, 25 * scale); // ORCA: Use exact resolution will prevent blur on icon
     ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 0.0f);
     ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, {0, 0}); // ORCA: Dont add padding
@@ -8869,6 +8873,10 @@ float GLCanvas3D::_show_assembly_tooltip_information(float caption_max, float x,
     caption_max += imgui->calc_text_size(": "sv).x + 35.f;
 
     float  scale       = get_scale();
+    #ifdef WIN32
+        int dpi = get_dpi_for_window(wxGetApp().GetTopWindow());
+        scale *= (float) dpi / (float) DPI_DEFAULT;
+    #endif // WIN32
     ImVec2 button_size = ImVec2(25 * scale, 25 * scale); // ORCA: Use exact resolution will prevent blur on icon
 
     ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 0.0f);
diff --git a/src/slic3r/GUI/GUI.cpp b/src/slic3r/GUI/GUI.cpp
index ce0c24d08a..d133720c7e 100644
--- a/src/slic3r/GUI/GUI.cpp
+++ b/src/slic3r/GUI/GUI.cpp
@@ -108,7 +108,12 @@ void change_opt_value(DynamicPrintConfig& config, const t_config_option_key& opt
 	try{
 
         if (config.def()->get(opt_key)->type == coBools && config.def()->get(opt_key)->nullable) {
-            auto vec_new = std::make_unique<ConfigOptionBoolsNullable>(1, boost::any_cast<unsigned char>(value) );
+            const auto v = boost::any_cast<unsigned char>(value);
+            auto vec_new = std::make_unique<ConfigOptionBoolsNullable>(1, v);
+            if (v == ConfigOptionBoolsNullable::nil_value()) {
+                vec_new->set_at_to_nil(0);
+            }
+
             config.option<ConfigOptionBoolsNullable>(opt_key)->set_at(vec_new.get(), opt_index, 0);
             return;
         }
diff --git a/src/slic3r/GUI/GUI_Factories.cpp b/src/slic3r/GUI/GUI_Factories.cpp
index 7686356bfb..e7520b5b51 100644
--- a/src/slic3r/GUI/GUI_Factories.cpp
+++ b/src/slic3r/GUI/GUI_Factories.cpp
@@ -533,7 +533,7 @@ wxMenu* MenuFactory::append_submenu_add_generic(wxMenu* menu, ModelVolumeType ty
 wxMenu* MenuFactory::append_submenu_add_handy_model(wxMenu* menu, ModelVolumeType type) {
     auto sub_menu = new wxMenu;
 
-    for (auto &item : {L("Orca Cube"), L("Orca Tolerance Test"), L("3DBenchy"), L("Autodesk FDM Test"),
+    for (auto &item : {L("Orca Cube"), L("Orca Tolerance Test"), L("3DBenchy"), L("Cali Cat"), L("Autodesk FDM Test"),
                        L("Voron Cube"), L("Stanford Bunny"), L("Orca String Hell") }) {
         append_menu_item(
             sub_menu, wxID_ANY, _(item), "",
@@ -547,6 +547,8 @@ wxMenu* MenuFactory::append_submenu_add_handy_model(wxMenu* menu, ModelVolumeTyp
                     file_name = "OrcaToleranceTest.stl";
                 else if (file_name == L("3DBenchy"))
                     file_name = "3DBenchy.3mf";
+                else if (file_name == L("Cali Cat"))
+                    file_name = "calicat.stl";
                 else if (file_name == L("Autodesk FDM Test"))
                     file_name = "ksr_fdmtest_v4.3mf";
                 else if (file_name == L("Voron Cube"))
@@ -751,8 +753,14 @@ wxMenuItem* MenuFactory::append_menu_item_change_type(wxMenu* menu)
     return append_menu_item(menu, wxID_ANY, _L("Change type"), "",
         [](wxCommandEvent&) { obj_list()->change_part_type(); }, "", menu,
         []() {
-            wxDataViewItem item = obj_list()->GetSelection();
-            return item.IsOk() || obj_list()->GetModel()->GetItemType(item) == itVolume;
+          wxDataViewItemArray selections;
+          obj_list()->GetSelections(selections);
+          if (selections.empty()) return false;
+          for (const auto& it : selections) {
+            if (!(obj_list()->GetModel()->GetItemType(it) & itVolume))
+              return false; // non-volume present -> disable
+          }
+          return true;
         }, m_parent);
 }
 
@@ -864,14 +872,14 @@ void MenuFactory::append_menu_item_reload_from_disk(wxMenu* menu)
 
 void MenuFactory::append_menu_item_replace_with_stl(wxMenu *menu)
 {
-    append_menu_item(menu, wxID_ANY, _L("Replace with STL") + dots, _L("Replace the selected part with new STL"),
+    append_menu_item(menu, wxID_ANY, _L("Replace 3D file") + dots, _L("Replace the selected part with a new 3D file"),
         [](wxCommandEvent &) { plater()->replace_with_stl(); }, "", menu,
         []() { return plater()->can_replace_with_stl(); }, m_parent);
 }
 
 void MenuFactory::append_menu_item_replace_all_with_stl(wxMenu *menu)
 {
-    append_menu_item(menu, wxID_ANY, _L("Replace all with STL") + dots, _L("Replace all selected parts with STL from folder"),
+    append_menu_item(menu, wxID_ANY, _L("Replace all with 3D files") + dots, _L("Replace all selected parts with 3D files from folder"),
         [](wxCommandEvent &) { plater()->replace_all_with_stl(); }, "", menu,
         []() { return plater()->can_replace_all_with_stl(); }, m_parent);
 }
@@ -1798,6 +1806,7 @@ wxMenu* MenuFactory::multi_selection_menu()
         }
         append_menu_item_per_object_process(menu);
         menu->AppendSeparator();
+        append_menu_item_change_type(menu);
         append_menu_item_change_filament(menu);
     }
     return menu;
diff --git a/src/slic3r/GUI/GUI_ObjectList.cpp b/src/slic3r/GUI/GUI_ObjectList.cpp
index 5b5e0bd77a..1cea62ece8 100644
--- a/src/slic3r/GUI/GUI_ObjectList.cpp
+++ b/src/slic3r/GUI/GUI_ObjectList.cpp
@@ -24,6 +24,10 @@
 #include "SingleChoiceDialog.hpp"
 #include "StepMeshDialog.hpp"
 
+
+#include <vector>
+#include <unordered_map>
+#include <functional>
 #include <boost/algorithm/string.hpp>
 #include <wx/progdlg.h>
 #include <wx/listbook.h>
@@ -5337,26 +5341,32 @@ ModelVolume* ObjectList::get_selected_model_volume()
 
 void ObjectList::change_part_type()
 {
-    ModelVolume* volume = get_selected_model_volume();
-    if (!volume)
-        return;
+  wxDataViewItemArray selections;
+  GetSelections(selections);
 
-    const int obj_idx = get_selected_obj_idx();
-    if (obj_idx < 0) return;
+  if (selections.size() <= 1) {
+    int obj_idx = get_selected_obj_idx();
+    if (obj_idx < 0) {
+      return;
+    }
+
+    ModelVolume* volume = get_selected_model_volume();
+    if (!volume) {
+      return;
+    }
 
     const ModelVolumeType type = volume->type();
-    if (type == ModelVolumeType::MODEL_PART)
-    {
-        int model_part_cnt = 0;
-        for (auto vol : (*m_objects)[obj_idx]->volumes) {
-            if (vol->type() == ModelVolumeType::MODEL_PART)
-                ++model_part_cnt;
-        }
+    if (type == ModelVolumeType::MODEL_PART) {
+      int model_part_cnt = 0;
+      for (auto vol : (*m_objects)[obj_idx]->volumes) {
+        if (vol->type() == ModelVolumeType::MODEL_PART)
+          ++model_part_cnt;
+      }
 
-        if (model_part_cnt == 1) {
-            Slic3r::GUI::show_error(nullptr, _(L("The type of the last solid object part is not to be changed.")));
-            return;
-        }
+      if (model_part_cnt == 1) {
+        Slic3r::GUI::show_error(nullptr, _(L("The type of the last solid object part is not to be changed.")));
+        return;
+      }
     }
 
     // ORCA: Fix crash when changing type of svg / text modifier
@@ -5365,22 +5375,165 @@ void ObjectList::change_part_type()
     names.Add(_L("Negative Part"));
     names.Add(_L("Modifier"));
     if (!volume->is_svg() && !volume->is_text()) {
-        names.Add(_L("Support Blocker"));
-        names.Add(_L("Support Enforcer"));
+      names.Add(_L("Support Blocker"));
+      names.Add(_L("Support Enforcer"));
     }
 
     SingleChoiceDialog dlg(_L("Type:"), _L("Choose part type"), names, int(type));
     auto new_type = ModelVolumeType(dlg.GetSingleChoiceIndex());
 
-	if (new_type == type || new_type == ModelVolumeType::INVALID)
-        return;
+    if (new_type == type || new_type == ModelVolumeType::INVALID) {
+      return;
+    }
 
     take_snapshot("Change part type");
 
     volume->set_type(new_type);
     wxDataViewItemArray sel = reorder_volumes_and_get_selection(obj_idx, [volume](const ModelVolume* vol) { return vol == volume; });
-    if (!sel.IsEmpty())
-        select_item(sel.front());
+    if (!sel.IsEmpty()) {
+      select_item(sel.front());
+    }
+    
+  return;
+  }
+
+  // --- Multi Selection ---
+  struct Target { int obj_idx; Slic3r::ModelVolume* vol; };
+  std::vector<Target> targets;
+  targets.reserve(selections.size());
+  bool any_text_or_svg = false;
+
+  for (const auto& item : selections) {
+    auto typeMask = m_objects_model->GetItemType(item);
+    if (!(typeMask & itVolume)) {
+      continue;
+    }
+
+    int obj_idx = -1, vol_idx = -1;
+    get_selected_item_indexes(obj_idx, vol_idx, item);
+    if (obj_idx < 0 || vol_idx < 0) {
+      continue;
+    }
+
+    ModelVolume* vol = (*m_objects)[obj_idx]->volumes[vol_idx];
+    if (!vol) {
+      continue;
+    }
+
+    targets.push_back({ obj_idx, vol });
+    if (vol->is_svg() || vol->is_text())
+      any_text_or_svg = true;
+  }
+  
+  if (targets.empty()) {
+    return;
+  }
+
+  wxArrayString names;
+  names.Add(_L("Part"));
+  names.Add(_L("Negative Part"));
+  names.Add(_L("Modifier"));
+  if (!any_text_or_svg) {
+    names.Add(_L("Support Blocker"));
+    names.Add(_L("Support Enforcer"));
+  }
+
+  // Preselect current type of the first selected volume
+  ModelVolumeType initial_type = targets.front().vol->type();
+  SingleChoiceDialog dlg(_L("Type:"), _L("Choose part type"), names, int(initial_type));
+  auto new_type = ModelVolumeType(dlg.GetSingleChoiceIndex());
+  if (new_type == ModelVolumeType::INVALID) {
+    return;
+  }
+
+  if (new_type != ModelVolumeType::MODEL_PART) {
+    // Count initial MODEL_PARTs per object
+    std::unordered_map<int, int> parts_initial;
+    for (const auto& t : targets) {
+      int cnt = 0;
+      for (auto v : (*m_objects)[t.obj_idx]->volumes)
+          if (v->type() == ModelVolumeType::MODEL_PART) ++cnt;
+      parts_initial[t.obj_idx] = cnt;
+    }
+
+    // Count how many selected MODEL_PARTs would be converted away, per object
+    std::unordered_map<int, int> parts_to_remove;
+    for (const auto& t : targets) {
+      if (t.vol->type() == ModelVolumeType::MODEL_PART) {
+        ++parts_to_remove[t.obj_idx];
+      }
+    }
+
+    // If for any object: initial_parts > 0 and removals == initial_parts => would remove all
+    bool would_remove_all_for_any = false;
+    for (const auto& kv : parts_to_remove) {
+      const int obj_idx   = kv.first;
+      const int removing  = kv.second;
+      const int initial   = parts_initial[obj_idx];
+      if (initial > 0 && removing == initial) {
+        would_remove_all_for_any = true;
+        break;
+      }
+    }
+
+    if (would_remove_all_for_any) {
+      Slic3r::GUI::show_error(nullptr, _(L("The type of the last solid object part is not to be changed.")));
+      return;
+    }
+  }
+
+  take_snapshot("Change part type (multi)");
+
+  // Apply changes
+  size_t applied = 0, skipped_same = 0;
+  std::unordered_map<int, std::vector<ModelVolume*>> changed_per_object;
+  for (const auto& t : targets) {
+    const auto current = t.vol->type();
+    if (current == new_type) {
+        ++skipped_same;
+        continue;
+    }
+    t.vol->set_type(new_type);
+    changed_per_object[t.obj_idx].push_back(t.vol);
+    ++applied;
+  }
+
+  if (applied == 0) {
+    // Nothing changed; keep the original selection as-is
+    select_items(selections);
+    return;
+  }
+
+ // Reorder per object and rebuild selection to follow changed volumes 
+  wxDataViewItemArray new_selection;
+  for (const auto& kv : changed_per_object) {
+    const int obj_idx = kv.first;
+    const auto& changed_vols = kv.second;
+    
+    std::unordered_set<const ModelVolume*> changed_set;
+    changed_set.reserve(changed_vols.size());
+    for (const auto* v : changed_vols) {
+      changed_set.insert(v);
+    }
+
+    wxDataViewItemArray sel = reorder_volumes_and_get_selection(
+      obj_idx,
+      [&changed_set](const ModelVolume* v) -> bool {
+        return changed_set.find(v) != changed_set.end();
+      }
+    );
+
+    // Append to new_selection
+    for (const auto& it : sel) new_selection.Add(it);
+  }
+
+  if (!new_selection.IsEmpty()) {
+    select_items(new_selection);
+  } else {
+    select_items(selections);
+  }
+
+  return;
 }
 
 void ObjectList::last_volume_is_deleted(const int obj_idx)
diff --git a/src/slic3r/GUI/GUI_ObjectTableSettings.cpp b/src/slic3r/GUI/GUI_ObjectTableSettings.cpp
index e2085cbd46..11cd00cdc8 100644
--- a/src/slic3r/GUI/GUI_ObjectTableSettings.cpp
+++ b/src/slic3r/GUI/GUI_ObjectTableSettings.cpp
@@ -216,8 +216,8 @@ bool ObjectTableSettings::update_settings_list(bool is_object, bool is_multiple_
         };
 
         auto optgroup = std::make_shared<ConfigOptionsGroup>(m_og->ctrl_parent(), _(cat.first), &m_current_config, false, extra_column);
-        optgroup->label_width = 15;
-        optgroup->sidetext_width = 5;
+        optgroup->label_width    = 20; // ORCA match label width with sidebar
+        optgroup->sidetext_width = Field::def_width_thinner();
         optgroup->set_config_category_and_type(GUI::from_u8(group_category), Preset::TYPE_PRINT);
 
         std::weak_ptr<ConfigOptionsGroup> weak_optgroup(optgroup);
@@ -246,7 +246,7 @@ bool ObjectTableSettings::update_settings_list(bool is_object, bool is_multiple_
         for (auto& opt : cat.second)
         {
             Option option = optgroup->get_option(opt.name);
-            option.opt.width = 18;
+            option.opt.width = Field::def_width_wider(); // ORCA match parameter box width
             if (is_extruders_cat)
                 option.opt.max = wxGetApp().extruders_edited_cnt();
             optgroup->append_single_option_line(option);
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoBrimEars.cpp b/src/slic3r/GUI/Gizmos/GLGizmoBrimEars.cpp
index cda8e1e09c..fdc2e0ab0a 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoBrimEars.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoBrimEars.cpp
@@ -802,6 +802,10 @@ void GLGizmoBrimEars::show_tooltip_information(float x, float y)
     caption_max += m_imgui->calc_text_size(": "sv).x + 35.f;
 
     float  scale       = m_parent.get_scale();
+    #ifdef WIN32
+        int dpi = get_dpi_for_window(wxGetApp().GetTopWindow());
+        scale *= (float) dpi / (float) DPI_DEFAULT;
+    #endif // WIN32
     ImVec2 button_size = ImVec2(25 * scale, 25 * scale); // ORCA: Use exact resolution will prevent blur on icon
     ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 0.0f);
     ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, {0, 0}); // ORCA: Dont add padding
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp b/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp
index e0c24dc87f..efe9a22a40 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp
@@ -224,6 +224,8 @@ GLGizmoCut3D::GLGizmoCut3D(GLCanvas3D& parent, const std::string& icon_filename,
         {"Width"        , _u8L("Width")},
         {"Flap Angle"   , _u8L("Flap Angle")},
         {"Groove Angle" , _u8L("Groove Angle")},
+        {"Cut position" , _u8L("Cut position")}, // ORCA
+        {"Build Volume" , _u8L("Build Volume")}, // ORCA
     };
 
 //    update_connector_shape();
@@ -660,10 +662,11 @@ bool GLGizmoCut3D::render_reset_button(const std::string& label_id, const std::s
     const ImGuiStyle &style = ImGui::GetStyle();
 
     ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, {1, style.ItemSpacing.y});
+    ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 0);       // ORCA match button style
 
     ImGui::PushStyleColor(ImGuiCol_Button, {0.25f, 0.25f, 0.25f, 0.0f});
-    ImGui::PushStyleColor(ImGuiCol_ButtonHovered, {0.4f, 0.4f, 0.4f, 1.0f});
-    ImGui::PushStyleColor(ImGuiCol_ButtonActive, {0.4f, 0.4f, 0.4f, 1.0f});
+    ImGui::PushStyleColor(ImGuiCol_ButtonHovered, {0, 0, 0, 0}); // ORCA match button style
+    ImGui::PushStyleColor(ImGuiCol_ButtonActive,  {0, 0, 0, 0}); // ORCA match button style
 
     const bool revert = m_imgui->button(wxString(ImGui::RevertBtn) + "##" + wxString::FromUTF8(label_id));
 
@@ -672,7 +675,7 @@ bool GLGizmoCut3D::render_reset_button(const std::string& label_id, const std::s
     if (ImGui::IsItemHovered())
         m_imgui->tooltip(tooltip.c_str(), ImGui::GetFontSize() * 20.0f);
 
-    ImGui::PopStyleVar();
+    ImGui::PopStyleVar(2); // ORCA
 
     return revert;
 }
@@ -2254,7 +2257,7 @@ void GLGizmoCut3D::render_connectors_input_window(CutConnectors &connectors, flo
     render_flip_plane_button(m_connectors_editing && connectors.empty());
 
     m_imgui->text(m_labels_map["Type"]);
-    ImGuiWrapper::push_radio_style();
+    ImGuiWrapper::push_radio_style(m_parent.get_scale()); // ORCA
     bool type_changed = render_connect_type_radio_button(CutConnectorType::Plug);
     type_changed     |= render_connect_type_radio_button(CutConnectorType::Dowel);
     type_changed     |= render_connect_type_radio_button(CutConnectorType::Snap);
@@ -2334,18 +2337,14 @@ void GLGizmoCut3D::render_connectors_input_window(CutConnectors &connectors, flo
 
 void GLGizmoCut3D::render_build_size()
 {
-    double              koef     = m_imperial_units ? GizmoObjectManipulation::mm_to_in : 1.0;
-    wxString            unit_str = " " + (m_imperial_units ? _L("in") : _L("mm"));
-            
-    Vec3d    tbb_sz = m_transformed_bounding_box.size();
-    wxString size   =   "X: " + double_to_string(tbb_sz.x() * koef, 2) + unit_str +
-                     ",  Y: " + double_to_string(tbb_sz.y() * koef, 2) + unit_str +
-                     ",  Z: " + double_to_string(tbb_sz.z() * koef, 2) + unit_str;
+    double   koef     = m_imperial_units ? GizmoObjectManipulation::mm_to_in : 1.0;
+    wxString unit_str = m_imperial_units ? _L("in") : _L("mm");
+    Vec3d    tbb_sz   = m_transformed_bounding_box.size() * koef; // ORCA 
 
     ImGui::AlignTextToFramePadding();
     m_imgui->text(_L("Build Volume"));
-    ImGui::SameLine();
-    m_imgui->text_colored(ImGuiWrapper::COL_ORANGE_LIGHT, size);
+    ImGui::SameLine(m_label_width);
+    ImGui::Text("%.2f x %.2f x %.2f %s", tbb_sz.x(), tbb_sz.y(), tbb_sz.z(), unit_str.ToUTF8().data()); // ORCA use regular text color and simplify format
 }
 
 void GLGizmoCut3D::reset_cut_plane()
@@ -2650,8 +2649,8 @@ void GLGizmoCut3D::render_cut_plane_input_window(CutConnectors &connectors, floa
         render_build_size();
 
         ImGui::AlignTextToFramePadding();
-        m_imgui->text(_L("Cut position") + ": ");
-        ImGui::SameLine();
+        m_imgui->text(_L("Cut position"));
+        ImGui::SameLine(m_label_width);
         render_move_center_input(Z);
         ImGui::SameLine();
 
@@ -2933,6 +2932,10 @@ void GLGizmoCut3D::show_tooltip_information(float x, float y)
     caption_max += m_imgui->calc_text_size(std::string_view{": "}).x + 35.f;
 
     float  scale       = m_parent.get_scale();
+    #ifdef WIN32
+        int dpi = get_dpi_for_window(wxGetApp().GetTopWindow());
+        scale *= (float) dpi / (float) DPI_DEFAULT;
+    #endif // WIN32
     ImVec2 button_size = ImVec2(25 * scale, 25 * scale); // ORCA: Use exact resolution will prevent blur on icon
     ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 0.0f);
     ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, {0, 0}); // ORCA: Dont add padding
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp b/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp
index 094917f6df..41f82a6738 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp
@@ -1535,7 +1535,7 @@ void GLGizmoEmboss::draw_text_input()
         float width = ImGui::GetContentRegionAvailWidth();
         const ImVec2& padding = style.FramePadding;
         ImVec2 icon_pos(width - m_gui_cfg->icon_width - scrollbar_width + padding.x, 
-                        cursor.y - m_gui_cfg->icon_width - scrollbar_height - 2*padding.y);
+                        cursor.y - 2 * m_gui_cfg->icon_width - scrollbar_height - 2*padding.y);  // ORCA fix vertical position
         
         ImGui::SetCursorPos(icon_pos);
         draw(get_icon(m_icons, IconType::exclamation, IconState::hovered));
@@ -1646,7 +1646,7 @@ void GLGizmoEmboss::draw_font_list_line()
     bool exist_change_in_font = m_style_manager.is_font_changed();
     const std::string& font_text = m_gui_cfg->translations.font;
     if (exist_change_in_font || !exist_stored_style)
-        ImGuiWrapper::text_colored(ImGuiWrapper::COL_ORCA, font_text);
+        ImGuiWrapper::text_colored(ImGuiWrapper::COL_MODIFIED, font_text); // ORCA match color
     else
         ImGuiWrapper::text(font_text);
 
@@ -1673,7 +1673,8 @@ void GLGizmoEmboss::draw_font_list_line()
     EmbossStyle &style = m_style_manager.get_style();
     if (exist_change_in_font) {
         ImGui::SameLine(ImGui::GetStyle().WindowPadding.x);
-        if (draw_button(m_icons, IconType::undo)) {
+        auto r_icon = get_icon(m_icons, IconType::undo, IconState::hovered);
+        if (Slic3r::GUI::button(r_icon, r_icon, r_icon)) { // ORCA draw bottom with same orange color
             const EmbossStyle *stored_style = m_style_manager.get_stored_style();
 
             style.path          = stored_style->path;
@@ -1848,7 +1849,7 @@ void GLGizmoEmboss::draw_model_type()
     ModelVolumeType type = m_volume->type();
 
     //TRN EmbossOperation
-    ImGuiWrapper::push_radio_style();
+    ImGuiWrapper::push_radio_style(m_parent.get_scale()); // ORCA
     if (ImGui::RadioButton(_u8L("Join").c_str(), type == part))
         new_type = part;
     else if (ImGui::IsItemHovered())
@@ -2405,7 +2406,7 @@ bool GLGizmoEmboss::revertible(const std::string &name,
     ImGui::AlignTextToFramePadding();
     bool changed = exist_change(value, default_value);
     if (changed || default_value == nullptr)
-        ImGuiWrapper::text_colored(ImGuiWrapper::COL_ORCA, name);
+        ImGuiWrapper::text_colored(ImGuiWrapper::COL_MODIFIED, name); // ORCA Match color
     else
         ImGuiWrapper::text(name);
 
@@ -2414,7 +2415,8 @@ bool GLGizmoEmboss::revertible(const std::string &name,
         ImGuiWindow *window = ImGui::GetCurrentWindow();
         float prev_x = window->DC.CursorPosPrevLine.x;
         ImGui::SameLine(undo_offset); // change cursor postion
-        if (draw_button(m_icons, IconType::undo)) {
+        auto r_icon = get_icon(m_icons, IconType::undo, IconState::hovered);
+        if (Slic3r::GUI::button(r_icon, r_icon, r_icon)) { // ORCA draw bottom with same orange color
             value = *default_value;
 
             // !! Fix to detect change of value after revert of float-slider
@@ -2717,7 +2719,8 @@ void GLGizmoEmboss::draw_advanced()
         else if (draw_button(icons, IconType::align_horizontal_right)) { align.first=FontProp::HorizontalAlign::right; is_change = true; }
         else if (ImGui::IsItemHovered()) m_imgui->tooltip(_CTX_utf8(L_CONTEXT("Right", "Alignment"), "Alignment"), m_gui_cfg->max_tooltip_width);
 
-        ImGui::SameLine();
+        ImGui::SameLine(0, ImGui::GetStyle().ItemSpacing.x * 2.f); // ORCA use wider spacing for separation between horizontal / vertical alignment
+
         if (align.second==FontProp::VerticalAlign::top) draw(get_icon(icons, IconType::align_vertical_top, IconState::hovered));
         else if (draw_button(icons, IconType::align_vertical_top)) { align.second=FontProp::VerticalAlign::top; is_change = true; }
         else if (ImGui::IsItemHovered()) m_imgui->tooltip(_CTX_utf8(L_CONTEXT("Top", "Alignment"), "Alignment"), m_gui_cfg->max_tooltip_width);
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp b/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp
index f216c444a3..02f1b4be5f 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp
@@ -479,6 +479,10 @@ void GLGizmoFdmSupports::show_tooltip_information(float caption_max, float x, fl
     caption_max += m_imgui->calc_text_size(std::string_view{": "}).x + 15.f;
 
     float  scale       = m_parent.get_scale();
+    #ifdef WIN32
+        int dpi = get_dpi_for_window(wxGetApp().GetTopWindow());
+        scale *= (float) dpi / (float) DPI_DEFAULT;
+    #endif // WIN32
     ImVec2 button_size = ImVec2(25 * scale, 25 * scale); // ORCA: Use exact resolution will prevent blur on icon
     ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 0.0f);
     ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, {0, 0}); // ORCA: Dont add padding
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoFuzzySkin.cpp b/src/slic3r/GUI/Gizmos/GLGizmoFuzzySkin.cpp
index bc7e72ab18..054fed1b9c 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoFuzzySkin.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoFuzzySkin.cpp
@@ -88,6 +88,10 @@ void GLGizmoFuzzySkin::show_tooltip_information(float caption_max, float x, floa
     caption_max += m_imgui->calc_text_size(std::string_view{": "}).x + 15.f;
 
     float  scale       = m_parent.get_scale();
+    #ifdef WIN32
+        int dpi = get_dpi_for_window(wxGetApp().GetTopWindow());
+        scale *= (float) dpi / (float) DPI_DEFAULT;
+    #endif // WIN32
     ImVec2 button_size = ImVec2(25 * scale, 25 * scale); // ORCA: Use exact resolution will prevent blur on icon
     ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 0.0f);
     ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, {0, 0}); // ORCA: Dont add padding
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp b/src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp
index a6be7afee6..233e4d941b 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp
@@ -2231,6 +2231,10 @@ void GLGizmoMeasure::show_tooltip_information(float caption_max, float x, float
     caption_max += m_imgui->calc_text_size(": "sv).x + 35.f;
 
     float  scale       = m_parent.get_scale();
+    #ifdef WIN32
+        int dpi = get_dpi_for_window(wxGetApp().GetTopWindow());
+        scale *= (float) dpi / (float) DPI_DEFAULT;
+    #endif // WIN32
     ImVec2 button_size = ImVec2(25 * scale, 25 * scale); // ORCA: Use exact resolution will prevent blur on icon
     ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 0.0f);
     ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, { 0, 0 }); // ORCA: Dont add padding
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp b/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp
index 8211cb5aa8..0c21a3ade6 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp
@@ -287,6 +287,10 @@ void GLGizmoMmuSegmentation::show_tooltip_information(float caption_max, float x
     caption_max += m_imgui->calc_text_size(std::string_view{": "}).x + 15.f;
 
     float  scale       = m_parent.get_scale();
+    #ifdef WIN32
+        int dpi = get_dpi_for_window(wxGetApp().GetTopWindow());
+        scale *= (float) dpi / (float) DPI_DEFAULT;
+    #endif // WIN32
     ImVec2 button_size = ImVec2(25 * scale, 25 * scale); // ORCA: Use exact resolution will prevent blur on icon
     ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 0.0f);
     ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, {0, 0}); // ORCA: Dont add padding
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSVG.cpp b/src/slic3r/GUI/Gizmos/GLGizmoSVG.cpp
index e5f9988351..ebfc84ba65 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoSVG.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoSVG.cpp
@@ -436,7 +436,8 @@ bool reset_button(const IconManager::VIcons &icons)
     //btn_label += ImGui::RevertButton;
     //return ImGui::Button((btn_label + "##" + label_id).c_str());
 
-    return draw_clickable(icons, IconType::reset_value);
+    auto icon = get_icon(icons, IconType::reset_value, IconState::hovered);
+    return clickable(icon, icon); // ORCA use orange color for both states
 }
 
 } // namespace 
@@ -1666,7 +1667,9 @@ void GLGizmoSVG::draw_depth()
 void GLGizmoSVG::draw_size() 
 {
     ImGui::AlignTextToFramePadding();
-    ImGuiWrapper::text(m_gui_cfg->translations.size);
+    bool can_reset = m_scale_width.has_value() || m_scale_height.has_value();
+    ImVec4 text_color = can_reset ? ImGuiWrapper::COL_MODIFIED : ImGui::GetStyleColorVec4(ImGuiCol_Text); // ORCA use modified color on text
+    ImGuiWrapper::text_colored(text_color, m_gui_cfg->translations.size);
     if (ImGui::IsItemHovered()){
         size_t count_points = 0;
         for (const auto &s : m_volume_shape.shapes_with_ids)
@@ -1770,7 +1773,7 @@ void GLGizmoSVG::draw_size()
     
 
     // reset button
-    bool can_reset = m_scale_width.has_value() || m_scale_height.has_value();
+    //bool can_reset = m_scale_width.has_value() || m_scale_height.has_value(); // ORCA update variable above if condition change
     if (can_reset) {
         if (reset_button(m_icons)) {
             new_relative_scale = Vec3d(1./m_scale_width.value_or(1.f), 1./m_scale_height.value_or(1.f), 1.);
@@ -1838,7 +1841,8 @@ void GLGizmoSVG::draw_distance()
     ScopeGuard sg([imgui = m_imgui]() { imgui->disabled_end(); });
 
     ImGui::AlignTextToFramePadding();
-    ImGuiWrapper::text(m_gui_cfg->translations.distance);
+    ImVec4 text_color = m_distance.has_value() ? ImGuiWrapper::COL_MODIFIED : ImGui::GetStyleColorVec4(ImGuiCol_Text); // ORCA use modified color on text
+    ImGuiWrapper::text_colored(text_color, m_gui_cfg->translations.distance);
     ImGui::SameLine(m_gui_cfg->input_offset);
     ImGui::SetNextItemWidth(m_gui_cfg->input_width);
 
@@ -1881,7 +1885,8 @@ void GLGizmoSVG::draw_distance()
 void GLGizmoSVG::draw_rotation()
 {
     ImGui::AlignTextToFramePadding();
-    ImGuiWrapper::text(m_gui_cfg->translations.rotation);
+    ImVec4 text_color = m_angle.has_value() ? ImGuiWrapper::COL_MODIFIED : ImGui::GetStyleColorVec4(ImGuiCol_Text); // ORCA use modified color on text
+    ImGuiWrapper::text_colored(text_color, m_gui_cfg->translations.rotation);
     ImGui::SameLine(m_gui_cfg->input_offset);
     ImGui::SetNextItemWidth(m_gui_cfg->input_width);
 
@@ -2001,7 +2006,7 @@ void GLGizmoSVG::draw_model_type()
     ModelVolumeType type = m_volume->type();
 
     //TRN EmbossOperation
-    ImGuiWrapper::push_radio_style();
+    ImGuiWrapper::push_radio_style(m_parent.get_scale()); //ORCA
     if (ImGui::RadioButton(_u8L("Join").c_str(), type == part))
         new_type = part;
     else if (ImGui::IsItemHovered())
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp b/src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp
index 6a8317e132..9a42bc2585 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp
@@ -109,6 +109,10 @@ void GLGizmoSeam::show_tooltip_information(float caption_max, float x, float y)
     caption_max += m_imgui->calc_text_size(std::string_view{": "}).x + 35.f;
 
     float  scale       = m_parent.get_scale();
+    #ifdef WIN32
+        int dpi = get_dpi_for_window(wxGetApp().GetTopWindow());
+        scale *= (float) dpi / (float) DPI_DEFAULT;
+    #endif // WIN32
     ImVec2 button_size = ImVec2(25 * scale, 25 * scale); // ORCA: Use exact resolution will prevent blur on icon
     ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 0.0f);
     ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, {0, 0}); // ORCA: Dont add padding
diff --git a/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp b/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp
index 4ac3d56a0c..04e65fc88a 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp
@@ -251,22 +251,22 @@ bool GLGizmosManager::init_icon_textures()
     ImTextureID texture_id;
 
     icon_list.clear();
-    if (IMTexture::load_from_svg_file(Slic3r::resources_dir() + "/images/toolbar_reset.svg", 14, 14, texture_id))
+    if (IMTexture::load_from_svg_file(Slic3r::resources_dir() + "/images/toolbar_reset.svg", 16, 16, texture_id))
         icon_list.insert(std::make_pair((int)IC_TOOLBAR_RESET, texture_id));
     else
         return false;
 
-    if (IMTexture::load_from_svg_file(Slic3r::resources_dir() + "/images/toolbar_reset_hover.svg", 14, 14, texture_id))
+    if (IMTexture::load_from_svg_file(Slic3r::resources_dir() + "/images/toolbar_reset_hover.svg", 16, 16, texture_id))
         icon_list.insert(std::make_pair((int)IC_TOOLBAR_RESET_HOVER, texture_id));
     else
         return false;
 
-    if (IMTexture::load_from_svg_file(Slic3r::resources_dir() + "/images/toolbar_reset_zero.svg", 14, 14, texture_id))
+    if (IMTexture::load_from_svg_file(Slic3r::resources_dir() + "/images/toolbar_reset_zero.svg", 16, 16, texture_id))
         icon_list.insert(std::make_pair((int) IC_TOOLBAR_RESET_ZERO, texture_id));
     else
         return false;
 
-    if (IMTexture::load_from_svg_file(Slic3r::resources_dir() + "/images/toolbar_reset_zero_hover.svg", 14, 14, texture_id))
+    if (IMTexture::load_from_svg_file(Slic3r::resources_dir() + "/images/toolbar_reset_zero_hover.svg", 16, 16, texture_id))
         icon_list.insert(std::make_pair((int) IC_TOOLBAR_RESET_ZERO_HOVER, texture_id));
     else
         return false;
diff --git a/src/slic3r/GUI/Gizmos/GizmoObjectManipulation.cpp b/src/slic3r/GUI/Gizmos/GizmoObjectManipulation.cpp
index 41b3816a8c..cbf7e4d6ab 100644
--- a/src/slic3r/GUI/Gizmos/GizmoObjectManipulation.cpp
+++ b/src/slic3r/GUI/Gizmos/GizmoObjectManipulation.cpp
@@ -644,8 +644,12 @@ bool GizmoObjectManipulation::reset_button(ImGuiWrapper *imgui_wrapper, float ca
     ImTextureID normal_id = m_glcanvas.get_gizmos_manager().get_icon_texture_id(GLGizmosManager::MENU_ICON_NAME::IC_TOOLBAR_RESET);
     ImTextureID hover_id  = m_glcanvas.get_gizmos_manager().get_icon_texture_id(GLGizmosManager::MENU_ICON_NAME::IC_TOOLBAR_RESET_HOVER);
 
-    float font_size = ImGui::GetFontSize();
-    ImVec2 button_size = ImVec2(font_size, font_size);
+    float  scale       = m_glcanvas.get_scale();
+    #ifdef WIN32
+        int dpi = get_dpi_for_window(wxGetApp().GetTopWindow());
+        scale *= (float) dpi / (float) DPI_DEFAULT;
+    #endif // WIN32
+    ImVec2 button_size = ImVec2(16 * scale, 16 * scale); // ORCA: Use exact resolution will prevent blur on icon
 
     ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 0.0f);
 
@@ -661,8 +665,12 @@ bool GizmoObjectManipulation::reset_zero_button(ImGuiWrapper *imgui_wrapper, flo
     ImTextureID normal_id = m_glcanvas.get_gizmos_manager().get_icon_texture_id(GLGizmosManager::MENU_ICON_NAME::IC_TOOLBAR_RESET_ZERO);
     ImTextureID hover_id  = m_glcanvas.get_gizmos_manager().get_icon_texture_id(GLGizmosManager::MENU_ICON_NAME::IC_TOOLBAR_RESET_ZERO_HOVER);
 
-    float  font_size   = ImGui::GetFontSize() * 1.1;
-    ImVec2 button_size = ImVec2(font_size, font_size);
+    float  scale       = m_glcanvas.get_scale();
+    #ifdef WIN32
+        int dpi = get_dpi_for_window(wxGetApp().GetTopWindow());
+        scale *= (float) dpi / (float) DPI_DEFAULT;
+    #endif // WIN32
+    ImVec2 button_size = ImVec2(16 * scale, 16 * scale); // ORCA: Use exact resolution will prevent blur on icon
 
     ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 0.0f);
 
@@ -719,6 +727,10 @@ void GizmoObjectManipulation::show_move_tooltip_information(ImGuiWrapper *imgui_
     caption_max += imgui_wrapper->calc_text_size(": "sv).x + 35.f;
 
     float  scale       = m_glcanvas.get_scale();
+    #ifdef WIN32
+        int dpi = get_dpi_for_window(wxGetApp().GetTopWindow());
+        scale *= (float) dpi / (float) DPI_DEFAULT;
+    #endif // WIN32
     ImVec2 button_size = ImVec2(25 * scale, 25 * scale); // ORCA: Use exact resolution will prevent blur on icon
     ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 0.0f);
     ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, {0, ImGui::GetStyle().FramePadding.y});
@@ -747,6 +759,10 @@ void GizmoObjectManipulation::show_rotate_tooltip_information(ImGuiWrapper *imgu
     caption_max += imgui_wrapper->calc_text_size(": "sv).x + 35.f;
 
     float  scale       = m_glcanvas.get_scale();
+    #ifdef WIN32
+        int dpi = get_dpi_for_window(wxGetApp().GetTopWindow());
+        scale *= (float) dpi / (float) DPI_DEFAULT;
+    #endif // WIN32
     ImVec2 button_size = ImVec2(25 * scale, 25 * scale); // ORCA: Use exact resolution will prevent blur on icon
     ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 0.0f);
     ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, {0, ImGui::GetStyle().FramePadding.y});
@@ -775,6 +791,10 @@ void GizmoObjectManipulation::show_scale_tooltip_information(ImGuiWrapper *imgui
     caption_max += imgui_wrapper->calc_text_size(": "sv).x + 35.f;
 
     float  scale       = m_glcanvas.get_scale();
+    #ifdef WIN32
+        int dpi = get_dpi_for_window(wxGetApp().GetTopWindow());
+        scale *= (float) dpi / (float) DPI_DEFAULT;
+    #endif // WIN32
     ImVec2 button_size = ImVec2(25 * scale, 25 * scale); // ORCA: Use exact resolution will prevent blur on icon
     ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 0.0f);
     ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, {0, ImGui::GetStyle().FramePadding.y});
diff --git a/src/slic3r/GUI/ImGuiWrapper.cpp b/src/slic3r/GUI/ImGuiWrapper.cpp
index a0cdc558b2..f4a7adfd22 100644
--- a/src/slic3r/GUI/ImGuiWrapper.cpp
+++ b/src/slic3r/GUI/ImGuiWrapper.cpp
@@ -181,6 +181,7 @@ const ImVec4 ImGuiWrapper::COL_WINDOW_BG_DARK    = { 45 / 255.f, 45 / 255.f, 49
 const ImVec4 ImGuiWrapper::COL_TOOLBAR_BG        = { 250 / 255.f, 250 / 255.f, 250 / 255.f, 1.f }; // ORCA color matches with toolbar_background.png
 const ImVec4 ImGuiWrapper::COL_TOOLBAR_BG_DARK   = { 57  / 255.f, 60  / 255.f, 66  / 255.f, 1.f }; // ORCA color matches with toolbar_background_dark.png
 const ImVec4 ImGuiWrapper::COL_ORCA              = to_ImVec4(ColorRGBA::ORCA());
+const ImVec4 ImGuiWrapper::COL_MODIFIED          = { 253.f / 255.f, 111.f / 255.f, 40.f / 255.f, 1}; // ORCA same color with m_color_label_modified
 
 int ImGuiWrapper::TOOLBAR_WINDOW_FLAGS = ImGuiWindowFlags_AlwaysAutoResize
                                  | ImGuiWindowFlags_NoMove
@@ -1111,11 +1112,12 @@ bool ImGuiWrapper::slider_float(const char* label, float* v, float v_min, float
     const ImGuiStyle& style = ImGui::GetStyle();
     if (show_edit_btn) {
         ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, { 1, style.ItemSpacing.y });
+        ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 0);        // ORCA match edit button style
         ImGui::SameLine();
         std::wstring btn_name = ImGui::SliderFloatEditBtnIcon + boost::nowide::widen(str_label);
         ImGui::PushStyleColor(ImGuiCol_Button, { 0.25f, 0.25f, 0.25f, 0.0f });
-        ImGui::PushStyleColor(ImGuiCol_ButtonHovered, { 0.5f, 0.5f, 0.5f, 1.0f });
-        ImGui::PushStyleColor(ImGuiCol_ButtonActive, { 0.5f, 0.5f, 0.5f, 1.0f });
+        ImGui::PushStyleColor(ImGuiCol_ButtonHovered, {0, 0, 0, 0 }); // ORCA match edit button style
+        ImGui::PushStyleColor(ImGuiCol_ButtonActive,  {0, 0, 0, 0 }); // ORCA match edit button style
         if (ImGui::Button(into_u8(btn_name).c_str())) {
             ImGui::SetKeyboardFocusHere(-1);
             this->set_requires_extra_frame();
@@ -1124,7 +1126,7 @@ bool ImGuiWrapper::slider_float(const char* label, float* v, float v_min, float
         if (ImGui::IsItemHovered())
             this->tooltip(into_u8(_L("Edit")).c_str(), max_tooltip_width);
 
-        ImGui::PopStyleVar();
+        ImGui::PopStyleVar(2); // ORCA
     }
 
     if (label_visible) {
@@ -2685,18 +2687,22 @@ void ImGuiWrapper::pop_combo_style()
     ImGui::PopStyleColor(7);
 }
 
-void ImGuiWrapper::push_radio_style()
+void ImGuiWrapper::push_radio_style(const float scale)
 {
+    ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(1.5f, 1.5f) * scale); // ORCA ensure icon size stays consistent
     if (m_is_dark_mode) {
-        ImGui::PushStyleColor(ImGuiCol_CheckMark, to_ImVec4(decode_color_to_float_array("#00675b"))); // ORCA use orca color for radio buttons
+        ImGui::PushStyleColor(ImGuiCol_CheckMark, to_ImVec4(decode_color_to_float_array("#009688"))); // ORCA use orca color for radio buttons
+        ImGui::PushStyleColor(ImGuiCol_Border   , to_ImVec4(decode_color_to_float_array("#949494"))); // ORCA match border color
     } else {
         ImGui::PushStyleColor(ImGuiCol_CheckMark, to_ImVec4(decode_color_to_float_array("#009688"))); // ORCA use orca color for radio buttons
+        ImGui::PushStyleColor(ImGuiCol_Border   , to_ImVec4(decode_color_to_float_array("#7C8282"))); // ORCA match border color
     }
 }
 
 void ImGuiWrapper::pop_radio_style()
 {
-    ImGui::PopStyleColor(1);
+    ImGui::PopStyleColor(2);
+    ImGui::PopStyleVar(1);
 }
 
 void ImGuiWrapper::init_font(bool compress)
diff --git a/src/slic3r/GUI/ImGuiWrapper.hpp b/src/slic3r/GUI/ImGuiWrapper.hpp
index d950ccded2..21ca91013b 100644
--- a/src/slic3r/GUI/ImGuiWrapper.hpp
+++ b/src/slic3r/GUI/ImGuiWrapper.hpp
@@ -347,6 +347,7 @@ public:
     static const ImVec4 COL_SEPARATOR;
     static const ImVec4 COL_SEPARATOR_DARK;
     static const ImVec4 COL_ORCA;
+    static const ImVec4 COL_MODIFIED;
 
     //BBS
     static void on_change_color_mode(bool is_dark);
@@ -364,7 +365,7 @@ public:
     static void pop_button_disable_style();
     static void push_combo_style(const float scale);
     static void pop_combo_style();
-    static void push_radio_style();
+    static void push_radio_style(const float scale);
     static void pop_radio_style();
 
     //BBS
diff --git a/src/slic3r/GUI/ImageDPIFrame.cpp b/src/slic3r/GUI/ImageDPIFrame.cpp
index 06c3f59c3f..2133f18784 100644
--- a/src/slic3r/GUI/ImageDPIFrame.cpp
+++ b/src/slic3r/GUI/ImageDPIFrame.cpp
@@ -29,6 +29,14 @@ ImageDPIFrame::ImageDPIFrame()
 #ifdef __APPLE__
     SetWindowStyleFlag(GetWindowStyleFlag() | wxSTAY_ON_TOP);
 #endif
+
+    // ORCA add border
+    Bind(wxEVT_PAINT, [this](wxPaintEvent& evt) {
+        wxPaintDC dc(this);
+        dc.SetPen(StateColor::darkModeColorFor(wxColour("#DBDBDB")));
+        dc.SetBrush(*wxTRANSPARENT_BRUSH);
+        dc.DrawRoundedRectangle(0, 0, GetSize().x, GetSize().y, 0);
+    });
     
     m_sizer_main           = new wxBoxSizer(wxVERTICAL);
 
diff --git a/src/slic3r/GUI/Jobs/EmbossJob.cpp b/src/slic3r/GUI/Jobs/EmbossJob.cpp
index 032ed288dd..856864d5c1 100644
--- a/src/slic3r/GUI/Jobs/EmbossJob.cpp
+++ b/src/slic3r/GUI/Jobs/EmbossJob.cpp
@@ -427,16 +427,18 @@ void UpdateJob::update_volume(ModelVolume *volume, TriangleMesh &&mesh, const Da
     volume->set_new_unique_id();
     volume->calculate_convex_hull();
 
-    // write data from base into volume
-    base.write(*volume);
-
     GUI_App &app = wxGetApp(); // may be move to input
+
     if (volume->name != base.volume_name) {
-        volume->name = base.volume_name;
+        // write data from base into volume
+        base.write(*volume);
 
         const ObjectList *obj_list = app.obj_list();
         if (obj_list != nullptr)
             update_name_in_list(*obj_list, *volume);
+    } else {
+        // write data from base into volume
+        base.write(*volume);
     }
 
     ModelObject *object = volume->get_object();
diff --git a/src/slic3r/GUI/Jobs/FillBedJob.cpp b/src/slic3r/GUI/Jobs/FillBedJob.cpp
index c1ff0b4584..711228c0bc 100644
--- a/src/slic3r/GUI/Jobs/FillBedJob.cpp
+++ b/src/slic3r/GUI/Jobs/FillBedJob.cpp
@@ -342,7 +342,7 @@ void FillBedJob::finalize(bool canceled, std::exception_ptr &eptr)
         //model_object->ensure_on_bed();
         //BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << ": model_object->ensure_on_bed()";
 
-        if (m_instances && wxGetApp().app_config->get("auto_arrange") == "true") {
+        if (m_instances) {// && wxGetApp().app_config->get("auto_arrange") == "true") {
             m_plater->set_prepare_state(Job::PREPARE_STATE_MENU);
             m_plater->arrange();
         }
diff --git a/src/slic3r/GUI/MultiMachineManagerPage.cpp b/src/slic3r/GUI/MultiMachineManagerPage.cpp
index 11b8ac2d95..3956f89072 100644
--- a/src/slic3r/GUI/MultiMachineManagerPage.cpp
+++ b/src/slic3r/GUI/MultiMachineManagerPage.cpp
@@ -282,29 +282,10 @@ MultiMachineManagerPage::MultiMachineManagerPage(wxWindow* parent)
     );
 
     //edit prints
-    auto m_btn_bg_enable = StateColor(
-        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)
-    );
-
-
-    StateColor clean_bg(std::pair<wxColour, int>(wxColour(255, 255, 255), StateColor::Disabled), std::pair<wxColour, int>(wxColour(206, 206, 206), StateColor::Pressed),
-        std::pair<wxColour, int>(wxColour(238, 238, 238), StateColor::Hovered), std::pair<wxColour, int>(wxColour(255, 255, 255), StateColor::Enabled),
-        std::pair<wxColour, int>(wxColour(255, 255, 255), StateColor::Normal));
-    StateColor clean_bd(std::pair<wxColour, int>(wxColour(144, 144, 144), StateColor::Disabled), std::pair<wxColour, int>(wxColour(38, 46, 48), StateColor::Enabled));
-    StateColor clean_text(std::pair<wxColour, int>(wxColour(144, 144, 144), StateColor::Disabled), std::pair<wxColour, int>(wxColour(38, 46, 48), StateColor::Enabled));
-
     auto sizer_button_printer = new wxBoxSizer(wxHORIZONTAL);
     sizer_button_printer->SetMinSize(wxSize(FromDIP(DEVICE_ITEM_MAX_WIDTH), -1));
     m_button_edit = new Button(m_main_panel, _L("Edit Printers"));
-    m_button_edit->SetBackgroundColor(clean_bg);
-    m_button_edit->SetBorderColor(clean_bd);
-    m_button_edit->SetTextColor(clean_text);
-    m_button_edit->SetFont(Label::Body_12);
-    m_button_edit->SetCornerRadius(6);
-    m_button_edit->SetMinSize(wxSize(FromDIP(90), FromDIP(36)));
-    m_button_edit->SetMaxSize(wxSize(FromDIP(90), FromDIP(36)));
+    m_button_edit->SetStyle(ButtonStyle::Confirm, ButtonType::Window);
 
     m_button_edit->Bind(wxEVT_BUTTON, [this](wxCommandEvent& evt) {
         MultiMachinePickPage dlg;
@@ -405,13 +386,7 @@ MultiMachineManagerPage::MultiMachineManagerPage(wxWindow* parent)
     m_tip_text->Wrap(-1);
 
     m_button_add = new Button(m_main_panel, _L("Add"));
-    m_button_add->SetBackgroundColor(m_btn_bg_enable);
-    m_button_add->SetBorderColor(m_btn_bg_enable);
-    m_button_add->SetTextColor(*wxWHITE);
-    m_button_add->SetFont(Label::Body_12);
-    m_button_add->SetCornerRadius(6);
-    m_button_add->SetMinSize(wxSize(FromDIP(90), FromDIP(36)));
-    m_button_add->SetMaxSize(wxSize(FromDIP(90), FromDIP(36)));
+    m_button_add->SetStyle(ButtonStyle::Confirm, ButtonType::Window);
 
     m_button_add->Bind(wxEVT_BUTTON, [this](wxCommandEvent& evt) {
         MultiMachinePickPage dlg;
diff --git a/src/slic3r/GUI/OAuthDialog.cpp b/src/slic3r/GUI/OAuthDialog.cpp
index eef8fe9b10..40b5216832 100644
--- a/src/slic3r/GUI/OAuthDialog.cpp
+++ b/src/slic3r/GUI/OAuthDialog.cpp
@@ -4,6 +4,7 @@
 #include "Jobs/BoostThreadWorker.hpp"
 #include "Jobs/PlaterWorker.hpp"
 #include "wxExtensions.hpp"
+#include "Widgets/DialogButtons.hpp"
 
 namespace Slic3r {
 namespace GUI {
@@ -20,10 +21,8 @@ OAuthDialog::OAuthDialog(wxWindow* parent, OAuthParams params)
 
     m_worker = std::make_unique<PlaterWorker<BoostThreadWorker>>(this, nullptr, "auth_worker");
 
-    wxStdDialogButtonSizer* btns = this->CreateStdDialogButtonSizer(wxCANCEL);
-    btnCancel                    = static_cast<wxButton*>(this->FindWindowById(wxID_CANCEL, this));
-    wxGetApp().UpdateDarkUI(btnCancel);
-    btnCancel->Bind(wxEVT_BUTTON, &OAuthDialog::on_cancel, this);
+    auto dlg_btns = new DialogButtons(this, {"Cancel"});
+    dlg_btns->GetCANCEL()->Bind(wxEVT_BUTTON, &OAuthDialog::on_cancel, this);
 
     const auto message_sizer = new wxBoxSizer(wxVERTICAL);
     const auto message = new wxStaticText(this, wxID_ANY, _L("Authorizing..."), wxDefaultPosition, wxDefaultSize, 0);
@@ -32,7 +31,7 @@ OAuthDialog::OAuthDialog(wxWindow* parent, OAuthParams params)
 
     const auto topSizer = new wxBoxSizer(wxVERTICAL);
     topSizer->Add(message_sizer, 0, wxEXPAND | wxALL, BORDER_W);
-    topSizer->Add(btns, 0, wxEXPAND | wxALL, BORDER_W);
+    topSizer->Add(dlg_btns, 0, wxEXPAND);
 
     Bind(wxEVT_CLOSE_WINDOW, &OAuthDialog::on_cancel, this);
 
diff --git a/src/slic3r/GUI/OAuthDialog.hpp b/src/slic3r/GUI/OAuthDialog.hpp
index 55164588fb..3301cd9997 100644
--- a/src/slic3r/GUI/OAuthDialog.hpp
+++ b/src/slic3r/GUI/OAuthDialog.hpp
@@ -14,7 +14,6 @@ private:
     OAuthParams _params;
     std::shared_ptr<OAuthResult> _result;
 
-    wxButton*               btnCancel{nullptr};
     std::unique_ptr<Worker> m_worker;
 
     void on_cancel(wxEvent& event);
diff --git a/src/slic3r/GUI/OG_CustomCtrl.cpp b/src/slic3r/GUI/OG_CustomCtrl.cpp
index 8be287fd3d..331d4a5db8 100644
--- a/src/slic3r/GUI/OG_CustomCtrl.cpp
+++ b/src/slic3r/GUI/OG_CustomCtrl.cpp
@@ -53,7 +53,7 @@ OG_CustomCtrl::OG_CustomCtrl(   wxWindow*            parent,
     // BBS: new font
     m_font = Label::Body_14;
     SetFont(m_font);
-    m_em_unit   = em_unit(m_parent);
+    m_em_unit = em_unit(m_parent);
     m_v_gap   = lround(1.2 * m_em_unit);
     m_v_gap2  = lround(0.8 * m_em_unit);
     m_h_gap   = lround(0.2 * m_em_unit);
@@ -597,7 +597,7 @@ void OG_CustomCtrl::msw_rescale()
     SetFont(m_font);
     m_em_unit   = em_unit(m_parent);
     m_v_gap     = lround(1.2 * m_em_unit);
-    m_v_gap2     = lround(0.8 * m_em_unit);
+    m_v_gap2    = lround(0.8 * m_em_unit);
     m_h_gap     = lround(0.2 * m_em_unit);
 
     //m_bmp_mode_sz = create_scaled_bitmap("mode_simple", this, wxOSX ? 10 : 12).GetSize();
@@ -992,7 +992,7 @@ wxPoint OG_CustomCtrl::CtrlLine::draw_act_bmps(wxDC& dc, wxPoint pos, const wxBi
         pos.y += lround((height - get_bitmap_size(bmp_undo).GetHeight()) / 2);
     }
 #endif
-    wxCoord h_pos = pos.x;
+    wxCoord h_pos = pos.x - ctrl->m_h_gap;  // Orca: adjust position to the left
     wxCoord v_pos = pos.y;
 
 #ifndef DISABLE_UNDO_SYS
diff --git a/src/slic3r/GUI/ObjColorDialog.cpp b/src/slic3r/GUI/ObjColorDialog.cpp
index 0c950deb35..6d3b277c03 100644
--- a/src/slic3r/GUI/ObjColorDialog.cpp
+++ b/src/slic3r/GUI/ObjColorDialog.cpp
@@ -12,6 +12,7 @@
 #include "libslic3r/Config.hpp"
 #include "BitmapComboBox.hpp"
 #include "Widgets/ComboBox.hpp"
+#include "Widgets/DialogButtons.hpp"
 #include <wx/sizer.h>
 
 #include "libslic3r/ObjColorUtils.hpp"
@@ -40,12 +41,7 @@ static void update_ui(wxWindow* window)
 
 static const char g_min_cluster_color = 1;
 static const char g_max_color = (int) EnforcerBlockerType::ExtruderMax;
-const  StateColor ok_btn_bg(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));
-const StateColor  ok_btn_disable_bg(std::pair<wxColour, int>(wxColour(205, 201, 201), StateColor::Pressed),
-                                   std::pair<wxColour, int>(wxColour(205, 201, 201), StateColor::Hovered),
-                                   std::pair<wxColour, int>(wxColour(205, 201, 201), StateColor::Normal));
+
 wxBoxSizer* ObjColorDialog::create_btn_sizer(long flags,bool exist_error)
 {
     auto btn_sizer = new wxBoxSizer(wxHORIZONTAL);
@@ -58,7 +54,7 @@ wxBoxSizer* ObjColorDialog::create_btn_sizer(long flags,bool exist_error)
         auto font = tips->GetFont();
         font.SetUnderlined(true);
         tips->SetFont(font);
-        tips->SetForegroundColour(wxColour(0, 174, 100));
+        tips->SetForegroundColour(wxColour("#009687"));
         tips->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent &e) {
             bool is_zh = wxGetApp().app_config->get("language") == "zh_CN";
             if (is_zh) {
@@ -71,79 +67,16 @@ wxBoxSizer* ObjColorDialog::create_btn_sizer(long flags,bool exist_error)
     }
     btn_sizer->AddStretchSpacer();
 
-    StateColor ok_btn_bd(
-        std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal)
-    );
-    StateColor ok_btn_text(
-        std::pair<wxColour, int>(wxColour(255, 255, 254), StateColor::Normal)
-    );
-    StateColor cancel_btn_bg(
-        std::pair<wxColour, int>(wxColour(206, 206, 206), StateColor::Pressed),
-        std::pair<wxColour, int>(wxColour(238, 238, 238), StateColor::Hovered),
-        std::pair<wxColour, int>(wxColour(255, 255, 255), StateColor::Normal)
-    );
-    StateColor cancel_btn_bd_(
-        std::pair<wxColour, int>(wxColour(38, 46, 48), StateColor::Normal)
-    );
-    StateColor cancel_btn_text(
-        std::pair<wxColour, int>(wxColour(38, 46, 48), StateColor::Normal)
-    );
-    StateColor calc_btn_bg(
-        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)
-    );
-    StateColor calc_btn_bd(
-        std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal)
-    );
-    StateColor calc_btn_text(
-        std::pair<wxColour, int>(wxColour(255, 255, 254), StateColor::Normal)
-    );
-    if (flags & wxOK) {
-        Button* ok_btn = new Button(this, _L("OK"));
-        ok_btn->SetMinSize(BTN_SIZE);
-        ok_btn->SetCornerRadius(FromDIP(12));
-        ok_btn->Enable(false);
-        ok_btn->SetBackgroundColor(ok_btn_disable_bg);
-        ok_btn->SetBorderColor(ok_btn_bd);
-        ok_btn->SetTextColor(ok_btn_text);
-        ok_btn->SetFocus();
-        ok_btn->SetId(wxID_OK);
-        btn_sizer->Add(ok_btn, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, BTN_GAP);
-        m_button_list[wxOK] = ok_btn;
-    }
-    if (flags & wxCANCEL) {
-        Button* cancel_btn = new Button(this, _L("Cancel"));
-        cancel_btn->SetMinSize(BTN_SIZE);
-        cancel_btn->SetCornerRadius(FromDIP(12));
-        cancel_btn->SetBackgroundColor(cancel_btn_bg);
-        cancel_btn->SetBorderColor(cancel_btn_bd_);
-        cancel_btn->SetTextColor(cancel_btn_text);
-        cancel_btn->SetId(wxID_CANCEL);
-        btn_sizer->Add(cancel_btn, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, BTN_GAP);
-        m_button_list[wxCANCEL] = cancel_btn;
-    }
+    auto dlg_btns = new DialogButtons(this, {"OK", "Cancel"});
+    m_button_list[wxOK]     = dlg_btns->GetOK();
+    m_button_list[wxCANCEL] = dlg_btns->GetCANCEL();
+
+    btn_sizer->Add(dlg_btns, 0, wxEXPAND | wxALIGN_CENTER_VERTICAL);
     return btn_sizer;
 }
 
 void ObjColorDialog::on_dpi_changed(const wxRect &suggested_rect)
 {
-    for (auto button_item : m_button_list)
-    {
-        if (button_item.first == wxRESET)
-        {
-            button_item.second->SetMinSize(wxSize(FromDIP(75), FromDIP(24)));
-            button_item.second->SetCornerRadius(FromDIP(12));
-        }
-        if (button_item.first == wxOK) {
-            button_item.second->SetMinSize(BTN_SIZE);
-            button_item.second->SetCornerRadius(FromDIP(12));
-        }
-        if (button_item.first == wxCANCEL) {
-            button_item.second->SetMinSize(BTN_SIZE);
-            button_item.second->SetCornerRadius(FromDIP(12));
-        }
-    }
     m_panel_ObjColor->msw_rescale();
     this->Refresh();
 }
@@ -215,12 +148,12 @@ ObjColorDialog::ObjColorDialog(wxWindow *parent, Slic3r::ObjDialogInOut &in_out,
     if (!ok) {
         m_button_list[wxCANCEL]->Hide();
         m_button_list[wxOK]->Enable(true);
-        m_button_list[wxOK]->SetBackgroundColor(ok_btn_bg);
+        // ORCA no need to set colors again
     } else {
         m_button_list[wxOK]->Bind(wxEVT_UPDATE_UI, ([this](wxUpdateUIEvent &e) {
            if (m_panel_ObjColor->is_ok() == m_button_list[wxOK]->IsEnabled()) { return; }
            m_button_list[wxOK]->Enable(m_panel_ObjColor->is_ok());
-           m_button_list[wxOK]->SetBackgroundColor(m_panel_ObjColor->is_ok() ? ok_btn_bg : ok_btn_disable_bg);
+           // ORCA no need to set colors again
          }));
     }
     m_main_sizer->Add(m_buttons_sizer, 0, wxBOTTOM | wxTOP | wxRIGHT | wxEXPAND, BTN_GAP);
@@ -556,23 +489,12 @@ void ObjColorPanel::do_layout_callback() {
 wxBoxSizer *ObjColorPanel::create_approximate_match_btn_sizer(wxWindow *parent)
 {
     auto       btn_sizer = new wxBoxSizer(wxHORIZONTAL);
-    StateColor calc_btn_bg(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));
-    StateColor calc_btn_bd(std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal));
-    StateColor calc_btn_text(std::pair<wxColour, int>(wxColour(255, 255, 254), StateColor::Normal));
-    //create btn
     m_quick_approximate_match_btn = new Button(parent, _L("Color match"));
     m_quick_approximate_match_btn->SetToolTip(_L("Approximate color matching."));
-    auto cur_btn         = m_quick_approximate_match_btn;
-    cur_btn->SetFont(Label::Body_13);
-    cur_btn->SetMinSize(wxSize(FromDIP(60), FromDIP(20)));
-    cur_btn->SetCornerRadius(FromDIP(10));
-    cur_btn->SetBackgroundColor(calc_btn_bg);
-    cur_btn->SetBorderColor(calc_btn_bd);
-    cur_btn->SetTextColor(calc_btn_text);
-    cur_btn->SetFocus();
-    btn_sizer->Add(cur_btn, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, 0);
-    cur_btn->Bind(wxEVT_BUTTON, [this](wxCommandEvent &) {
+    m_quick_approximate_match_btn->SetStyle(ButtonStyle::Regular, ButtonType::Window);
+    m_quick_approximate_match_btn->SetFocus();
+    btn_sizer->Add(m_quick_approximate_match_btn, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, 0);
+    m_quick_approximate_match_btn->Bind(wxEVT_BUTTON, [this](wxCommandEvent &) {
         deal_approximate_match_btn();
         deal_thumbnail();
     });
@@ -582,20 +504,10 @@ wxBoxSizer *ObjColorPanel::create_approximate_match_btn_sizer(wxWindow *parent)
 wxBoxSizer *ObjColorPanel::create_add_btn_sizer(wxWindow *parent)
 {
     auto       btn_sizer = new wxBoxSizer(wxHORIZONTAL);
-    StateColor calc_btn_bg(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));
-    StateColor calc_btn_bd(std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal));
-    StateColor calc_btn_text(std::pair<wxColour, int>(wxColour(255, 255, 254), StateColor::Normal));
-    // create btn
     m_quick_add_btn = new Button(parent, _L("Append"));
     m_quick_add_btn->SetToolTip(_L("Append to existing filaments"));
     auto cur_btn    = m_quick_add_btn;
-    cur_btn->SetFont(Label::Body_13);
-    cur_btn->SetMinSize(wxSize(FromDIP(60), FromDIP(20)));
-    cur_btn->SetCornerRadius(FromDIP(10));
-    cur_btn->SetBackgroundColor(calc_btn_bg);
-    cur_btn->SetBorderColor(calc_btn_bd);
-    cur_btn->SetTextColor(calc_btn_text);
+    cur_btn->SetStyle(ButtonStyle::Regular, ButtonType::Window);
     cur_btn->SetFocus();
     btn_sizer->Add(cur_btn, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, 0);
     cur_btn->Bind(wxEVT_BUTTON, [this](wxCommandEvent &) {
@@ -608,20 +520,10 @@ wxBoxSizer *ObjColorPanel::create_add_btn_sizer(wxWindow *parent)
 wxBoxSizer *ObjColorPanel::create_reset_btn_sizer(wxWindow *parent)
 {
     auto       btn_sizer = new wxBoxSizer(wxHORIZONTAL);
-    StateColor calc_btn_bg(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));
-    StateColor calc_btn_bd(std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal));
-    StateColor calc_btn_text(std::pair<wxColour, int>(wxColour(255, 255, 254), StateColor::Normal));
-    // create btn
     m_quick_reset_btn = new Button(parent, _L("Reset"));
     m_quick_reset_btn->SetToolTip(_L("Reset mapped extruders."));
     auto cur_btn      = m_quick_reset_btn;
-    cur_btn->SetFont(Label::Body_13);
-    cur_btn->SetMinSize(wxSize(FromDIP(60), FromDIP(20)));
-    cur_btn->SetCornerRadius(FromDIP(10));
-    cur_btn->SetBackgroundColor(calc_btn_bg);
-    cur_btn->SetBorderColor(calc_btn_bd);
-    cur_btn->SetTextColor(calc_btn_text);
+    cur_btn->SetStyle(ButtonStyle::Regular, ButtonType::Window);
     cur_btn->SetFocus();
     btn_sizer->Add(cur_btn, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, 0);
     cur_btn->Bind(wxEVT_BUTTON, [this](wxCommandEvent &) {
diff --git a/src/slic3r/GUI/ObjectDataViewModel.cpp b/src/slic3r/GUI/ObjectDataViewModel.cpp
index 14f1e86b44..a7d2f711bf 100644
--- a/src/slic3r/GUI/ObjectDataViewModel.cpp
+++ b/src/slic3r/GUI/ObjectDataViewModel.cpp
@@ -213,7 +213,7 @@ void ObjectDataViewModelNode::set_variable_height_icon(VaryHeightIndicator vari_
     if (m_variable_height == vari_height)
         return;
     m_variable_height = vari_height;
-    m_variable_height_icon = m_variable_height == hiUnVariable ? m_empty_bmp : create_scaled_bitmap("toolbar_variable_layer_height", nullptr, 20);
+    m_variable_height_icon = m_variable_height == hiUnVariable ? m_empty_bmp : create_scaled_bitmap("obj_variable_layer_height");
 }
 
 void ObjectDataViewModelNode::set_action_icon(bool enable)
@@ -311,9 +311,9 @@ void ObjectDataViewModelNode::msw_rescale()
         m_action_icon = create_scaled_bitmap(m_action_icon_name);
 
     if (m_printable != piUndef)
-        m_printable_icon = create_scaled_bitmap(m_printable == piPrintable ? "obj_printable" : "obj_unprintable");
+        m_printable_icon = create_scaled_bitmap(m_printable == piPrintable ? "check_on" : "check_off_focused");
 
-    m_variable_height_icon = m_variable_height == hiUnVariable ? m_empty_bmp : create_scaled_bitmap("toolbar_variable_layer_height", nullptr, 20);
+    m_variable_height_icon = m_variable_height == hiUnVariable ? m_empty_bmp : create_scaled_bitmap("obj_variable_layer_height");
 
     if (!m_opt_categories.empty())
         update_settings_digest_bitmaps();
diff --git a/src/slic3r/GUI/ParamsPanel.cpp b/src/slic3r/GUI/ParamsPanel.cpp
index b130fab16a..fb625a7724 100644
--- a/src/slic3r/GUI/ParamsPanel.cpp
+++ b/src/slic3r/GUI/ParamsPanel.cpp
@@ -129,42 +129,16 @@ wxBoxSizer *TipsDialog::create_item_checkbox(wxString title, wxWindow *parent, w
 Button *TipsDialog::add_button(wxWindowID btn_id, const wxString &label, bool set_focus /*= false*/)
 {
     Button* btn = new Button(this, label, "", 0, 0, btn_id);
-    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));
 
-    StateColor btn_bd_green(std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal));
+    if (btn_id == wxID_OK || btn_id == wxID_YES)
+        btn->SetStyle(ButtonStyle::Confirm, ButtonType::Choice);
 
-    StateColor btn_text_green(std::pair<wxColour, int>(wxColour(255, 255, 254), StateColor::Normal));
-
-    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>(wxColour(255, 255, 255), StateColor::Normal)
-    );
-
-    StateColor btn_bd_white(std::pair<wxColour, int>(wxColour(38, 46, 48), StateColor::Normal));
-
-    StateColor btn_text_white(std::pair<wxColour, int>(wxColour(38, 46, 48), StateColor::Normal));
-
-    if (btn_id == wxID_OK || btn_id == wxID_YES) {
-        btn->SetBackgroundColor(btn_bg_green);
-        btn->SetBorderColor(btn_bd_green);
-        btn->SetTextColor(btn_text_green);
-    }
-
-    if (btn_id == wxID_CANCEL || btn_id == wxID_NO) {
-        btn->SetBackgroundColor(btn_bg_white);
-        btn->SetBorderColor(btn_bd_white);
-        btn->SetTextColor(btn_text_white);
-    }
+    if (btn_id == wxID_CANCEL || btn_id == wxID_NO)
+        btn->SetStyle(ButtonStyle::Regular, ButtonType::Choice);
 
     if (set_focus)
         btn->SetFocus();
 
-    btn->SetSize(TIPS_DIALOG_BUTTON_SIZE);
-    btn->SetMinSize(TIPS_DIALOG_BUTTON_SIZE);
-    btn->SetCornerRadius(FromDIP(12));
     btn->Bind(wxEVT_BUTTON, [this, btn_id](wxCommandEvent &) {
         if (m_show_again) {
             if (!m_app_key.empty()) {
@@ -184,8 +158,7 @@ Button *TipsDialog::add_button(wxWindowID btn_id, const wxString &label, bool se
 
 void TipsDialog::on_dpi_changed(const wxRect &suggested_rect)
 {
-    if (m_confirm) m_confirm->SetMinSize(TIPS_DIALOG_BUTTON_SIZE);
-    if (m_cancel) m_cancel->SetMinSize(TIPS_DIALOG_BUTTON_SIZE);
+    if (m_confirm) m_confirm->Rescale(); // ORCA
     Fit();
     Refresh();
 }
@@ -286,8 +259,16 @@ ParamsPanel::ParamsPanel( wxWindow* parent, wxWindowID id, const wxPoint& pos, c
         m_tips_arrow = new ScalableButton(m_top_panel, wxID_ANY, "tips_arrow");
         m_tips_arrow->Hide();
 
-        m_title_view = new Label(m_top_panel, Label::Body_12, _L("Advance")); // ORCA match size with advanced toggle on tab.cpp m_static_title
+        m_mode_icon = new ScalableButton(m_top_panel, wxID_ANY, "advanced"); // ORCA
+        m_mode_icon->Bind(wxEVT_BUTTON, [this](wxCommandEvent e) {
+            m_mode_view->SetValue(!m_mode_view->GetValue());
+            wxCommandEvent evt(wxEVT_TOGGLEBUTTON, m_mode_view->GetId()); // ParamsPanel::OnToggled(evt)
+            evt.SetEventObject(m_mode_view);
+            m_mode_view->wxEvtHandler::ProcessEvent(evt);
+        });
+        m_mode_icon->SetToolTip(_L("Show/Hide advanced parameters"));
         m_mode_view = new SwitchButton(m_top_panel, wxID_ABOUT);
+        m_mode_view->SetToolTip(_L("Show/Hide advanced parameters"));
 
         // BBS: new layout
         //m_search_btn = new ScalableButton(m_top_panel, wxID_ANY, "search", wxEmptyString, wxDefaultSize, wxDefaultPosition, wxBU_EXACTFIT | wxNO_BORDER, true);
@@ -421,23 +402,16 @@ void ParamsPanel::create_layout()
 
     if (m_top_panel) {
         m_mode_sizer = new wxBoxSizer( wxHORIZONTAL );
-        m_mode_sizer->AddSpacer(FromDIP(SidebarProps::TitlebarMargin()));
-        m_mode_sizer->Add(m_process_icon, 0, wxALIGN_CENTER);
-        m_mode_sizer->AddSpacer(FromDIP(SidebarProps::ElementSpacing()));
-        m_mode_sizer->Add( m_title_label, 0, wxALIGN_CENTER );
-        m_mode_sizer->AddStretchSpacer(2);
-        m_mode_sizer->Add(m_mode_region, 0, wxALIGN_CENTER);
-        m_mode_sizer->AddSpacer(FromDIP(SidebarProps::ElementSpacing()));
-        m_mode_sizer->Add(m_tips_arrow, 0, wxALIGN_CENTER);
-        m_mode_sizer->AddStretchSpacer(12);
-        m_mode_sizer->Add( m_title_view, 0, wxALIGN_CENTER );
-        m_mode_sizer->AddSpacer(FromDIP(SidebarProps::ElementSpacing()));
-        m_mode_sizer->Add(m_mode_view, 0, wxALIGN_CENTER);
-        m_mode_sizer->AddSpacer(FromDIP(SidebarProps::ElementSpacing() * 6)); // ORCA using spacer prevents shaky mode_view when tips_arrow highlighting mode_region instead using AddStretchSpacer
-        m_mode_sizer->Add(m_setting_btn, 0, wxALIGN_CENTER);
-        m_mode_sizer->AddSpacer(FromDIP(SidebarProps::IconSpacing()));
-        m_mode_sizer->Add(m_compare_btn, 0, wxALIGN_CENTER);
-        m_mode_sizer->AddSpacer(FromDIP(SidebarProps::TitlebarMargin()));
+        m_mode_sizer->Add(m_process_icon, 0, wxALIGN_CENTER | wxLEFT , FromDIP(SidebarProps::TitlebarMargin()));
+        m_mode_sizer->Add(m_title_label , 0, wxALIGN_CENTER | wxLEFT , FromDIP(SidebarProps::ElementSpacing()));
+        m_mode_sizer->Add(m_mode_region , 0, wxALIGN_CENTER | wxLEFT , FromDIP(SidebarProps::WideSpacing()));
+        m_mode_sizer->Add(m_tips_arrow  , 0, wxALIGN_CENTER | wxLEFT , FromDIP(SidebarProps::ElementSpacing()));
+        m_mode_sizer->AddSpacer(FromDIP(SidebarProps::IconSpacing())); // ensure there is spacing after control when sidebar has less width
+        m_mode_sizer->AddStretchSpacer();
+        m_mode_sizer->Add(m_mode_icon   , 0, wxALIGN_CENTER | wxRIGHT, FromDIP(SidebarProps::ElementSpacing()));
+        m_mode_sizer->Add(m_mode_view   , 0, wxALIGN_CENTER | wxRIGHT, FromDIP(SidebarProps::WideSpacing()));
+        m_mode_sizer->Add(m_setting_btn , 0, wxALIGN_CENTER | wxRIGHT, FromDIP(SidebarProps::WideSpacing()));
+        m_mode_sizer->Add(m_compare_btn , 0, wxALIGN_CENTER | wxRIGHT, FromDIP(SidebarProps::TitlebarMargin()));
         //m_mode_sizer->Add( m_search_btn, 0, wxALIGN_CENTER );
         //m_mode_sizer->AddSpacer(16);
         m_mode_sizer->SetMinSize(-1, FromDIP(30));
@@ -717,6 +691,7 @@ void ParamsPanel::msw_rescale()
         m_mode_sizer->SetMinSize(-1, 3 * em_unit(this));
     if (m_mode_region)
         ((SwitchButton* )m_mode_region)->Rescale();
+    if (m_mode_icon) m_mode_icon->msw_rescale();
     if (m_mode_view)
         ((SwitchButton* )m_mode_view)->Rescale();
     for (auto tab : {m_tab_print, m_tab_print_plate, m_tab_print_object, m_tab_print_part, m_tab_print_layer, m_tab_filament, m_tab_printer}) {
@@ -818,10 +793,10 @@ void ParamsPanel::delete_subwindows()
         m_mode_view = nullptr;
     }
 
-    if (m_title_view)
+    if (m_mode_icon) // ORCA m_title_view replacement
     {
-        delete m_title_view;
-        m_title_view = nullptr;
+        delete m_mode_icon;
+        m_mode_icon = nullptr;
     }
 
     if (m_search_btn)
diff --git a/src/slic3r/GUI/ParamsPanel.hpp b/src/slic3r/GUI/ParamsPanel.hpp
index b2d2065a39..36ed957cc4 100644
--- a/src/slic3r/GUI/ParamsPanel.hpp
+++ b/src/slic3r/GUI/ParamsPanel.hpp
@@ -34,8 +34,6 @@
 class SwitchButton;
 class StaticBox;
 
-#define TIPS_DIALOG_BUTTON_SIZE wxSize(FromDIP(60), FromDIP(24))
-
 namespace Slic3r {
 namespace GUI {
 
@@ -86,7 +84,7 @@ class ParamsPanel : public wxPanel
         SwitchButton* m_mode_region { nullptr };
         ScalableButton *m_tips_arrow{nullptr};
         bool m_tips_arror_blink{false};
-        wxStaticText* m_title_view { nullptr };
+        ScalableButton* m_mode_icon { nullptr }; // ORCA
         SwitchButton* m_mode_view { nullptr };
         //wxBitmapButton* m_search_button { nullptr };
         wxStaticLine* m_staticline_print { nullptr };
diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp
index 855788f1ff..cc67ee11fd 100644
--- a/src/slic3r/GUI/Plater.cpp
+++ b/src/slic3r/GUI/Plater.cpp
@@ -5,6 +5,7 @@
 #include <cstddef>
 #include <algorithm>
 #include <numeric>
+#include <limits>
 #include <vector>
 #include <string>
 #include <regex>
@@ -219,9 +220,14 @@ wxDEFINE_EVENT(EVT_NOTICE_FULL_SCREEN_CHANGED, IntEvent);
 
 static string get_diameter_string(float diameter)
 {
-    std::ostringstream stream;
-    stream << std::fixed << std::setprecision(1) << diameter;
-    return stream.str();
+    std::ostringstream stream; // ORCA ensure 0.25 returned as 0.25. previous code returned as 0.2 because of std::setprecision(1)
+    stream << std::fixed << std::setprecision(2) << diameter;  // Use 2 decimals to capture 0.25 / 0.15 reliably
+    std::string s = stream.str();
+    if (s.find('.') != std::string::npos) {   // Remove trailing zeros, but keep at least one decimal if needed
+        s.erase(s.find_last_not_of('0') + 1);
+        if (s.back() == '.') s += '0';        // Ensure "1." → "1.0"
+    }
+    return s;
 }
 
 bool Plater::has_illegal_filename_characters(const wxString& wxs_name)
@@ -573,7 +579,9 @@ void Sidebar::priv::layout_printer(bool isBBL, bool isDual)
     // ORCA show plate type combo box only when its supported
     PresetBundle &preset_bundle = *wxGetApp().preset_bundle;
     auto cfg = preset_bundle.printers.get_edited_preset().config;
-    panel_printer_bed->Show(isBBL || cfg.opt_bool("support_multi_bed_types"));
+    // Orca: we use preset_bundle.is_bbl_vendor() instead of isBBL to determine if the plate type combo box should be shown
+    // ref: https://github.com/OrcaSlicer/OrcaSlicer/pull/11610#discussion_r2607411847
+    panel_printer_bed->Show(preset_bundle.is_bbl_vendor() || cfg.opt_bool("support_multi_bed_types"));
 
     extruder_dual_sizer->Show(isDual);
 
@@ -936,7 +944,7 @@ public:
 
         Bind(wxEVT_PAINT, [this](wxPaintEvent& evt) {
                 wxPaintDC dc(this);
-                dc.SetPen(wxColour("#EEEEEE"));
+                dc.SetPen(StateColor::darkModeColorFor(wxColour("#DBDBDB"))); // ORCA match popup border color
                 dc.SetBrush(*wxTRANSPARENT_BRUSH);
                 dc.DrawRoundedRectangle(0, 0, GetSize().x, GetSize().y, 0);
             });
@@ -1229,7 +1237,8 @@ bool Sidebar::priv::switch_diameter(bool single)
     }
     auto preset          = wxGetApp().preset_bundle->get_similar_printer_preset({}, diameter.ToStdString());
     if (preset == nullptr) {
-        MessageDialog dlg(this->plater, "", "");
+        // ORCA add a text. this appears when user tries to change nozzle value but config doesnt have a inherited or compatible preset
+        MessageDialog dlg(this->plater, _L("Configuration incompatible"), _L("Warning"), wxICON_WARNING | wxOK);
         dlg.ShowModal();
         return false;
     }
@@ -1636,8 +1645,8 @@ Sidebar::Sidebar(Plater *parent)
         h_sizer_title->AddSpacer(FromDIP(SidebarProps::ElementSpacing()));
         h_sizer_title->Add(p->m_text_printer_settings, 0, wxALIGN_CENTER);
         h_sizer_title->AddStretchSpacer();
-        h_sizer_title->Add(p->m_printer_connect , 0, wxALIGN_CENTER | wxRIGHT, FromDIP(20)); // used larger margin to prevent accidental clicks
-        h_sizer_title->Add(p->m_printer_bbl_sync, 0, wxALIGN_CENTER | wxRIGHT, FromDIP(20)); // used larger margin to prevent accidental clicks
+        h_sizer_title->Add(p->m_printer_connect , 0, wxALIGN_CENTER | wxRIGHT, FromDIP(SidebarProps::WideSpacing())); // used larger margin to prevent accidental clicks
+        h_sizer_title->Add(p->m_printer_bbl_sync, 0, wxALIGN_CENTER | wxRIGHT, FromDIP(SidebarProps::WideSpacing())); // used larger margin to prevent accidental clicks
         h_sizer_title->Add(p->m_printer_setting, 0, wxALIGN_CENTER);
         h_sizer_title->AddSpacer(FromDIP(SidebarProps::TitlebarMargin()));
         h_sizer_title->SetMinSize(-1, 3 * em);
@@ -1654,10 +1663,7 @@ Sidebar::Sidebar(Plater *parent)
         // add printer title
         scrolled_sizer->Add(p->m_panel_printer_title, 0, wxEXPAND | wxALL, 0);
         p->m_panel_printer_title->Bind(wxEVT_LEFT_UP, [this] (auto & e) {
-            if (p->m_panel_printer_content->GetMaxHeight() == 0)
-                p->m_panel_printer_content->SetMaxSize({-1, -1});
-            else
-                p->m_panel_printer_content->SetMaxSize({-1, 0});
+            p->m_panel_printer_content->Show(!p->m_panel_printer_content->IsShown());
             m_scrolled_sizer->Layout();
         });
 
@@ -1987,16 +1993,7 @@ Sidebar::Sidebar(Plater *parent)
         if (e.GetPosition().x > (p->m_flushing_volume_btn->IsShown()
                 ? p->m_flushing_volume_btn->GetPosition().x : (p->m_bpButton_add_filament->GetPosition().x - FromDIP(30)))) // ORCA exclude area of del button from titlebar collapse/expand feature to fix undesired collapse when user spams del filament button 
             return;
-        if (p->m_panel_filament_content->GetMaxHeight() == 0) {
-            p->m_panel_filament_content->SetMaxSize({-1, FromDIP(174)});
-            auto min_size = p->m_panel_filament_content->GetSizer()->GetMinSize();
-            if (min_size.y > p->m_panel_filament_content->GetMaxHeight())
-                min_size.y = p->m_panel_filament_content->GetMaxHeight();
-            p->m_panel_filament_content->SetMinSize({-1, min_size.y});
-        } else {
-            p->m_panel_filament_content->SetMinSize({-1, 0});
-            p->m_panel_filament_content->SetMaxSize({-1, 0});
-        }
+        p->m_panel_filament_content->Show(!p->m_panel_filament_content->IsShown());
         m_scrolled_sizer->Layout();
     });
 
@@ -2038,7 +2035,7 @@ Sidebar::Sidebar(Plater *parent)
         }));
 
     bSizer39->Add(p->m_flushing_volume_btn, 0, wxALIGN_CENTER_VERTICAL | wxLEFT, FromDIP(4));
-    bSizer39->Hide(p->m_flushing_volume_btn);
+    bSizer39->Hide(p->m_flushing_volume_btn); // ORCA Ensure button is hidden on launch while 1 filament exist
 
     ScalableButton* add_btn = new ScalableButton(p->m_panel_filament_title, wxID_ANY, "add_filament");
     add_btn->SetToolTip(_L("Add one filament"));
@@ -2058,12 +2055,8 @@ Sidebar::Sidebar(Plater *parent)
 
     bSizer39->Add(del_btn, 0, wxALIGN_CENTER | wxLEFT, FromDIP(SidebarProps::IconSpacing()));
     bSizer39->Add(add_btn, 0, wxALIGN_CENTER | wxLEFT, FromDIP(SidebarProps::IconSpacing())); // ORCA Moved add button after delete button to prevent add button position change when remove icon automatically hidden
-    bSizer39->AddSpacer(FromDIP(20));
 
-    if (p->combos_filament.size() <= 1) { // ORCA Fix Flushing button and Delete filament button not hidden on launch while only 1 filament exist
-        bSizer39->Hide(p->m_flushing_volume_btn);
-        //bSizer39->Hide(p->m_bpButton_del_filament); // ORCA: Hide delete filament button if there is only one filament
-    }
+    bSizer39->Hide(p->m_bpButton_del_filament); // ORCA Ensure button is hidden on launch while 1 filament exist
 
     ams_btn = new ScalableButton(p->m_panel_filament_title, wxID_ANY, "ams_fila_sync", wxEmptyString, wxDefaultSize, wxDefaultPosition,
                                                  wxBU_EXACTFIT | wxNO_BORDER, false, 16); // ORCA match icon size with other icons as 16x16
@@ -2075,7 +2068,7 @@ Sidebar::Sidebar(Plater *parent)
     ams_btn->Bind(wxEVT_UPDATE_UI, &Sidebar::update_sync_ams_btn_enable, this);
     p->m_bpButton_ams_filament = ams_btn;
 
-    bSizer39->Add(ams_btn, 0, wxALIGN_CENTER | wxLEFT, FromDIP(SidebarProps::IconSpacing()));
+    bSizer39->Add(ams_btn, 0, wxALIGN_CENTER | wxLEFT, FromDIP(SidebarProps::WideSpacing()));
     //bSizer39->Add(FromDIP(10), 0, 0, 0, 0 );
 
     ScalableButton* set_btn = new ScalableButton(p->m_panel_filament_title, wxID_ANY, "settings");
@@ -2088,7 +2081,7 @@ Sidebar::Sidebar(Plater *parent)
         });
     p->m_bpButton_set_filament = set_btn;
 
-    bSizer39->Add(set_btn, 0, wxALIGN_CENTER | wxLEFT, FromDIP(SidebarProps::IconSpacing()));
+    bSizer39->Add(set_btn, 0, wxALIGN_CENTER | wxLEFT, FromDIP(SidebarProps::WideSpacing()));
     bSizer39->AddSpacer(FromDIP(SidebarProps::TitlebarMargin()));
 
     // add filament content
@@ -2551,9 +2544,18 @@ void Sidebar::update_presets(Preset::Type preset_type)
         p->layout_printer(preset_bundle.use_bbl_network(), isBBL && is_dual_extruder);
         auto diameters = wxGetApp().preset_bundle->printers.diameters_of_selected_printer();
         auto diameter = printer_preset.config.opt_string("printer_variant");
-        auto update_extruder_diameter = [&diameters, &diameter](ExtruderGroup & extruder) {
+        auto update_extruder_diameter = [&diameters, &diameter, &nozzle_diameter](int extruder_index,ExtruderGroup & extruder) {
             extruder.combo_diameter->Clear();
             int select = -1;
+            // ORCA if user defined a custom nozzle in printer config select it instead inherited one. this will show correct nozzle diameter in combobox if its exist in nozzle diameters list
+            auto nozzle_dia = get_diameter_string(nozzle_diameter->values[extruder_index]);
+            if(nozzle_dia != diameter && std::find(diameters.begin(), diameters.end(), nozzle_dia) != diameters.end())
+                diameter = nozzle_dia;
+            // ORCA try to add nozzle diameter from config if list is empty. fixes blank nozzle combo box when preset has no alias
+            if(diameters[0].empty() && !nozzle_dia.empty()){
+                diameters[0] = nozzle_dia;
+                diameter = nozzle_dia;
+            }
             for (size_t i = 0; i < diameters.size(); ++i) {
                 if (diameters[i] == diameter)
                     select = extruder.combo_diameter->GetCount();
@@ -2567,14 +2569,14 @@ void Sidebar::update_presets(Preset::Type preset_type)
             AMSCountPopupWindow::UpdateAMSCount(0, p->left_extruder);
             AMSCountPopupWindow::UpdateAMSCount(1, p->right_extruder);
             //if (!p->is_switching_diameter) {
-                update_extruder_diameter(*p->left_extruder);
-                update_extruder_diameter(*p->right_extruder);
+                update_extruder_diameter(0, *p->left_extruder);
+                update_extruder_diameter(1, *p->right_extruder);
             //}
             p->image_printer_bed->SetBitmap(create_scaled_bitmap(image_path, this, PRINTER_THUMBNAIL_SIZE.GetHeight()));
         } else {
             AMSCountPopupWindow::UpdateAMSCount(0, p->single_extruder);
             //if (!p->is_switching_diameter)
-                update_extruder_diameter(*p->single_extruder);
+                update_extruder_diameter(0, *p->single_extruder);
 
             // ORCA sync unified nozzle combo box
             p->combo_nozzle_dia->Clear();
@@ -4120,6 +4122,8 @@ struct Plater::priv
     bool m_ignore_event{false};
     bool m_slice_all{false};
     bool m_is_slicing {false};
+    bool auto_reslice_pending {false};
+    bool auto_reslice_after_cancel {false};
     bool m_is_publishing {false};
     int m_is_RightClickInLeftUI{-1};
     int m_cur_slice_plate;
@@ -4164,6 +4168,7 @@ struct Plater::priv
     std::string                 delayed_error_message;
 
     wxTimer                     background_process_timer;
+    wxTimer                     auto_reslice_timer;
 
     std::string                 label_btn_export;
     std::string                 label_btn_send;
@@ -4373,6 +4378,9 @@ struct Plater::priv
     std::vector<std::vector<DynamicPrintConfig>> get_extruder_filament_info();
     void update_print_volume_state();
     void schedule_background_process();
+    void schedule_auto_reslice_if_needed();
+    void trigger_auto_reslice_now();
+    int  auto_slice_delay_seconds() const;
     // Update background processing thread from the current config and Model.
     enum UpdateBackgroundProcessReturnState {
         // update_background_process() reports, that the Print / SLAPrint was updated in a way,
@@ -4758,10 +4766,18 @@ Plater::priv::priv(Plater *q, MainFrame *main_frame)
     panels.push_back(assemble_view);
 
     this->background_process_timer.SetOwner(this->q, 0);
+    this->auto_reslice_timer.SetOwner(this->q, 0);
     this->q->Bind(wxEVT_TIMER, [this](wxTimerEvent &evt)
     {
-        if (!this->suppressed_backround_processing_update)
-            this->update_restart_background_process(false, false);
+        if (&evt.GetTimer() == &this->background_process_timer) {
+            if (!this->suppressed_backround_processing_update)
+                this->update_restart_background_process(false, false);
+        } else if (&evt.GetTimer() == &this->auto_reslice_timer) {
+            this->auto_reslice_timer.Stop();
+            this->trigger_auto_reslice_now();
+        } else {
+            evt.Skip();
+        }
     });
 
     update();
@@ -7301,6 +7317,90 @@ void Plater::priv::schedule_background_process()
     this->view3D->get_canvas3d()->set_config(this->config);
 }
 
+void Plater::priv::schedule_auto_reslice_if_needed()
+{
+    AppConfig* cfg = wxGetApp().app_config;
+    if (cfg == nullptr || !cfg->get_bool("auto_slice_after_change"))
+        return;
+
+    if (model.objects.empty())
+        return;
+
+    PartPlate* plate = partplate_list.get_curr_plate();
+    if (plate == nullptr || !plate->has_printable_instances())
+        return;
+
+    if (background_process.running() || m_is_slicing) {
+        // Remember to restart once the current slice stops and cancel it now.
+        auto_reslice_after_cancel = true;
+        background_process.stop();
+        return;
+    }
+
+    const int delay_seconds = auto_slice_delay_seconds();
+    if (delay_seconds > 0) {
+        auto_reslice_pending = true;
+        auto_reslice_timer.Stop();
+        auto_reslice_timer.Start(delay_seconds * 1000, wxTIMER_ONE_SHOT);
+        return;
+    }
+
+    if (auto_reslice_pending)
+        return;
+
+    auto_reslice_pending = true;
+    auto_reslice_timer.Stop();
+    wxGetApp().CallAfter([this]() { this->trigger_auto_reslice_now(); });
+}
+
+void Plater::priv::trigger_auto_reslice_now()
+{
+    this->auto_reslice_pending = false;
+
+    AppConfig* cfg = wxGetApp().app_config;
+    if (cfg == nullptr || !cfg->get_bool("auto_slice_after_change"))
+        return;
+
+    if (this->model.objects.empty())
+        return;
+
+    if (this->background_process.running() || this->m_is_slicing)
+        return;
+
+    PartPlate* plate = this->partplate_list.get_curr_plate();
+    if (plate == nullptr || !plate->has_printable_instances())
+        return;
+
+    this->q->reslice();
+}
+
+int Plater::priv::auto_slice_delay_seconds() const
+{
+    AppConfig* cfg = wxGetApp().app_config;
+    if (cfg == nullptr)
+        return 0;
+
+    std::string delay_str = cfg->get("auto_slice_change_delay_seconds");
+    if (delay_str.empty())
+        return 0;
+
+    long delay_seconds = 0;
+    try {
+        delay_seconds = std::stol(delay_str);
+    } catch (...) {
+        delay_seconds = 0;
+    }
+
+    if (delay_seconds < 0)
+        delay_seconds = 0;
+
+    const long max_seconds = std::numeric_limits<int>::max() / 1000;
+    if (delay_seconds > max_seconds)
+        delay_seconds = max_seconds;
+
+    return static_cast<int>(delay_seconds);
+}
+
 std::vector<std::vector<DynamicPrintConfig>> Plater::priv::get_extruder_filament_info()
 {
     std::vector<std::vector<DynamicPrintConfig>> filament_infos;
@@ -7766,7 +7866,38 @@ bool Plater::priv::replace_volume_with_stl(int object_idx, int volume_idx, const
 
     Model new_model;
     try {
-        new_model = Model::read_from_file(path, nullptr, nullptr, LoadStrategy::AddDefaultInstances | LoadStrategy::LoadModel);
+        const bool is_step = boost::algorithm::iends_with(path, ".stp") || boost::algorithm::iends_with(path, ".step");
+        if (is_step) {
+            auto config = wxGetApp().app_config;
+            double linear = std::max(0.003, string_to_double_decimal_point(config->get("linear_defletion")));
+            double angle = std::max(0.5, string_to_double_decimal_point(config->get("angle_defletion")));
+            bool split_compound = config->get_bool("is_split_compound");
+            bool is_user_cancel = false;
+
+            auto callback = [&is_user_cancel, linear, angle, split_compound](Slic3r::Step &file, double &linear_value, double &angle_value, bool &is_split) -> int {
+                if (wxGetApp().app_config->get_bool("enable_step_mesh_setting")) {
+                    StepMeshDialog mesh_dlg(nullptr, file, linear, angle);
+                    if (mesh_dlg.ShowModal() == wxID_OK) {
+                        linear_value = mesh_dlg.get_linear_defletion();
+                        angle_value  = mesh_dlg.get_angle_defletion();
+                        is_split     = mesh_dlg.get_split_compound_value();
+                        return 1;
+                    }
+                } else {
+                    linear_value = linear;
+                    angle_value  = angle;
+                    is_split     = split_compound;
+                    return 1;
+                }
+                is_user_cancel = true;
+                return -1;
+            };
+
+            new_model = Model::read_from_step(path, LoadStrategy::AddDefaultInstances | LoadStrategy::LoadModel, nullptr, nullptr, callback, linear, angle, split_compound);
+            if (is_user_cancel) return false;
+        } else {
+            new_model = Model::read_from_file(path, nullptr, nullptr, LoadStrategy::AddDefaultInstances | LoadStrategy::LoadModel);
+        }
         for (ModelObject* model_object : new_model.objects) {
             model_object->center_around_origin();
             model_object->ensure_on_bed();
@@ -7865,7 +7996,7 @@ void Plater::priv::replace_with_stl()
         return;
     }
 
-    if (!replace_volume_with_stl(object_idx, volume_idx, out_path, "Replace with STL"))
+    if (!replace_volume_with_stl(object_idx, volume_idx, out_path, "Replace with 3D file"))
         return;
 
     // update 3D scene
@@ -7949,7 +8080,7 @@ void Plater::priv::replace_all_with_stl()
         return;
     }
 
-    std::string status = _L("Replaced with STLs from directory:\n").ToStdString() + out_path.string() + "\n\n";
+    std::string status = _L("Replaced with 3D files from directory:\n").ToStdString() + out_path.string() + "\n\n";
 
     for (unsigned int idx : volume_idxs) {
         const GLVolume* v = selection.get_volume(idx);
@@ -7982,7 +8113,7 @@ void Plater::priv::replace_all_with_stl()
 
         BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << " replacing volume : " << input_path << " with " << new_path;
 
-        if (!replace_volume_with_stl(object_idx, volume_idx, new_path, "Replace with STL")) {
+        if (!replace_volume_with_stl(object_idx, volume_idx, new_path, "Replace with 3D file")) {
             status += boost::str(boost::format(_L("✖ Skipped %1%: failed to replace.\n").ToStdString()) % volume_name);
             BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << " cannot replace volume : failed to replace with " << new_path;
             continue;
@@ -9431,6 +9562,11 @@ void Plater::priv::on_process_completed(SlicingProcessCompletedEvent &evt)
             }
         }
     }
+    if (auto_reslice_after_cancel) {
+        auto_reslice_after_cancel = false;
+        schedule_auto_reslice_if_needed();
+    }
+
     BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(", exit.");
 }
 
@@ -13983,10 +14119,10 @@ void Plater::increase_instances(size_t num)
 
     p->selection_changed();
     this->p->schedule_background_process();
-    if (wxGetApp().app_config->get("auto_arrange") == "true") {
-        this->set_prepare_state(Job::PREPARE_STATE_MENU);
-        this->arrange();
-    }
+    //if (wxGetApp().app_config->get("auto_arrange") == "true") {
+    //    this->set_prepare_state(Job::PREPARE_STATE_MENU);
+    //    this->arrange();
+    //}
 }
 
 void Plater::decrease_instances(size_t num)
@@ -14014,10 +14150,10 @@ void Plater::decrease_instances(size_t num)
 
     p->selection_changed();
     this->p->schedule_background_process();
-    if (wxGetApp().app_config->get("auto_arrange") == "true") {
-        this->set_prepare_state(Job::PREPARE_STATE_MENU);
-        this->arrange();
-    }
+    //if (wxGetApp().app_config->get("auto_arrange") == "true") {
+    //    this->set_prepare_state(Job::PREPARE_STATE_MENU);
+    //    this->arrange();
+    //}
 }
 
 static long GetNumberFromUser(  const wxString& msg,
@@ -15927,6 +16063,7 @@ void Plater::on_config_change(const DynamicPrintConfig &config)
     if (p->main_frame->is_loaded()) {
         this->p->schedule_background_process();
         update_title_dirty_status();
+        p->schedule_auto_reslice_if_needed();
     }
 }
 
diff --git a/src/slic3r/GUI/Plater.hpp b/src/slic3r/GUI/Plater.hpp
index 2ff3e567b8..5f70657e5f 100644
--- a/src/slic3r/GUI/Plater.hpp
+++ b/src/slic3r/GUI/Plater.hpp
@@ -121,7 +121,8 @@ public:
     static int TitlebarMargin(){ return 8 ;} // Use as side margins on titlebar. Has less margin on sides to create separation with its content
     static int ContentMargin() { return 12;} // Use as side margins contents of title
     static int ContentMarginV(){ return 9 ;} // Use as vertical margins contents of title
-    static int IconSpacing()   { return 10;} // Use on main elements
+    static int IconSpacing()   { return 10;} // Use on main elements in same group of controls
+    static int WideSpacing()   { return 18;} // Use between main elements / control groups for separation or preventing accidental clicks important
     static int ElementSpacing(){ return 5 ;} // Use if elements has relation between them like edit button for combo box etc.
 };
 
diff --git a/src/slic3r/GUI/Preferences.cpp b/src/slic3r/GUI/Preferences.cpp
index 9cc05d5cf1..db330f84c8 100644
--- a/src/slic3r/GUI/Preferences.cpp
+++ b/src/slic3r/GUI/Preferences.cpp
@@ -677,6 +677,74 @@ wxBoxSizer *PreferencesDialog::create_item_backup(wxString title, wxString toolt
     return m_sizer_input;
 }
 
+wxBoxSizer *PreferencesDialog::create_item_auto_reslice(wxString title, wxString checkbox_tooltip, wxString delay_tooltip)
+{
+    wxBoxSizer *sizer_row = new wxBoxSizer(wxHORIZONTAL);
+
+    sizer_row->AddSpacer(FromDIP(DESIGN_LEFT_MARGIN));
+
+    auto checkbox_title = new wxStaticText(m_parent, wxID_ANY, title, wxDefaultPosition, DESIGN_TITLE_SIZE, wxST_NO_AUTORESIZE);
+    checkbox_title->SetForegroundColour(DESIGN_GRAY900_COLOR);
+    checkbox_title->SetFont(::Label::Body_14);
+    checkbox_title->Wrap(DESIGN_TITLE_SIZE.x);
+    checkbox_title->SetToolTip(checkbox_tooltip);
+
+    auto checkbox = new ::CheckBox(m_parent);
+    checkbox->SetValue(app_config->get_bool("auto_slice_after_change"));
+    checkbox->SetToolTip(checkbox_tooltip);
+
+    wxString delay_value = app_config->get("auto_slice_change_delay_seconds");
+    if (delay_value.empty())
+        delay_value = "0";
+
+    auto input = new ::TextInput(m_parent, wxEmptyString, _L("sec"), wxEmptyString, wxDefaultPosition, wxSize(FromDIP(97), -1), wxTE_PROCESS_ENTER);
+    StateColor input_bg(std::pair<wxColour, int>(wxColour("#F0F0F1"), StateColor::Disabled), std::pair<wxColour, int>(*wxWHITE, StateColor::Enabled));
+    input->SetBackgroundColor(input_bg);
+    input->GetTextCtrl()->SetValue(delay_value);
+    wxTextValidator validator(wxFILTER_DIGITS);
+    input->SetToolTip(delay_tooltip);
+    input->GetTextCtrl()->SetValidator(validator);
+
+    sizer_row->Add(checkbox_title, 0, wxALIGN_CENTER | wxTOP | wxBOTTOM, FromDIP(3));
+    sizer_row->Add(checkbox, 0, wxALIGN_CENTER | wxLEFT | wxRIGHT, FromDIP(5));
+    sizer_row->Add(input, 0, wxALIGN_CENTER_VERTICAL);
+
+    auto commit_delay = [this, input]() {
+        wxString value = input->GetTextCtrl()->GetValue();
+        long seconds = 0;
+        if (!value.ToLong(&seconds) || seconds < 0)
+            seconds = 0;
+        wxString sanitized = wxString::Format("%ld", seconds);
+        input->GetTextCtrl()->SetValue(sanitized);
+        app_config->set("auto_slice_change_delay_seconds", std::string(sanitized.mb_str()));
+        app_config->save();
+    };
+
+    input->GetTextCtrl()->Bind(wxEVT_TEXT_ENTER, [commit_delay](wxCommandEvent &e) {
+        commit_delay();
+        e.Skip();
+    });
+
+    input->GetTextCtrl()->Bind(wxEVT_KILL_FOCUS, [commit_delay](wxFocusEvent &e) {
+        commit_delay();
+        e.Skip();
+    });
+
+    checkbox->Bind(wxEVT_TOGGLEBUTTON, [this, checkbox, input](wxCommandEvent &e) {
+        const bool enabled = checkbox->GetValue();
+        app_config->set_bool("auto_slice_after_change", enabled);
+        app_config->save();
+        input->Enable(enabled);
+        input->Refresh();
+        e.Skip();
+    });
+
+    input->Enable(checkbox->GetValue());
+    input->Refresh();
+
+    return sizer_row;
+}
+
 wxBoxSizer* PreferencesDialog::create_item_darkmode(wxString title,wxString tooltip, std::string param)
 {
     wxBoxSizer* m_sizer_checkbox = new wxBoxSizer(wxHORIZONTAL);
@@ -1256,6 +1324,12 @@ 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);
+
+    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);
  
     //// CONTROL > Camera
     g_sizer->Add(create_item_title(_L("Camera")), 1, wxEXPAND);
@@ -1594,7 +1668,7 @@ wxBoxSizer* PreferencesDialog::create_debug_page()
                     wxGetApp().request_user_logout();
                     agent->set_country_code(country_code);
                 }
-                ConfirmBeforeSendDialog confirm_dlg(this, wxID_ANY, _L("Warning"), ConfirmBeforeSendDialog::ButtonStyle::ONLY_CONFIRM);
+                ConfirmBeforeSendDialog confirm_dlg(this, wxID_ANY, _L("Warning"), ConfirmBeforeSendDialog::VisibleButtons::ONLY_CONFIRM);  // ORCA VisibleButtons instead ButtonStyle 
                 confirm_dlg.update_text(_L("Cloud environment switched, please login again!"));
                 confirm_dlg.on_show();
             }
diff --git a/src/slic3r/GUI/Preferences.hpp b/src/slic3r/GUI/Preferences.hpp
index c6fa92a498..ecd591e089 100644
--- a/src/slic3r/GUI/Preferences.hpp
+++ b/src/slic3r/GUI/Preferences.hpp
@@ -90,6 +90,7 @@ public:
     wxBoxSizer *create_item_input(wxString title, wxString title2, wxString tooltip, std::string param, std::function<void(wxString)> onchange = {});
     wxBoxSizer *create_camera_orbit_mult_input(wxString title, wxString tooltip);
     wxBoxSizer *create_item_backup(wxString title, wxString tooltip);
+    wxBoxSizer *create_item_auto_reslice(wxString title, wxString checkbox_tooltip, wxString delay_tooltip);
     wxBoxSizer *create_item_multiple_combobox(wxString title, wxString tooltip, std::string parama, std::vector<wxString> vlista, std::vector<wxString> vlistb);
 #ifdef WIN32
     wxBoxSizer *create_item_link_association(wxString url_prefix, wxString website_name);
diff --git a/src/slic3r/GUI/PrivacyUpdateDialog.cpp b/src/slic3r/GUI/PrivacyUpdateDialog.cpp
index cd2900ff3d..ef4dac9b13 100644
--- a/src/slic3r/GUI/PrivacyUpdateDialog.cpp
+++ b/src/slic3r/GUI/PrivacyUpdateDialog.cpp
@@ -31,7 +31,7 @@ static std::string url_encode(const std::string& value) {
 	return escaped.str();
 }
 
-PrivacyUpdateDialog::PrivacyUpdateDialog(wxWindow* parent, wxWindowID id, const wxString& title, enum ButtonStyle btn_style, const wxPoint& pos, const wxSize& size, long style)
+PrivacyUpdateDialog::PrivacyUpdateDialog(wxWindow* parent, wxWindowID id, const wxString& title, enum VisibleButtons btn_style, const wxPoint& pos, const wxSize& size, long style) // ORCA VisibleButtons instead ButtonStyle 
     :DPIDialog(parent, id, title, pos, size, style)
 {
     SetBackgroundColour(*wxWHITE);
@@ -63,11 +63,6 @@ PrivacyUpdateDialog::PrivacyUpdateDialog(wxWindow* parent, wxWindowID id, const
     m_sizer_right->Add(m_vebview_release_note, 0, wxEXPAND | wxRIGHT | wxLEFT, FromDIP(15));
 
     auto sizer_button = new wxBoxSizer(wxHORIZONTAL);
-    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));
-
-    StateColor btn_bg_white(std::pair<wxColour, int>(wxColour(206, 206, 206), StateColor::Pressed), std::pair<wxColour, int>(wxColour(220, 220, 220), StateColor::Hovered),
-        std::pair<wxColour, int>(wxColour(238, 238, 238), StateColor::Normal));
 
 #ifndef __WINDOWS__
     m_vebview_release_note->Bind(wxEVT_WEBVIEW_LOADED, [this](auto& e) {
@@ -83,13 +78,7 @@ PrivacyUpdateDialog::PrivacyUpdateDialog(wxWindow* parent, wxWindowID id, const
     //m_vebview_release_note->Bind(wxEVT_WEBVIEW_NAVIGATING , &PrivacyUpdateDialog::OnNavigating, this);
 
     m_button_ok = new Button(this, _L("Accept"));
-    m_button_ok->SetBackgroundColor(btn_bg_green);
-    m_button_ok->SetBorderColor(*wxWHITE);
-    m_button_ok->SetTextColor(wxColour("#FFFFFE"));
-    m_button_ok->SetFont(Label::Body_12);
-    m_button_ok->SetSize(wxSize(-1, FromDIP(36)));
-    m_button_ok->SetMinSize(wxSize(-1, FromDIP(36)));
-    m_button_ok->SetCornerRadius(FromDIP(3));
+    m_button_ok->SetStyle(ButtonStyle::Confirm, ButtonType::Choice);
 
     m_button_ok->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent& e) {
         wxCommandEvent evt(EVT_PRIVACY_UPDATE_CONFIRM, GetId());
@@ -99,12 +88,7 @@ PrivacyUpdateDialog::PrivacyUpdateDialog(wxWindow* parent, wxWindowID id, const
     });
 
     m_button_cancel = new Button(this, _L("Log Out"));
-    m_button_cancel->SetBackgroundColor(btn_bg_white);
-    m_button_cancel->SetBorderColor(*wxWHITE);
-    m_button_cancel->SetFont(Label::Body_12);
-    m_button_cancel->SetSize(wxSize(-1, FromDIP(36)));
-    m_button_cancel->SetMinSize(wxSize(-1, FromDIP(36)));
-    m_button_cancel->SetCornerRadius(FromDIP(3));
+    m_button_cancel->SetStyle(ButtonStyle::Regular, ButtonType::Choice);
 
     m_button_cancel->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent& e) {
         wxCommandEvent evt(EVT_PRIVACY_UPDATE_CANCEL);
diff --git a/src/slic3r/GUI/PrivacyUpdateDialog.hpp b/src/slic3r/GUI/PrivacyUpdateDialog.hpp
index 0849166191..6ae32b8397 100644
--- a/src/slic3r/GUI/PrivacyUpdateDialog.hpp
+++ b/src/slic3r/GUI/PrivacyUpdateDialog.hpp
@@ -17,7 +17,7 @@ wxDECLARE_EVENT(EVT_PRIVACY_UPDATE_CANCEL, wxCommandEvent);
 class PrivacyUpdateDialog : public DPIDialog
 {
 public:
-    enum ButtonStyle {
+    enum VisibleButtons { // ORCA VisibleButtons instead ButtonStyle 
         ONLY_CONFIRM = 0,
         CONFIRM_AND_CANCEL = 1,
         MAX_STYLE_NUM = 2
@@ -26,7 +26,7 @@ public:
         wxWindow* parent,
         wxWindowID      id = wxID_ANY,
         const wxString& title = wxEmptyString,
-        enum ButtonStyle btn_style = CONFIRM_AND_CANCEL,
+        enum VisibleButtons btn_style = CONFIRM_AND_CANCEL, // ORCA VisibleButtons instead ButtonStyle 
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,
         long style = wxPD_APP_MODAL| wxCAPTION
diff --git a/src/slic3r/GUI/RecenterDialog.cpp b/src/slic3r/GUI/RecenterDialog.cpp
index 49f60d3c56..11f185bf89 100644
--- a/src/slic3r/GUI/RecenterDialog.cpp
+++ b/src/slic3r/GUI/RecenterDialog.cpp
@@ -4,6 +4,7 @@
 #include <wx/dcgraph.h>
 #include <wx/dcmemory.h>
 #include <slic3r/GUI/Widgets/Label.hpp>
+#include <slic3r/GUI/Widgets/DialogButtons.hpp>
 
 #define BORDER FromDIP(25)
 #define DRAW_PANEL_SIZE wxSize(FromDIP(475), FromDIP(100))
@@ -27,34 +28,13 @@ RecenterDialog::RecenterDialog(wxWindow* parent, wxWindowID id, const wxString&
     wxPanel* m_line_top = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxSize(-1, 1), wxTAB_TRAVERSAL);
     m_line_top->SetBackgroundColour(wxColour(166, 169, 170));
 
-    m_button_confirm = new Button(this, _L("Go Home"));
-    m_button_confirm->SetFont(Label::Body_14);
-    m_button_confirm->SetMinSize(wxSize(-1, FromDIP(24)));
-    m_button_confirm->SetCornerRadius(FromDIP(12));
-    StateColor confirm_btn_bg(std::pair<wxColour, int>(wxColour(38, 166, 154), StateColor::Hovered),
-        std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal));
-    m_button_confirm->SetBackgroundColor(confirm_btn_bg);
-    m_button_confirm->SetBorderColor(wxColour(0, 150, 136));
-    m_button_confirm->SetTextColor(*wxWHITE);
-
-    m_button_close = new Button(this, _L("Close"));
-    m_button_close->SetFont(Label::Body_14);
-    m_button_close->SetMinSize(wxSize(-1, FromDIP(24)));
-    m_button_close->SetCornerRadius(FromDIP(12));
-    StateColor close_btn_bg(std::pair<wxColour, int>(wxColour(206, 206, 206), StateColor::Hovered),
-        std::pair<wxColour, int>(*wxWHITE, StateColor::Normal));
-    m_button_close->SetBackgroundColor(close_btn_bg);
-    m_button_close->SetBorderColor(wxColour(38, 46, 48));
-    m_button_close->SetTextColor(wxColour(38, 46, 48));
-
-    button_sizer->AddStretchSpacer();
-    button_sizer->Add(m_button_confirm);
-    button_sizer->AddSpacer(FromDIP(20));
-    button_sizer->Add(m_button_close);
+    auto dlg_btns = new DialogButtons(this, {"OK", "Cancel"});
+    dlg_btns->GetOK()->SetLabel(_L("Go Home"));
+    dlg_btns->GetCANCEL()->SetLabel(_L("Close"));
 
     main_sizer->Add(m_line_top, 0, wxEXPAND, 0);
     main_sizer->AddSpacer(DRAW_PANEL_SIZE.y);
-    main_sizer->Add(button_sizer, 0, wxBOTTOM | wxRIGHT | wxEXPAND, BORDER);
+    main_sizer->Add(dlg_btns, 0, wxBOTTOM | wxRIGHT | wxEXPAND, FromDIP(ButtonProps::ChoiceButtonGap()));
 
     SetSizer(main_sizer);
 
@@ -65,8 +45,8 @@ RecenterDialog::RecenterDialog(wxWindow* parent, wxWindowID id, const wxString&
     Layout();
     Fit();
     this->Bind(wxEVT_PAINT, &RecenterDialog::OnPaint, this);
-    m_button_confirm->Bind(wxEVT_BUTTON, &RecenterDialog::on_button_confirm, this);
-    m_button_close->Bind(wxEVT_BUTTON, &RecenterDialog::on_button_close, this);
+    dlg_btns->GetOK()->Bind(wxEVT_BUTTON, &RecenterDialog::on_button_confirm, this);
+    dlg_btns->GetCANCEL()->Bind(wxEVT_BUTTON, &RecenterDialog::on_button_close, this);
 
     wxGetApp().UpdateDlgDarkUI(this);
 }
@@ -178,10 +158,7 @@ void RecenterDialog::on_button_close(wxCommandEvent& event) {
 
 void RecenterDialog::on_dpi_changed(const wxRect& suggested_rect) {
     init_bitmap();
-    m_button_confirm->SetMinSize(wxSize(-1, FromDIP(24)));
-    m_button_confirm->SetCornerRadius(FromDIP(12));
-    m_button_close->SetMinSize(wxSize(-1, FromDIP(24)));
-    m_button_close->SetCornerRadius(FromDIP(12));
+    // ORCA no need to reapply button sizes
     Layout();
 }
 
diff --git a/src/slic3r/GUI/RecenterDialog.hpp b/src/slic3r/GUI/RecenterDialog.hpp
index 9351682704..1e48e7990b 100644
--- a/src/slic3r/GUI/RecenterDialog.hpp
+++ b/src/slic3r/GUI/RecenterDialog.hpp
@@ -11,8 +11,6 @@ class RecenterDialog : public DPIDialog
 {
 private:
     wxStaticText* m_staticText_hint;
-    Button* m_button_confirm;
-    Button* m_button_close;
     wxStaticBitmap* m_bitmap_home;
     ScalableBitmap  m_home_bmp;
     wxString hint1;
diff --git a/src/slic3r/GUI/ReleaseNote.cpp b/src/slic3r/GUI/ReleaseNote.cpp
index 03501c3884..2dd0a7baf2 100644
--- a/src/slic3r/GUI/ReleaseNote.cpp
+++ b/src/slic3r/GUI/ReleaseNote.cpp
@@ -147,32 +147,15 @@ UpdatePluginDialog::UpdatePluginDialog(wxWindow* parent /*= nullptr*/)
 
     auto sizer_button = new wxBoxSizer(wxHORIZONTAL);
 
-    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>(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal));
-
-    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));
-
     auto m_button_ok = new Button(this, _L("OK"));
-    m_button_ok->SetBackgroundColor(btn_bg_green);
-    m_button_ok->SetBorderColor(*wxWHITE);
-    m_button_ok->SetTextColor(wxColour(0xFFFFFE));
-    m_button_ok->SetFont(Label::Body_12);
-    m_button_ok->SetSize(wxSize(FromDIP(58), FromDIP(24)));
-    m_button_ok->SetMinSize(wxSize(FromDIP(58), FromDIP(24)));
-    m_button_ok->SetCornerRadius(FromDIP(12));
+    m_button_ok->SetStyle(ButtonStyle::Confirm, ButtonType::Choice);
 
     m_button_ok->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent& e) {
         EndModal(wxID_OK);
         });
 
     auto m_button_cancel = new Button(this, _L("Cancel"));
-    m_button_cancel->SetBackgroundColor(btn_bg_white);
-    m_button_cancel->SetBorderColor(wxColour(38, 46, 48));
-    m_button_cancel->SetFont(Label::Body_12);
-    m_button_cancel->SetSize(wxSize(FromDIP(58), FromDIP(24)));
-    m_button_cancel->SetMinSize(wxSize(FromDIP(58), FromDIP(24)));
-    m_button_cancel->SetCornerRadius(FromDIP(12));
+    m_button_cancel->SetStyle(ButtonStyle::Regular, ButtonType::Choice);
 
     m_button_cancel->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent& e) {
         EndModal(wxID_NO);
@@ -319,33 +302,15 @@ UpdateVersionDialog::UpdateVersionDialog(wxWindow *parent)
 
     auto sizer_button = new wxBoxSizer(wxHORIZONTAL);
 
-
-    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>(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal));
-
-    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));
-
     m_button_download = new Button(this, _L("Download"));
-    m_button_download->SetBackgroundColor(btn_bg_green);
-    m_button_download->SetBorderColor(*wxWHITE);
-    m_button_download->SetTextColor(wxColour("#FFFFFE"));
-    m_button_download->SetFont(Label::Body_12);
-    m_button_download->SetSize(wxSize(FromDIP(58), FromDIP(24)));
-    m_button_download->SetMinSize(wxSize(FromDIP(58), FromDIP(24)));
-    m_button_download->SetCornerRadius(FromDIP(12));
+    m_button_download->SetStyle(ButtonStyle::Confirm, ButtonType::Choice);
 
     m_button_download->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent &e) {
         EndModal(wxID_YES);
     });
 
     m_button_skip_version = new Button(this, _L("Skip this Version"));
-    m_button_skip_version->SetBackgroundColor(btn_bg_white);
-    m_button_skip_version->SetBorderColor(wxColour(38, 46, 48));
-    m_button_skip_version->SetFont(Label::Body_12);
-    m_button_skip_version->SetSize(wxSize(FromDIP(58), FromDIP(24)));
-    m_button_skip_version->SetMinSize(wxSize(FromDIP(58), FromDIP(24)));
-    m_button_skip_version->SetCornerRadius(FromDIP(12));
+    m_button_skip_version->SetStyle(ButtonStyle::Regular, ButtonType::Choice);
 
     m_button_skip_version->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent &e) {
         wxGetApp().set_skip_version(true);
@@ -365,12 +330,7 @@ UpdateVersionDialog::UpdateVersionDialog(wxWindow *parent)
     stable_only_label->SetFont(Label::Body_12);
 
     m_button_cancel = new Button(this, _L("Cancel"));
-    m_button_cancel->SetBackgroundColor(btn_bg_white);
-    m_button_cancel->SetBorderColor(wxColour(38, 46, 48));
-    m_button_cancel->SetFont(Label::Body_12);
-    m_button_cancel->SetSize(wxSize(FromDIP(58), FromDIP(24)));
-    m_button_cancel->SetMinSize(wxSize(FromDIP(58), FromDIP(24)));
-    m_button_cancel->SetCornerRadius(FromDIP(12));
+    m_button_cancel->SetStyle(ButtonStyle::Regular, ButtonType::Choice);
 
     m_button_cancel->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent &e) {
         EndModal(wxID_NO);
@@ -537,7 +497,7 @@ void UpdateVersionDialog::update_version_info(wxString release_note, wxString ve
     Fit();
 }
 
-SecondaryCheckDialog::SecondaryCheckDialog(wxWindow* parent, wxWindowID id, const wxString& title, enum ButtonStyle btn_style, const wxPoint& pos, const wxSize& size, long style, bool not_show_again_check)
+SecondaryCheckDialog::SecondaryCheckDialog(wxWindow* parent, wxWindowID id, const wxString& title, enum VisibleButtons btn_style, const wxPoint& pos, const wxSize& size, long style, bool not_show_again_check) // ORCA VisibleButtons instead ButtonStyle 
     :DPIFrame(parent, id, title, pos, size, style)
 {
     m_button_style = btn_style;
@@ -562,12 +522,6 @@ SecondaryCheckDialog::SecondaryCheckDialog(wxWindow* parent, wxWindowID id, cons
 
     auto bottom_sizer = new wxBoxSizer(wxVERTICAL);
     auto sizer_button = new wxBoxSizer(wxHORIZONTAL);
-    btn_bg_green = StateColor(std::pair<wxColour, int>(wxColour(0, 137, 123), StateColor::Pressed), std::pair<wxColour, int>(wxColour(38, 166, 154), StateColor::Hovered),
-        std::pair<wxColour, int>(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal));
-
-    btn_bg_white = StateColor(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));
-
 
     if (not_show_again_check) {
         auto checkbox_sizer = new wxBoxSizer(wxHORIZONTAL);
@@ -581,14 +535,7 @@ SecondaryCheckDialog::SecondaryCheckDialog(wxWindow* parent, wxWindowID id, cons
         bottom_sizer->Add(checkbox_sizer, 0, wxBOTTOM | wxEXPAND, 0);
     }
     m_button_ok = new Button(this, _L("Confirm"));
-    m_button_ok->SetBackgroundColor(btn_bg_green);
-    m_button_ok->SetBorderColor(*wxWHITE);
-    m_button_ok->SetTextColor(wxColour("#FFFFFE"));
-    m_button_ok->SetFont(Label::Body_12);
-    m_button_ok->SetSize(wxSize(FromDIP(58), FromDIP(24)));
-    m_button_ok->SetMinSize(wxSize(-1, FromDIP(24)));
-    m_button_ok->SetMaxSize(wxSize(-1, FromDIP(24)));
-    m_button_ok->SetCornerRadius(FromDIP(12));
+    m_button_ok->SetStyle(ButtonStyle::Confirm, ButtonType::Choice);
 
     m_button_ok->Bind(wxEVT_COMMAND_BUTTON_CLICKED, [this](wxCommandEvent& e) {
         wxCommandEvent evt(EVT_SECONDARY_CHECK_CONFIRM, GetId());
@@ -598,14 +545,7 @@ SecondaryCheckDialog::SecondaryCheckDialog(wxWindow* parent, wxWindowID id, cons
     });
 
     m_button_retry = new Button(this, _L("Retry"));
-    m_button_retry->SetBackgroundColor(btn_bg_green);
-    m_button_retry->SetBorderColor(*wxWHITE);
-    m_button_retry->SetTextColor(wxColour("#FFFFFE"));
-    m_button_retry->SetFont(Label::Body_12);
-    m_button_retry->SetSize(wxSize(FromDIP(58), FromDIP(24)));
-    m_button_retry->SetMinSize(wxSize(-1, FromDIP(24)));
-    m_button_retry->SetMaxSize(wxSize(-1, FromDIP(24)));
-    m_button_retry->SetCornerRadius(FromDIP(12));
+    m_button_retry->SetStyle(ButtonStyle::Regular, ButtonType::Choice);
 
     m_button_retry->Bind(wxEVT_COMMAND_BUTTON_CLICKED, [this](wxCommandEvent& e) {
         wxCommandEvent evt(EVT_SECONDARY_CHECK_RETRY, GetId());
@@ -615,13 +555,7 @@ SecondaryCheckDialog::SecondaryCheckDialog(wxWindow* parent, wxWindowID id, cons
     });
 
     m_button_cancel = new Button(this, _L("Cancel"));
-    m_button_cancel->SetBackgroundColor(btn_bg_white);
-    m_button_cancel->SetBorderColor(wxColour(38, 46, 48));
-    m_button_cancel->SetFont(Label::Body_12);
-    m_button_cancel->SetSize(wxSize(FromDIP(58), FromDIP(24)));
-    m_button_cancel->SetMinSize(wxSize(-1, FromDIP(24)));
-    m_button_cancel->SetMaxSize(wxSize(-1, FromDIP(24)));
-    m_button_cancel->SetCornerRadius(FromDIP(12));
+    m_button_cancel->SetStyle(ButtonStyle::Regular, ButtonType::Choice);
 
     m_button_cancel->Bind(wxEVT_COMMAND_BUTTON_CLICKED, [this](wxCommandEvent& e) {
             wxCommandEvent evt(EVT_SECONDARY_CHECK_CANCEL);
@@ -631,13 +565,7 @@ SecondaryCheckDialog::SecondaryCheckDialog(wxWindow* parent, wxWindowID id, cons
         });
 
     m_button_fn = new Button(this, _L("Done"));
-    m_button_fn->SetBackgroundColor(btn_bg_white);
-    m_button_fn->SetBorderColor(wxColour(38, 46, 48));
-    m_button_fn->SetFont(Label::Body_12);
-    m_button_fn->SetSize(wxSize(FromDIP(58), FromDIP(24)));
-    m_button_fn->SetMinSize(wxSize(-1, FromDIP(24)));
-    m_button_fn->SetMaxSize(wxSize(-1, FromDIP(24)));
-    m_button_fn->SetCornerRadius(FromDIP(12));
+    m_button_fn->SetStyle(ButtonStyle::Regular, ButtonType::Choice);
 
     m_button_fn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, [this](wxCommandEvent& e) {
             post_event(wxCommandEvent(EVT_SECONDARY_CHECK_DONE));
@@ -645,13 +573,7 @@ SecondaryCheckDialog::SecondaryCheckDialog(wxWindow* parent, wxWindowID id, cons
         });
 
     m_button_resume = new Button(this, _L("Resume"));
-    m_button_resume->SetBackgroundColor(btn_bg_white);
-    m_button_resume->SetBorderColor(wxColour(38, 46, 48));
-    m_button_resume->SetFont(Label::Body_12);
-    m_button_resume->SetSize(wxSize(FromDIP(58), FromDIP(24)));
-    m_button_resume->SetMinSize(wxSize(-1, FromDIP(24)));
-    m_button_resume->SetMaxSize(wxSize(-1, FromDIP(24)));
-    m_button_resume->SetCornerRadius(FromDIP(12));
+    m_button_resume->SetStyle(ButtonStyle::Regular, ButtonType::Choice);
 
     m_button_resume->Bind(wxEVT_COMMAND_BUTTON_CLICKED, [this](wxCommandEvent& e) {
         post_event(wxCommandEvent(EVT_SECONDARY_CHECK_RESUME));
@@ -782,7 +704,7 @@ void SecondaryCheckDialog::on_hide()
     }
 }
 
-void SecondaryCheckDialog::update_title_style(wxString title, SecondaryCheckDialog::ButtonStyle style, wxWindow* parent)
+void SecondaryCheckDialog::update_title_style(wxString title, SecondaryCheckDialog::VisibleButtons style, wxWindow* parent) // ORCA VisibleButtons instead ButtonStyle 
 {
     if (m_button_style == style && title == GetTitle()) return;
 
@@ -866,9 +788,6 @@ PrintErrorDialog::PrintErrorDialog(wxWindow* parent, wxWindowID id, const wxStri
 {
     SetBackgroundColour(*wxWHITE);
 
-    btn_bg_white = StateColor(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));
-
     m_sizer_main = new wxBoxSizer(wxVERTICAL);
     auto        m_line_top = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxSize(FromDIP(350), 1));
     m_line_top->SetBackgroundColour(wxColour(166, 169, 170));
@@ -1102,13 +1021,10 @@ void PrintErrorDialog::update_title_style(wxString title, std::vector<int> butto
 void PrintErrorDialog::init_button(PrintErrorButton style,wxString buton_text)
 {
     Button* print_error_button = new Button(this, buton_text);
-    print_error_button->SetBackgroundColor(btn_bg_white);
-    print_error_button->SetBorderColor(wxColour(38, 46, 48));
-    print_error_button->SetFont(Label::Body_14);
+    print_error_button->SetStyle(ButtonStyle::Regular, ButtonType::Choice);
     print_error_button->SetSize(wxSize(FromDIP(300), FromDIP(30)));
     print_error_button->SetMinSize(wxSize(FromDIP(300), FromDIP(30)));
     print_error_button->SetMaxSize(wxSize(-1, FromDIP(30)));
-    print_error_button->SetCornerRadius(FromDIP(5));
     print_error_button->Hide();
     m_button_list[style] = print_error_button;
     m_button_list[style]->Bind(wxEVT_LEFT_DOWN, [this, style](wxMouseEvent& e)
@@ -1167,7 +1083,7 @@ void PrintErrorDialog::rescale()
      }
 }
 
-ConfirmBeforeSendDialog::ConfirmBeforeSendDialog(wxWindow* parent, wxWindowID id, const wxString& title, enum ButtonStyle btn_style, const wxPoint& pos, const wxSize& size, long style, bool not_show_again_check)
+ConfirmBeforeSendDialog::ConfirmBeforeSendDialog(wxWindow* parent, wxWindowID id, const wxString& title, enum VisibleButtons btn_style, const wxPoint& pos, const wxSize& size, long style, bool not_show_again_check)
     :DPIDialog(parent, id, title, pos, size, style)
 {
     SetBackgroundColour(*wxWHITE);
@@ -1190,12 +1106,6 @@ ConfirmBeforeSendDialog::ConfirmBeforeSendDialog(wxWindow* parent, wxWindowID id
 
     auto bottom_sizer = new wxBoxSizer(wxVERTICAL);
     auto sizer_button = new wxBoxSizer(wxHORIZONTAL);
-    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>(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal));
-
-    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));
-
 
     if (not_show_again_check) {
         auto checkbox_sizer = new wxBoxSizer(wxHORIZONTAL);
@@ -1209,13 +1119,7 @@ ConfirmBeforeSendDialog::ConfirmBeforeSendDialog(wxWindow* parent, wxWindowID id
         bottom_sizer->Add(checkbox_sizer, 0, wxBOTTOM | wxEXPAND, 0);
     }
     m_button_ok = new Button(this, _L("Confirm"));
-    m_button_ok->SetBackgroundColor(btn_bg_green);
-    m_button_ok->SetBorderColor(*wxWHITE);
-    m_button_ok->SetTextColor(wxColour("#FFFFFE"));
-    m_button_ok->SetFont(Label::Body_12);
-    m_button_ok->SetSize(wxSize(-1, FromDIP(24)));
-    m_button_ok->SetMinSize(wxSize(FromDIP(58), FromDIP(24)));
-    m_button_ok->SetCornerRadius(FromDIP(12));
+    m_button_ok->SetStyle(ButtonStyle::Confirm, ButtonType::Choice);
 
     m_button_ok->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent& e) {
         wxCommandEvent evt(EVT_SECONDARY_CHECK_CONFIRM, GetId());
@@ -1225,12 +1129,7 @@ ConfirmBeforeSendDialog::ConfirmBeforeSendDialog(wxWindow* parent, wxWindowID id
     });
 
     m_button_cancel = new Button(this, _L("Cancel"));
-    m_button_cancel->SetBackgroundColor(btn_bg_white);
-    m_button_cancel->SetBorderColor(wxColour(38, 46, 48));
-    m_button_cancel->SetFont(Label::Body_12);
-    m_button_cancel->SetSize(wxSize(-1, FromDIP(24)));
-    m_button_cancel->SetMinSize(wxSize(FromDIP(58), FromDIP(24)));
-    m_button_cancel->SetCornerRadius(FromDIP(12));
+    m_button_cancel->SetStyle(ButtonStyle::Regular, ButtonType::Choice);
 
     m_button_cancel->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent& e) {
         wxCommandEvent evt(EVT_SECONDARY_CHECK_CANCEL);
@@ -1245,12 +1144,7 @@ ConfirmBeforeSendDialog::ConfirmBeforeSendDialog(wxWindow* parent, wxWindowID id
         m_button_cancel->Show();
 
     m_button_update_nozzle = new Button(this, _L("Confirm and Update Nozzle"));
-    m_button_update_nozzle->SetBackgroundColor(btn_bg_white);
-    m_button_update_nozzle->SetBorderColor(wxColour(38, 46, 48));
-    m_button_update_nozzle->SetFont(Label::Body_12);
-    m_button_update_nozzle->SetSize(wxSize(-1, FromDIP(24)));
-    m_button_update_nozzle->SetMinSize(wxSize(FromDIP(58), FromDIP(24)));
-    m_button_update_nozzle->SetCornerRadius(FromDIP(12));
+    m_button_update_nozzle->SetStyle(ButtonStyle::Regular, ButtonType::Choice);
 
     m_button_update_nozzle->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent& e) {
         wxCommandEvent evt(EVT_UPDATE_NOZZLE);
@@ -1445,18 +1339,12 @@ void ConfirmBeforeSendDialog::edit_cancel_button_txt(const wxString& txt, bool s
 
 void ConfirmBeforeSendDialog::disable_button_ok()
 {
-    m_button_ok->Disable();
-    m_button_ok->SetBackgroundColor(wxColour(0x90, 0x90, 0x90));
-    m_button_ok->SetBorderColor(wxColour(0x90, 0x90, 0x90));
+    m_button_ok->Disable(); // ORCA enabling / disabling buttons with conditions enough to change its style
 }
 
 void ConfirmBeforeSendDialog::enable_button_ok()
 {
-    m_button_ok->Enable();
-    StateColor btn_bg_green(std::pair<wxColour, int>(wxColour(38, 166, 154), StateColor::Pressed), std::pair<wxColour, int>(wxColour(38, 166, 154), StateColor::Hovered),
-        std::pair<wxColour, int>(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal));
-    m_button_ok->SetBackgroundColor(btn_bg_green);
-    m_button_ok->SetBorderColor(btn_bg_green);
+    m_button_ok->Enable(); // ORCA enabling / disabling buttons with conditions enough to change its style
 }
 
 void ConfirmBeforeSendDialog::rescale()
@@ -1628,41 +1516,22 @@ InputIpAddressDialog::InputIpAddressDialog(wxWindow *parent)
 
     auto m_sizer_button = new wxBoxSizer(wxHORIZONTAL);
 
-    StateColor btn_bg_green(std::pair<wxColour, int>(wxColour(38, 166, 154), StateColor::Pressed), std::pair<wxColour, int>(wxColour(38, 166, 154), StateColor::Hovered),
-                            std::pair<wxColour, int>(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal));
-
-    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));
-
     m_button_ok = new Button(this, _L("Connect"));
-    m_button_ok->SetBackgroundColor(btn_bg_green);
-    m_button_ok->SetBorderColor(*wxWHITE);
-    m_button_ok->SetTextColor(wxColour(0xFFFFFE));
-    m_button_ok->SetFont(Label::Body_12);
-    m_button_ok->SetSize(wxSize(FromDIP(58), FromDIP(24)));
-    m_button_ok->SetMinSize(wxSize(FromDIP(58), FromDIP(24)));
-    m_button_ok->SetCornerRadius(FromDIP(12));
-    m_button_ok->Bind(wxEVT_LEFT_DOWN, &InputIpAddressDialog::on_ok, this);
+    m_button_ok->SetStyle(ButtonStyle::Confirm, ButtonType::Choice);
     m_button_ok->Enable(false);
-    m_button_ok->SetBackgroundColor(wxColour(0x90, 0x90, 0x90));
-    m_button_ok->SetBorderColor(wxColour(0x90, 0x90, 0x90));
+    m_button_ok->Bind(wxEVT_LEFT_DOWN, &InputIpAddressDialog::on_ok, this);
 
     m_button_manual_setup = new Button(this, _L("Manual Setup"));
-    m_button_manual_setup->SetBackgroundColor(btn_bg_green);
-    m_button_manual_setup->SetBorderColor(*wxWHITE);
-    m_button_manual_setup->SetTextColor(wxColour(0xFFFFFE));
-    m_button_manual_setup->SetFont(Label::Body_12);
-    m_button_manual_setup->SetSize(wxSize(FromDIP(58), FromDIP(24)));
-    m_button_manual_setup->SetMinSize(wxSize(FromDIP(58), FromDIP(24)));
-    m_button_manual_setup->SetCornerRadius(FromDIP(12));
+    m_button_manual_setup->SetStyle(ButtonStyle::Regular, ButtonType::Choice);
+    m_button_manual_setup->Enable(false);
+
     m_button_manual_setup->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent&) {
         wxCommandEvent event(EVT_CHECK_IP_ADDRESS_LAYOUT);
         event.SetEventObject(this);
         event.SetInt(1);
         wxPostEvent(this, event);
     });
-    m_button_manual_setup->SetBackgroundColor(wxColour(0x90, 0x90, 0x90));
-    m_button_manual_setup->SetBorderColor(wxColour(0x90, 0x90, 0x90));
+
     m_button_manual_setup->Hide();
 
     m_sizer_button->AddStretchSpacer();
@@ -1803,9 +1672,8 @@ void InputIpAddressDialog::switch_input_panel(int index)
         m_step_icon_panel3->Show();
         m_tip3->Show();
 
+        // ORCA enabling / disabling buttons with conditions enough to change its style
         m_button_ok->Enable(false);
-        m_button_ok->SetBackgroundColor(wxColour(0x90, 0x90, 0x90));
-        m_button_ok->SetBorderColor(wxColour(0x90, 0x90, 0x90));
     }
     current_input_index = index;
 }
@@ -1842,18 +1710,8 @@ void InputIpAddressDialog::set_machine_obj(MachineObject* obj)
 
     auto str_ip = m_input_ip->GetTextCtrl()->GetValue();
     auto str_access_code = m_input_access_code->GetTextCtrl()->GetValue();
-    if (isIp(str_ip.ToStdString()) && str_access_code.Length() == 8) {
-        m_button_ok->Enable(true);
-        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>(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal));
-        m_button_ok->SetTextColor(StateColor::darkModeColorFor("#FFFFFE"));
-        m_button_ok->SetBackgroundColor(btn_bg_green);
-    }
-    else {
-        m_button_ok->Enable(false);
-        m_button_ok->SetBackgroundColor(wxColour(0x90, 0x90, 0x90));
-        m_button_ok->SetBorderColor(wxColour(0x90, 0x90, 0x90));
-    }
+    // ORCA enabling / disabling buttons with conditions enough to change its style
+    m_button_ok->Enable(isIp(str_ip.ToStdString()) && str_access_code.Length() == 8);
 
     Layout();
     Fit();
@@ -1929,12 +1787,9 @@ void InputIpAddressDialog::on_ok(wxMouseEvent& evt)
         str_model_id = it->second;
     }
 
+    // ORCA enabling / disabling buttons with conditions enough to change its style
     m_button_manual_setup->Enable(false);
-    m_button_manual_setup->SetBackgroundColor(wxColour(0x90, 0x90, 0x90));
-    m_button_manual_setup->SetBorderColor(wxColour(0x90, 0x90, 0x90));
     m_button_ok->Enable(false);
-    m_button_ok->SetBackgroundColor(wxColour(0x90, 0x90, 0x90));
-    m_button_ok->SetBorderColor(wxColour(0x90, 0x90, 0x90));
 
     Refresh();
     Layout();
@@ -1971,9 +1826,7 @@ void InputIpAddressDialog::on_send_retry()
         return;
     }
 
-    m_button_ok->Enable(false);
-    m_button_ok->SetBackgroundColor(wxColour(0x90, 0x90, 0x90));
-    m_button_ok->SetBorderColor(wxColour(0x90, 0x90, 0x90));
+    m_button_ok->Enable(false); // ORCA enabling / disabling buttons with conditions enough to change its style
 
     m_worker->wait_for_idle();
 
@@ -2170,10 +2023,7 @@ void InputIpAddressDialog::on_check_ip_address_failed(wxCommandEvent& evt)
     }
 
     m_button_ok->Enable(true);
-    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>(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal));
-    m_button_ok->SetTextColor(StateColor::darkModeColorFor("#FFFFFE"));
-    m_button_ok->SetBackgroundColor(btn_bg_green);
+    // ORCA enabling / disabling buttons with conditions enough to change its style
 }
 
 void InputIpAddressDialog::on_text(wxCommandEvent &evt)
@@ -2191,34 +2041,14 @@ void InputIpAddressDialog::on_text(wxCommandEvent &evt)
         }
     }
 
-    const auto enable_btn = [](Button* btn, bool enabled) {
-        btn->Enable(enabled);
-        if (enabled) {
-            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>(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal));
-            btn->SetTextColor(StateColor::darkModeColorFor("#FFFFFE"));
-            btn->SetBackgroundColor(btn_bg_green);
-        } else {
-            btn->SetBackgroundColor(wxColour(0x90, 0x90, 0x90));
-            btn->SetBorderColor(wxColour(0x90, 0x90, 0x90));
-        }
-    };
+    // ORCA enabling / disabling buttons with conditions enough to change its style
+    bool enable_btns = isIp(str_ip.ToStdString()) && str_access_code.Length() == 8 && invalid_access_code;
+    m_button_manual_setup->Enable(enable_btns);
+    m_button_ok->Enable(enable_btns);
 
-    if (isIp(str_ip.ToStdString()) && str_access_code.Length() == 8 && invalid_access_code) {
-        enable_btn(m_button_manual_setup, true);
-        enable_btn(m_button_ok, true);
-    } else {
-        enable_btn(m_button_manual_setup, false);
-        enable_btn(m_button_ok, false);
-    }
+    if (current_input_index == 1)
+        m_button_ok->Enable(!str_name.IsEmpty() && str_sn.length() == 15);
 
-    if (current_input_index == 1){
-        if (!str_name.IsEmpty() && str_sn.length() == 15) {
-            enable_btn(m_button_ok, true);
-        } else {
-            enable_btn(m_button_ok, false);
-        }
-    }
 }
 
 InputIpAddressDialog::~InputIpAddressDialog()
@@ -2242,9 +2072,6 @@ void InputIpAddressDialog::on_dpi_changed(const wxRect& suggested_rect)
      SetMinSize(wxSize(FromDIP(560), -1));
      SetMaxSize(wxSize(FromDIP(560), -1));
 
-     std::string icon_path = (boost::format("%1%/images/OrcaSlicerTitle.ico") % resources_dir()).str();
-     SetIcon(wxIcon(encode_path(icon_path.c_str()), wxBITMAP_TYPE_ICO));
-
      SetBackgroundColour(*wxWHITE);
      auto m_sizer_main    = new wxBoxSizer(wxVERTICAL);
      auto m_line_top = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxSize(FromDIP(400), 1));
@@ -2258,34 +2085,15 @@ void InputIpAddressDialog::on_dpi_changed(const wxRect& suggested_rect)
 
      wxBoxSizer *button_sizer = new wxBoxSizer(wxHORIZONTAL);
 
-     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>(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal));
-
-     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));
-
 
      auto m_button_retry = new Button(this, _L("Retry"));
-     m_button_retry->SetBackgroundColor(btn_bg_green);
-     m_button_retry->SetBorderColor(*wxWHITE);
-     m_button_retry->SetTextColor(wxColour("#FFFFFE"));
-     m_button_retry->SetFont(Label::Body_12);
-     m_button_retry->SetSize(wxSize(-1, FromDIP(24)));
-     m_button_retry->SetMinSize(wxSize(FromDIP(58), FromDIP(24)));
-     m_button_retry->SetCornerRadius(FromDIP(12));
-
+     m_button_retry->SetStyle(ButtonStyle::Confirm, ButtonType::Choice);
      m_button_retry->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent &e) {
          EndModal(wxYES);
      });
 
      auto m_button_input = new Button(this, _L("reconnect"));
-     m_button_input->SetBackgroundColor(btn_bg_white);
-     m_button_input->SetBorderColor(wxColour(38, 46, 48));
-     m_button_input->SetFont(Label::Body_12);
-     m_button_input->SetSize(wxSize(-1, FromDIP(24)));
-     m_button_input->SetMinSize(wxSize(FromDIP(58), FromDIP(24)));
-     m_button_input->SetCornerRadius(FromDIP(12));
-
+     m_button_input->SetStyle(ButtonStyle::Regular, ButtonType::Choice);
      m_button_input->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent &e) {
          EndModal(wxAPPLY);
      });
diff --git a/src/slic3r/GUI/ReleaseNote.hpp b/src/slic3r/GUI/ReleaseNote.hpp
index 6bf4564cd1..838df0efd5 100644
--- a/src/slic3r/GUI/ReleaseNote.hpp
+++ b/src/slic3r/GUI/ReleaseNote.hpp
@@ -114,7 +114,7 @@ class SecondaryCheckDialog : public DPIFrame
 private:
     wxWindow* event_parent { nullptr };
 public:
-    enum ButtonStyle {
+    enum VisibleButtons { // ORCA VisibleButtons instead ButtonStyle 
         ONLY_CONFIRM        = 0,
         CONFIRM_AND_CANCEL  = 1,
         CONFIRM_AND_DONE    = 2,
@@ -127,7 +127,7 @@ public:
         wxWindow* parent,
         wxWindowID      id = wxID_ANY,
         const wxString& title = wxEmptyString,
-        enum ButtonStyle btn_style = CONFIRM_AND_CANCEL,
+        enum VisibleButtons btn_style = CONFIRM_AND_CANCEL, // ORCA VisibleButtons instead ButtonStyle 
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,
         long            style = wxCLOSE_BOX | wxCAPTION,
@@ -137,7 +137,7 @@ public:
     void on_show();
     void on_hide();
     void update_btn_label(wxString ok_btn_text, wxString cancel_btn_text);
-    void update_title_style(wxString title, SecondaryCheckDialog::ButtonStyle style, wxWindow* parent = nullptr);
+    void update_title_style(wxString title, SecondaryCheckDialog::VisibleButtons style, wxWindow* parent = nullptr); // ORCA VisibleButtons instead ButtonStyle 
     void post_event(wxCommandEvent&& event);
     void rescale();
     ~SecondaryCheckDialog();
@@ -156,7 +156,7 @@ public:
     Button* m_button_fn { nullptr };
     Button* m_button_resume { nullptr };
     wxCheckBox* m_show_again_checkbox;
-    ButtonStyle m_button_style;
+    VisibleButtons m_button_style; // ORCA VisibleButtons instead ButtonStyle 
     bool not_show_again = false;
     std::string show_again_config_text = "";
 };
@@ -215,7 +215,6 @@ public:
     void init_button_list();
     void on_webrequest_state(wxWebRequestEvent& evt);
 
-    StateColor btn_bg_white;
     wxWebRequest web_request;
     wxStaticBitmap* m_error_prompt_pic_static;
     Label* m_staticText_release_note{ nullptr };
@@ -243,7 +242,7 @@ public:
 class ConfirmBeforeSendDialog : public DPIDialog
 {
 public:
-    enum ButtonStyle {
+    enum VisibleButtons { // ORCA VisibleButtons instead ButtonStyle 
         ONLY_CONFIRM = 0,
         CONFIRM_AND_CANCEL = 1,
         MAX_STYLE_NUM = 2
@@ -252,7 +251,7 @@ public:
         wxWindow* parent,
         wxWindowID      id = wxID_ANY,
         const wxString& title = wxEmptyString,
-        enum ButtonStyle btn_style = CONFIRM_AND_CANCEL,
+        enum VisibleButtons btn_style = CONFIRM_AND_CANCEL, // ORCA VisibleButtons instead ButtonStyle 
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,
         long            style = wxCLOSE_BOX | wxCAPTION,
diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp
index e5d3ffae6e..56ecd56ce2 100644
--- a/src/slic3r/GUI/SelectMachine.cpp
+++ b/src/slic3r/GUI/SelectMachine.cpp
@@ -575,15 +575,8 @@ SelectMachineDialog::SelectMachineDialog(Plater *plater)
     wxBoxSizer *m_sizer_prepare = new wxBoxSizer(wxHORIZONTAL);
     wxBoxSizer *m_sizer_pcont   = new wxBoxSizer(wxVERTICAL);
 
-    m_btn_bg_enable = StateColor(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));
     m_button_ensure = new Button(m_panel_prepare, _L("Send"));
-    m_button_ensure->SetBackgroundColor(m_btn_bg_enable);
-    m_button_ensure->SetBorderColor(m_btn_bg_enable);
-    m_button_ensure->SetTextColor(StateColor::darkModeColorFor("#FFFFFE"));
-    m_button_ensure->SetMinSize(SELECT_MACHINE_DIALOG_BUTTON_SIZE2);
-    m_button_ensure->SetMinSize(SELECT_MACHINE_DIALOG_BUTTON_SIZE2);
-    m_button_ensure->SetCornerRadius(FromDIP(4));
+    m_button_ensure->SetStyle(ButtonStyle::Confirm, ButtonType::Choice);
     m_button_ensure->Bind(wxEVT_BUTTON, &SelectMachineDialog::on_ok_btn, this);
 
     m_sizer_pcont->Add(0, 0, 1, wxEXPAND, 0);
@@ -3661,14 +3654,12 @@ void SelectMachineDialog::Enable_Send_Button(bool en)
     if (!en) {
         if (m_button_ensure->IsEnabled()) {
             m_button_ensure->Disable();
-            m_button_ensure->SetBackgroundColor(wxColour(200, 200, 200));
-            m_button_ensure->SetBorderColor(wxColour(200, 200, 200));
+            // ORCA no need to set colors again
         }
     } else {
         if (!m_button_ensure->IsEnabled()) {
             m_button_ensure->Enable();
-            m_button_ensure->SetBackgroundColor(m_btn_bg_enable);
-            m_button_ensure->SetBorderColor(m_btn_bg_enable);
+            // ORCA no need to set colors again
         }
     }
 }
@@ -3685,8 +3676,7 @@ void SelectMachineDialog::on_dpi_changed(const wxRect &suggested_rect)
         ams_mapping_help_icon->msw_rescale();
         if (img_amsmapping_tip)img_amsmapping_tip->SetBitmap(ams_mapping_help_icon->bmp());
     }
-    m_button_ensure->SetMinSize(SELECT_MACHINE_DIALOG_BUTTON_SIZE2);
-    m_button_ensure->SetCornerRadius(FromDIP(4));
+    m_button_ensure->Rescale(); // ORCA
     m_status_bar->msw_rescale();
 
     for (auto material1 : m_materialList) {
diff --git a/src/slic3r/GUI/SendMultiMachinePage.cpp b/src/slic3r/GUI/SendMultiMachinePage.cpp
index cc271c8776..1060dc253c 100644
--- a/src/slic3r/GUI/SendMultiMachinePage.cpp
+++ b/src/slic3r/GUI/SendMultiMachinePage.cpp
@@ -341,12 +341,8 @@ void SendMultiMachinePage::on_dpi_changed(const wxRect& suggested_rect)
     print_weight->msw_rescale();
     timeimg->SetBitmap(print_time->bmp());
     weightimg->SetBitmap(print_weight->bmp());
-    m_button_add->Rescale();
-    m_button_add->SetMinSize(wxSize(FromDIP(90), FromDIP(36)));
-    m_button_add->SetMaxSize(wxSize(FromDIP(90), FromDIP(36)));
-    m_button_send->Rescale();
-    m_button_send->SetMinSize(wxSize(FromDIP(120), FromDIP(40)));
-    m_button_send->SetMinSize(wxSize(FromDIP(120), FromDIP(40)));
+    m_button_add->Rescale(); // ORCA no need to re set size
+    m_button_send->Rescale(); // ORCA no need to re set size
 
     for (auto it = m_device_items.begin(); it != m_device_items.end(); ++it) {
         it->second->Refresh();
@@ -1349,21 +1345,8 @@ wxPanel* SendMultiMachinePage::create_page()
     m_tip_text->SetFont(::Label::Head_20);
     m_tip_text->Wrap(-1);
 
-    auto m_btn_bg_enable = StateColor(
-        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)
-    );
-
     m_button_add = new Button(main_page, _L("Add"));
-    m_button_add->SetBackgroundColor(m_btn_bg_enable);
-    m_button_add->SetBorderColor(m_btn_bg_enable);
-    m_button_add->SetTextColor(*wxWHITE);
-    m_button_add->SetFont(Label::Body_12);
-    m_button_add->SetCornerRadius(6);
-    m_button_add->SetMinSize(wxSize(FromDIP(90), FromDIP(36)));
-    m_button_add->SetMaxSize(wxSize(FromDIP(90), FromDIP(36)));
-
+    m_button_add->SetStyle(ButtonStyle::Confirm, ButtonType::Window);
     m_button_add->Bind(wxEVT_BUTTON, [this](wxCommandEvent& evt) {
         MultiMachinePickPage dlg;
         dlg.ShowModal();
@@ -1412,17 +1395,8 @@ wxPanel* SendMultiMachinePage::create_page()
     sizer->AddSpacer(FromDIP(10));
 
     // add send button
-    btn_bg_enable = StateColor(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));
-
     m_button_send = new Button(main_page, _L("Send"));
-    m_button_send->SetBackgroundColor(btn_bg_enable);
-    m_button_send->SetBorderColor(btn_bg_enable);
-    m_button_send->SetTextColor(StateColor::darkModeColorFor("#FFFFFE"));
-    m_button_send->SetSize(wxSize(FromDIP(120), FromDIP(40)));
-    m_button_send->SetMinSize(wxSize(FromDIP(120), FromDIP(40)));
-    m_button_send->SetMinSize(wxSize(FromDIP(120), FromDIP(40)));
-    m_button_send->SetCornerRadius(FromDIP(5));
+    m_button_send->SetStyle(ButtonStyle::Confirm, ButtonType::Choice);
     m_button_send->Bind(wxEVT_BUTTON, &SendMultiMachinePage::on_send, this);
     //m_button_send->Disable();
     //m_button_send->SetBackgroundColor(wxColour(0x90, 0x90, 0x90));
diff --git a/src/slic3r/GUI/SendToPrinter.cpp b/src/slic3r/GUI/SendToPrinter.cpp
index aac83ac1bf..5f5cf9925e 100644
--- a/src/slic3r/GUI/SendToPrinter.cpp
+++ b/src/slic3r/GUI/SendToPrinter.cpp
@@ -285,16 +285,9 @@ SendToPrinterDialog::SendToPrinterDialog(Plater *plater)
     m_comboBox_printer->Bind(wxEVT_COMBOBOX, &SendToPrinterDialog::on_selection_changed, this);
 
     m_sizer_printer->Add(m_comboBox_printer, 1, wxEXPAND | wxRIGHT, FromDIP(5));
-    btn_bg_enable = StateColor(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));
 
     m_button_refresh = new Button(this, _L("Refresh"));
-    m_button_refresh->SetBackgroundColor(btn_bg_enable);
-    m_button_refresh->SetBorderColor(btn_bg_enable);
-    m_button_refresh->SetTextColor(StateColor::darkModeColorFor("#FFFFFE"));
-    m_button_refresh->SetSize(SELECT_MACHINE_DIALOG_BUTTON_SIZE);
-    m_button_refresh->SetMinSize(SELECT_MACHINE_DIALOG_BUTTON_SIZE);
-    m_button_refresh->SetCornerRadius(FromDIP(10));
+    m_button_refresh->SetStyle(ButtonStyle::Confirm, ButtonType::Window);
     m_button_refresh->Bind(wxEVT_BUTTON, &SendToPrinterDialog::on_refresh, this);
 
     m_sizer_printer->Add(m_button_refresh, 0, wxALL | wxLEFT, FromDIP(5));
@@ -347,12 +340,7 @@ SendToPrinterDialog::SendToPrinterDialog(Plater *plater)
     m_sizer_prepare->Add(0, 0, 1, wxTOP, FromDIP(22));
     m_sizer_pcont->Add(0, 0, 1, wxEXPAND, 0);
     m_button_ensure = new Button(m_panel_prepare, _L("Send"));
-    m_button_ensure->SetBackgroundColor(btn_bg_enable);
-    m_button_ensure->SetBorderColor(btn_bg_enable);
-    m_button_ensure->SetTextColor(StateColor::darkModeColorFor("#FFFFFE"));
-    m_button_ensure->SetSize(SELECT_MACHINE_DIALOG_BUTTON_SIZE);
-    m_button_ensure->SetMinSize(SELECT_MACHINE_DIALOG_BUTTON_SIZE);
-    m_button_ensure->SetCornerRadius(6);
+    m_button_ensure->SetStyle(ButtonStyle::Confirm, ButtonType::Choice);
 
     m_button_ensure->Bind(wxEVT_BUTTON, &SendToPrinterDialog::on_ok, this);
     m_sizer_pcont->Add(m_button_ensure, 0, wxEXPAND | wxBOTTOM, FromDIP(10));
@@ -1363,15 +1351,11 @@ void SendToPrinterDialog::Enable_Refresh_Button(bool en)
 {
     if (!en) {
         if (m_button_refresh->IsEnabled()) {
-            m_button_refresh->Disable();
-            m_button_refresh->SetBackgroundColor(wxColour(0x90, 0x90, 0x90));
-            m_button_refresh->SetBorderColor(wxColour(0x90, 0x90, 0x90));
+            m_button_refresh->Disable(); // ORCA no need to set colors again
         }
     } else {
         if (!m_button_refresh->IsEnabled()) {
-            m_button_refresh->Enable();
-            m_button_refresh->SetBackgroundColor(btn_bg_enable);
-            m_button_refresh->SetBorderColor(btn_bg_enable);
+            m_button_refresh->Enable(); // ORCA no need to set colors again
         }
     }
 }
@@ -1523,15 +1507,11 @@ void SendToPrinterDialog::Enable_Send_Button(bool en)
     if (!en) {
         if (m_button_ensure->IsEnabled()) {
             m_button_ensure->Disable();
-            m_button_ensure->SetBackgroundColor(wxColour(0x90, 0x90, 0x90));
-            m_button_ensure->SetBorderColor(wxColour(0x90, 0x90, 0x90));
             m_storage_panel->Hide();
         }
     } else {
         if (!m_button_ensure->IsEnabled()) {
             m_button_ensure->Enable();
-            m_button_ensure->SetBackgroundColor(btn_bg_enable);
-            m_button_ensure->SetBorderColor(btn_bg_enable);
             m_storage_panel->Show();
         }
     }
@@ -1539,10 +1519,8 @@ void SendToPrinterDialog::Enable_Send_Button(bool en)
 
 void SendToPrinterDialog::on_dpi_changed(const wxRect &suggested_rect)
 {
-    m_button_refresh->SetMinSize(SELECT_MACHINE_DIALOG_BUTTON_SIZE);
-    m_button_refresh->SetCornerRadius(FromDIP(12));
-    m_button_ensure->SetMinSize(SELECT_MACHINE_DIALOG_BUTTON_SIZE);
-    m_button_ensure->SetCornerRadius(FromDIP(12));
+    m_button_refresh->Rescale(); // ORCA
+    m_button_ensure->Rescale(); // ORCA
     m_status_bar->msw_rescale();
     Fit();
     Refresh();
diff --git a/src/slic3r/GUI/StatusPanel.cpp b/src/slic3r/GUI/StatusPanel.cpp
index 93fdc182dd..dc717aca39 100644
--- a/src/slic3r/GUI/StatusPanel.cpp
+++ b/src/slic3r/GUI/StatusPanel.cpp
@@ -356,28 +356,13 @@ ExtruderSwithingStatus::ExtruderSwithingStatus(wxWindow *parent)
     { m_switching_status_label->SetBackgroundColour(parent->GetBackgroundColour());
     }
 
-    StateColor e_ctrl_bg(std::pair<wxColour, int>(BUTTON_PRESS_COL, StateColor::Pressed), std::pair<wxColour, int>(BUTTON_NORMAL1_COL, StateColor::Normal));
-    StateColor e_ctrl_bd(std::pair<wxColour, int>(BUTTON_HOVER_COL, StateColor::Hovered), std::pair<wxColour, int>(BUTTON_NORMAL1_COL, StateColor::Normal));
-
     m_button_quit = new Button(this, _CTX(L_CONTEXT("Quit", "Quit_Switching"), "Quit_Switching"), "", 0, FromDIP(22));
-    m_button_quit->SetFont(::Label::Body_13);
+    m_button_quit->SetStyle(ButtonStyle::Regular, ButtonType::Window);
     m_button_quit->Bind(wxEVT_BUTTON, &ExtruderSwithingStatus::on_quit, this);
-    m_button_quit->SetMinSize(SWITCHING_STATUS_BTN_SIZE);
-    m_button_quit->SetMaxSize(SWITCHING_STATUS_BTN_SIZE);
-    m_button_quit->SetBackgroundColor(e_ctrl_bg);
-    m_button_quit->SetBorderColor(e_ctrl_bd);
-    m_button_quit->SetBorderWidth(2);
-    if (parent) { m_button_quit->SetBackgroundColour(parent->GetBackgroundColour()); }
 
     m_button_retry = new Button(this, _L("Retry"), "", 0, FromDIP(22));
-    m_button_retry->SetFont(::Label::Body_13);
+    m_button_retry->SetStyle(ButtonStyle::Confirm, ButtonType::Window);
     m_button_retry->Bind(wxEVT_BUTTON, &ExtruderSwithingStatus::on_retry, this);
-    m_button_retry->SetMinSize(SWITCHING_STATUS_BTN_SIZE);
-    m_button_retry->SetMaxSize(SWITCHING_STATUS_BTN_SIZE);
-    m_button_retry->SetBackgroundColor(e_ctrl_bg);
-    m_button_retry->SetBorderColor(e_ctrl_bd);
-    m_button_retry->SetBorderWidth(2);
-    if (parent) { m_button_retry->SetBackgroundColour(parent->GetBackgroundColour()); }
 
     wxBoxSizer *btn_sizer  = new wxBoxSizer(wxHORIZONTAL);
     btn_sizer->Add(m_button_quit, 0, wxALIGN_CENTER_VERTICAL | wxRIGHT, FromDIP(10));
@@ -476,10 +461,8 @@ bool ExtruderSwithingStatus::has_content_shown() const
 
 void ExtruderSwithingStatus::msw_rescale()
 {
-    m_button_quit->SetMinSize(SWITCHING_STATUS_BTN_SIZE);
-    m_button_quit->SetMaxSize(SWITCHING_STATUS_BTN_SIZE);
-    m_button_retry->SetMinSize(SWITCHING_STATUS_BTN_SIZE);
-    m_button_retry->SetMaxSize(SWITCHING_STATUS_BTN_SIZE);
+    m_button_quit->Rescale(); // ORCA
+    m_button_retry->Rescale(); // ORCA
     Layout();
 }
 
@@ -870,18 +853,7 @@ void PrintingTaskPanel::create_panel(wxWindow* parent)
     static_text_sizer->Add(m_error_text, 1, wxEXPAND | wxLEFT, FromDIP(17));
 
     m_button_clean = new Button(m_panel_error_txt, _L("Clear"));
-    StateColor clean_bg(std::pair<wxColour, int>(wxColour(255, 255, 255), StateColor::Disabled), std::pair<wxColour, int>(wxColour(206, 206, 206), StateColor::Pressed),
-                        std::pair<wxColour, int>(wxColour(238, 238, 238), StateColor::Hovered), std::pair<wxColour, int>(wxColour(255, 255, 255), StateColor::Enabled),
-                        std::pair<wxColour, int>(wxColour(255, 255, 255), StateColor::Normal));
-    StateColor clean_bd(std::pair<wxColour, int>(wxColour(144, 144, 144), StateColor::Disabled), std::pair<wxColour, int>(wxColour(38, 46, 48), StateColor::Enabled));
-    StateColor clean_text(std::pair<wxColour, int>(wxColour(144, 144, 144), StateColor::Disabled), std::pair<wxColour, int>(wxColour(38, 46, 48), StateColor::Enabled));
-
-
-    m_button_clean->SetBackgroundColor(clean_bg);
-    m_button_clean->SetBorderColor(clean_bd);
-    m_button_clean->SetTextColor(clean_text);
-    m_button_clean->SetFont(Label::Body_10);
-    m_button_clean->SetMinSize(TASK_BUTTON_SIZE2);
+    m_button_clean->SetStyle(ButtonStyle::Regular, ButtonType::Window);
 
     static_text_sizer->Add( FromDIP(10), 0, 0, 0, 0 );
     static_text_sizer->Add(m_button_clean, 0, wxALIGN_CENTRE_VERTICAL|wxRIGHT, FromDIP(5));
@@ -911,16 +883,10 @@ void PrintingTaskPanel::create_panel(wxWindow* parent)
     m_request_failed_info->SetForegroundColour(*wxRED);
     m_request_failed_info->SetFont(::Label::Body_10);
     static_request_failed_panel_sizer->Add(m_request_failed_info, 0, wxEXPAND | wxALL, FromDIP(10));
-    StateColor btn_bg_green(std::pair<wxColour, int>(AMS_CONTROL_DISABLE_COLOUR, StateColor::Disabled), std::pair<wxColour, int>(wxColour(0, 137, 123), StateColor::Pressed),
-                            std::pair<wxColour, int>(wxColour(38, 166, 154), StateColor::Hovered), std::pair<wxColour, int>(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal));
-    StateColor btn_bd_green(std::pair<wxColour, int>(AMS_CONTROL_WHITE_COLOUR, StateColor::Disabled), std::pair<wxColour, int>(AMS_CONTROL_BRAND_COLOUR, StateColor::Enabled));
+
     m_button_market_retry = new Button(m_request_failed_panel, _L("Retry"));
-    m_button_market_retry->SetBackgroundColor(btn_bg_green);
-    m_button_market_retry->SetBorderColor(btn_bd_green);
-    m_button_market_retry->SetTextColor(wxColour("#FFFFFE"));
-    m_button_market_retry->SetSize(wxSize(FromDIP(128), FromDIP(26)));
-    m_button_market_retry->SetMinSize(wxSize(-1, FromDIP(26)));
-    m_button_market_retry->SetCornerRadius(FromDIP(13));
+    m_button_market_retry->SetStyle(ButtonStyle::Confirm, ButtonType::Window);
+
     static_request_failed_panel_sizer->Add(0, 0, 1, wxEXPAND, 0);
     static_request_failed_panel_sizer->Add(m_button_market_retry, 0, wxEXPAND | wxALL, FromDIP(10));
     m_request_failed_panel->SetSizer(static_request_failed_panel_sizer);
@@ -969,12 +935,7 @@ void PrintingTaskPanel::create_panel(wxWindow* parent)
     }
 
     m_button_market_scoring = new Button(m_score_subtask_info, _L("Rate"));
-    m_button_market_scoring->SetBackgroundColor(btn_bg_green);
-    m_button_market_scoring->SetBorderColor(btn_bd_green);
-    m_button_market_scoring->SetTextColor(wxColour("#FFFFFE"));
-    m_button_market_scoring->SetSize(wxSize(FromDIP(128), FromDIP(26)));
-    m_button_market_scoring->SetMinSize(wxSize(-1, FromDIP(26)));
-    m_button_market_scoring->SetCornerRadius(FromDIP(13));
+    m_button_market_scoring->SetStyle(ButtonStyle::Confirm, ButtonType::Window);
     m_button_market_scoring->Enable(false);
 
     static_score_star_sizer->Add(0, 0, 1, wxEXPAND, 0);
@@ -1619,39 +1580,19 @@ wxBoxSizer *StatusBasePanel::create_machine_control_page(wxWindow *parent)
     //m_staticText_control->SetFont(PAGE_TITLE_FONT);
     m_staticText_control->SetForegroundColour(PAGE_TITLE_FONT_COL);
 
-    StateColor btn_bg_green(std::pair<wxColour, int>(AMS_CONTROL_DISABLE_COLOUR, StateColor::Disabled), std::pair<wxColour, int>(wxColour(0, 137, 123), StateColor::Pressed),
-        std::pair<wxColour, int>(wxColour(38, 166, 154), StateColor::Hovered), std::pair<wxColour, int>(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal));
-    StateColor btn_bd_green(std::pair<wxColour, int>(AMS_CONTROL_WHITE_COLOUR, StateColor::Disabled), std::pair<wxColour, int>(AMS_CONTROL_BRAND_COLOUR, StateColor::Enabled));
-
     m_parts_btn = new Button(m_panel_control_title, _L("Printer Parts"));
-    m_parts_btn->SetBackgroundColor(btn_bg_green);
-    m_parts_btn->SetBorderColor(btn_bd_green);
-    m_parts_btn->SetTextColor(wxColour("#FFFFFE"));
-    m_parts_btn->SetSize(wxSize(FromDIP(128), FromDIP(26)));
-    m_parts_btn->SetMinSize(wxSize(-1, FromDIP(26)));
+    m_parts_btn->SetStyle(ButtonStyle::Confirm, ButtonType::Window);
 
     m_options_btn = new Button(m_panel_control_title, _L("Print Options"));
-    m_options_btn->SetBackgroundColor(btn_bg_green);
-    m_options_btn->SetBorderColor(btn_bd_green);
-    m_options_btn->SetTextColor(wxColour("#FFFFFE"));
-    m_options_btn->SetSize(wxSize(FromDIP(128), FromDIP(26)));
-    m_options_btn->SetMinSize(wxSize(-1, FromDIP(26)));
-
+    m_options_btn->SetStyle(ButtonStyle::Confirm, ButtonType::Window);
+  
     m_safety_btn = new Button(m_panel_control_title, _L("Safety Options"));
-    m_safety_btn->SetBackgroundColor(btn_bg_green);
-    m_safety_btn->SetBorderColor(btn_bd_green);
-    m_safety_btn->SetTextColor(wxColour("#FFFFFE"));
-    m_safety_btn->SetSize(wxSize(FromDIP(128), FromDIP(26)));
-    m_safety_btn->SetMinSize(wxSize(-1, FromDIP(26)));
+    m_safety_btn->SetStyle(ButtonStyle::Confirm, ButtonType::Window);
 
     m_calibration_btn = new Button(m_panel_control_title, _L("Calibration"));
-    m_calibration_btn->SetBackgroundColor(btn_bg_green);
-    m_calibration_btn->SetBorderColor(btn_bd_green);
-    m_calibration_btn->SetTextColor(wxColour("#FFFFFE"));
-    m_calibration_btn->SetSize(wxSize(FromDIP(128), FromDIP(26)));
-    m_calibration_btn->SetMinSize(wxSize(-1, FromDIP(26)));
+    m_calibration_btn->SetStyle(ButtonStyle::Confirm, ButtonType::Window);
     m_calibration_btn->EnableTooltipEvenDisabled();
-
+  
     m_options_btn->Hide();
     m_safety_btn->Hide();
 
@@ -2171,18 +2112,8 @@ wxBoxSizer* StatusBasePanel::create_filament_group(wxWindow* parent)
     steps_sizer->Add(m_filament_load_img, 0, wxALIGN_TOP, FromDIP(30));
     steps_sizer->AddStretchSpacer();
 
-    StateColor btn_bd_white(std::pair<wxColour, int>(wxColour(255, 255, 254), StateColor::Disabled), std::pair<wxColour, int>(wxColour(38, 46, 48), StateColor::Enabled));
-    StateColor btn_text_white(std::pair<wxColour, int>(wxColour(255, 255, 254), StateColor::Disabled), std::pair<wxColour, int>(wxColour(38, 46, 48), StateColor::Enabled));
-    StateColor btn_bg_white(std::pair<wxColour, int>(AMS_CONTROL_DISABLE_COLOUR, StateColor::Disabled), std::pair<wxColour, int>(AMS_CONTROL_DISABLE_COLOUR, StateColor::Pressed),
-                            std::pair<wxColour, int>(AMS_CONTROL_DEF_BLOCK_BK_COLOUR, StateColor::Hovered),
-                            std::pair<wxColour, int>(AMS_CONTROL_WHITE_COLOUR, StateColor::Normal));
-
     m_button_retry = new Button(m_filament_load_box, _L("Retry"));
-    m_button_retry->SetFont(Label::Body_13);
-    m_button_retry->SetBorderColor(btn_bd_white);
-    m_button_retry->SetTextColor(btn_text_white);
-    m_button_retry->SetMinSize(wxSize(FromDIP(80), FromDIP(31)));
-    m_button_retry->SetBackgroundColor(btn_bg_white);
+    m_button_retry->SetStyle(ButtonStyle::Confirm, ButtonType::Choice);
     //m_button_retry->Hide();
 
     m_button_retry->Bind(wxEVT_BUTTON, [this](wxCommandEvent &e) {
@@ -4052,7 +3983,7 @@ void StatusPanel::on_axis_ctrl_z_down_10(wxCommandEvent &event)
 void StatusPanel::axis_ctrl_e_hint(bool up_down)
 {
     if (ctrl_e_hint_dlg == nullptr) {
-        /* ctrl_e_hint_dlg = new SecondaryCheckDialog(this->GetParent(), wxID_ANY, _L("Warning"), SecondaryCheckDialog::ButtonStyle::CONFIRM_AND_CANCEL, wxDefaultPosition,
+        /* ctrl_e_hint_dlg = new SecondaryCheckDialog(this->GetParent(), wxID_ANY, _L("Warning"), SecondaryCheckDialog::VisibleButtons::CONFIRM_AND_CANCEL, wxDefaultPosition,
          ctrl_e_hint_dlg->update_text(_L("Please heat the nozzle to above 170°C before loading or unloading filament."));
          ctrl_e_hint_dlg->m_show_again_checkbox->Hide();
          ctrl_e_hint_dlg->m_button_cancel->Hide();
@@ -4898,7 +4829,7 @@ void StatusPanel::on_camera_enter(wxMouseEvent& event)
         m_camera_popup->Bind(EVT_VCAMERA_SWITCH, &StatusPanel::on_switch_vcamera, this);
         m_camera_popup->Bind(EVT_SDCARD_ABSENT_HINT, [this](wxCommandEvent &e) {
             if (sdcard_hint_dlg == nullptr) {
-                sdcard_hint_dlg = new SecondaryCheckDialog(this->GetParent(), wxID_ANY, _L("Warning"), SecondaryCheckDialog::ButtonStyle::ONLY_CONFIRM);
+                sdcard_hint_dlg = new SecondaryCheckDialog(this->GetParent(), wxID_ANY, _L("Warning"), SecondaryCheckDialog::VisibleButtons::ONLY_CONFIRM); // ORCA VisibleButtons instead ButtonStyle 
                 sdcard_hint_dlg->update_text(_L("Can't start this without storage."));
             }
             sdcard_hint_dlg->on_show();
@@ -5851,18 +5782,9 @@ wxBoxSizer *ScoreDialog::get_button_sizer()
     wxBoxSizer *bSizer_button = new wxBoxSizer(wxHORIZONTAL);
     bSizer_button->Add(0, 0, 1, wxEXPAND, 0);
 
-    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>(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal));
-
     m_button_ok = new Button(this, _L("Submit"));
-    m_button_ok->SetBackgroundColor(btn_bg_green);
-    m_button_ok->SetBorderColor(*wxWHITE);
-    m_button_ok->SetTextColor(wxColour("#FFFFFE"));
-    m_button_ok->SetFont(Label::Body_12);
-    m_button_ok->SetSize(wxSize(FromDIP(58), FromDIP(24)));
-    m_button_ok->SetMinSize(wxSize(FromDIP(58), FromDIP(24)));
-    m_button_ok->SetCornerRadius(FromDIP(12));
-    bSizer_button->Add(m_button_ok, 0, wxRIGHT, FromDIP(24));
+    m_button_ok->SetStyle(ButtonStyle::Confirm, ButtonType::Choice);
+    bSizer_button->Add(m_button_ok, 0, wxRIGHT, FromDIP(ButtonProps::ChoiceButtonGap()));
 
     m_button_ok->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent &e) {
         m_upload_status_code = StatusCode::UPLOAD_PROGRESS;
@@ -5997,17 +5919,9 @@ wxBoxSizer *ScoreDialog::get_button_sizer()
         }
     });
 
-    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));
-
     m_button_cancel = new Button(this, _L("Cancel"));
-    m_button_cancel->SetBackgroundColor(btn_bg_white);
-    m_button_cancel->SetBorderColor(wxColour(38, 46, 48));
-    m_button_cancel->SetFont(Label::Body_12);
-    m_button_cancel->SetSize(wxSize(FromDIP(58), FromDIP(24)));
-    m_button_cancel->SetMinSize(wxSize(FromDIP(58), FromDIP(24)));
-    m_button_cancel->SetCornerRadius(FromDIP(12));
-    bSizer_button->Add(m_button_cancel, 0, wxRIGHT, FromDIP(24));
+    m_button_cancel->SetStyle(ButtonStyle::Regular, ButtonType::Choice);
+    bSizer_button->Add(m_button_cancel, 0, wxRIGHT, FromDIP(ButtonProps::ChoiceButtonGap()));
 
     m_button_cancel->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent &e) { EndModal(wxID_CANCEL); });
 
diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp
index c26403c9fd..fd8ede92d2 100644
--- a/src/slic3r/GUI/Tab.cpp
+++ b/src/slic3r/GUI/Tab.cpp
@@ -353,9 +353,9 @@ void Tab::create_preset_tab()
 
         });
 
-    m_undo_btn->Bind(wxEVT_BUTTON, ([this](wxCommandEvent) { on_roll_back_value(); }));
-    //m_undo_to_sys_btn->Bind(wxEVT_BUTTON, ([this](wxCommandEvent) { on_roll_back_value(true); }));
-    /* m_search_btn->Bind(wxEVT_BUTTON, [](wxCommandEvent) { wxGetApp().plater()->search(false); });*/
+    m_undo_btn->Bind(wxEVT_BUTTON, ([this](wxCommandEvent&) { on_roll_back_value(); }));
+    //m_undo_to_sys_btn->Bind(wxEVT_BUTTON, ([this](wxCommandEvent&) { on_roll_back_value(true); }));
+    /* m_search_btn->Bind(wxEVT_BUTTON, [](wxCommandEvent&) { wxGetApp().plater()->search(false); });*/
 
     // Colors for ui "decoration"
     m_sys_label_clr			= wxGetApp().get_label_clr_sys();
@@ -380,20 +380,23 @@ void Tab::create_preset_tab()
     m_top_sizer->Add(m_undo_to_sys_btn, 0, wxALIGN_CENTER_VERTICAL);
     m_top_sizer->AddSpacer(FromDIP(SidebarProps::IconSpacing()));
 #endif
-    m_top_sizer->Add(m_btn_save_preset, 0, wxALIGN_CENTER_VERTICAL | wxLEFT, FromDIP(SidebarProps::IconSpacing()));
+    m_top_sizer->Add(m_btn_save_preset  , 0, wxALIGN_CENTER_VERTICAL | wxLEFT, FromDIP(SidebarProps::IconSpacing()));
     m_top_sizer->Add(m_btn_delete_preset, 0, wxALIGN_CENTER_VERTICAL | wxLEFT, FromDIP(SidebarProps::IconSpacing()));
-    m_top_sizer->Add(m_btn_search, 0, wxALIGN_CENTER_VERTICAL | wxLEFT, FromDIP(SidebarProps::IconSpacing()));
-    m_top_sizer->Add(m_search_item, 1, wxALIGN_CENTER_VERTICAL | wxLEFT, FromDIP(SidebarProps::ContentMargin()));
+    m_top_sizer->Add(m_btn_search       , 0, wxALIGN_CENTER_VERTICAL | wxLEFT, FromDIP(SidebarProps::WideSpacing()));
+    m_top_sizer->Add(m_search_item      , 1, wxALIGN_CENTER_VERTICAL | wxLEFT, FromDIP(SidebarProps::ContentMargin()));
 
     if (dynamic_cast<TabPrint*>(this) == nullptr) {
-        m_static_title = new Label(m_top_panel, Label::Body_12, _L("Advance"));
-        m_static_title->Wrap( -1 );
-        // BBS: open this tab by select first
-        m_static_title->Bind(wxEVT_LEFT_UP, [this](auto& e) {
-            restore_last_select_item();
+        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) {
+            m_mode_view->SetValue(!m_mode_view->GetValue());
+            wxCommandEvent evt(wxEVT_TOGGLEBUTTON, m_mode_view->GetId()); // ParamsPanel::OnToggled(evt)
+            evt.SetEventObject(m_mode_view);
+            m_mode_view->wxEvtHandler::ProcessEvent(evt);
         });
-        m_top_sizer->Add(m_static_title, 0, wxALIGN_CENTER_VERTICAL | wxLEFT, FromDIP(SidebarProps::IconSpacing()));
+        m_top_sizer->Add(m_mode_icon, 0, wxALIGN_CENTER_VERTICAL | wxLEFT, FromDIP(SidebarProps::WideSpacing()));
         m_mode_view = new SwitchButton(m_top_panel, wxID_ABOUT);
+        m_mode_view->SetToolTip(_L("Show/Hide advanced parameters"));
         m_top_sizer->AddSpacer(FromDIP(SidebarProps::ElementSpacing()));
         m_top_sizer->Add( m_mode_view, 0, wxALIGN_CENTER_VERTICAL);
     }
@@ -537,14 +540,14 @@ void Tab::create_preset_tab()
     m_hsizer->Add(m_page_view, 1, wxEXPAND | wxLEFT, 5);*/
 
     //m_btn_compare_preset->Bind(wxEVT_BUTTON, ([this](wxCommandEvent e) { compare_preset(); }));
-    m_btn_save_preset->Bind(wxEVT_BUTTON, ([this](wxCommandEvent e) { save_preset(); }));
-    m_btn_delete_preset->Bind(wxEVT_BUTTON, ([this](wxCommandEvent e) { delete_preset(); }));
+    m_btn_save_preset->Bind(wxEVT_BUTTON, ([this](wxCommandEvent& e) { save_preset(); }));
+    m_btn_delete_preset->Bind(wxEVT_BUTTON, ([this](wxCommandEvent& e) { delete_preset(); }));
     /*m_btn_hide_incompatible_presets->Bind(wxEVT_BUTTON, ([this](wxCommandEvent e) {
         toggle_show_hide_incompatible();
     }));
 
     if (m_btn_edit_ph_printer)
-        m_btn_edit_ph_printer->Bind(wxEVT_BUTTON, [this](wxCommandEvent e) {
+        m_btn_edit_ph_printer->Bind(wxEVT_BUTTON, [this](wxCommandEvent& e) {
             if (m_preset_bundle->physical_printers.has_selection())
                 m_presets_choice->edit_physical_printer();
             else
@@ -889,7 +892,8 @@ void Tab::decorate()
 void Tab::filter_diff_option(std::vector<std::string> &options)
 {
     for (auto &opt : options) {
-        if (opt.find_last_of('#') == std::string::npos) continue;
+        const auto hash_pos = opt.find_last_of('#');
+        if (hash_pos == std::string::npos) continue;
         bool found = false;
         for (auto page : m_pages) {
             if (auto iter = page->m_opt_id_map.find(opt); iter != page->m_opt_id_map.end()) {
@@ -898,7 +902,7 @@ void Tab::filter_diff_option(std::vector<std::string> &options)
                 break;
             }
         }
-        if (!found) opt.clear();
+        if (!found) opt = opt.substr(0, hash_pos);
     }
     options.erase(std::remove(options.begin(), options.end(), ""), options.end());
 }
@@ -909,7 +913,7 @@ void Tab::update_changed_ui()
     if (m_postpone_update_ui)
         return;
 
-    const bool deep_compare = (m_type == Preset::TYPE_PRINTER || m_type == Preset::TYPE_PRINT
+    const bool deep_compare = (m_type == Preset::TYPE_PRINTER || m_type == Preset::TYPE_PRINT || m_type == Preset::TYPE_FILAMENT
             || m_type == Preset::TYPE_SLA_MATERIAL || m_type == Preset::TYPE_MODEL);
     auto dirty_options = m_presets->current_dirty_options(deep_compare);
     auto nonsys_options = m_presets->current_different_from_parent_options(deep_compare);
@@ -1911,7 +1915,9 @@ void Tab::on_value_change(const std::string& opt_key, const boost::any& value)
         }
     }
 
-    if (m_preset_bundle->get_printer_extruder_count() > 1){
+    // Orca: allow different layer height for non-bbl printers
+    // TODO: allow this for BBL printers too?
+    if (m_preset_bundle->get_printer_extruder_count() > 1 && m_preset_bundle->is_bbl_vendor()) {
         int extruder_idx = std::atoi(opt_key.substr(opt_key.find_last_of('#') + 1).c_str());
         if (opt_key.find("min_layer_height") != std::string::npos) {
             auto min_layer_height_from_nozzle = m_preset_bundle->full_config().option<ConfigOptionFloats>("min_layer_height")->values;
@@ -2482,7 +2488,7 @@ void TabPrint::build()
 
         optgroup->append_single_option_line("slowdown_for_curled_perimeters", "speed_settings_overhang_speed#slow-down-for-curled-perimeters");
         Line line = { L("Overhang speed"), L("This is the speed for various overhang degrees. Overhang degrees are expressed as a percentage of line width. 0 speed means no slowing down for the overhang degree range and wall speed is used") };
-        line.label_path = "slow-down-for-overhang";
+        line.label_path = "speed_settings_overhang_speed#speed";
         line.append_option(optgroup->get_option("overhang_1_4_speed"));
         line.append_option(optgroup->get_option("overhang_2_4_speed"));
         line.append_option(optgroup->get_option("overhang_3_4_speed"));
@@ -3554,7 +3560,7 @@ void TabFilament::add_filament_overrides_page()
     auto append_retraction_option = [this, retraction_optgroup](const std::string& opt_key, int opt_index)
     {
         Line line {"",""};
-        line = retraction_optgroup->create_single_option_line(retraction_optgroup->get_option(opt_key));
+        line = retraction_optgroup->create_single_option_line(retraction_optgroup->get_option(opt_key, opt_index));
 
         line.near_label_widget = [this, optgroup_wk = ConfigOptionsGroupWkp(retraction_optgroup), opt_key, opt_index](wxWindow* parent) {
             auto check_box = new ::CheckBox(parent); // ORCA modernize checkboxes
@@ -3576,6 +3582,7 @@ void TabFilament::add_filament_overrides_page()
                         }
                     }
                 }
+                evt.Skip();
             }, check_box->GetId());
 
             m_overrides_options[opt_key] = check_box;
@@ -3611,7 +3618,7 @@ void TabFilament::add_filament_overrides_page()
     auto append_ironing_option = [this, ironing_optgroup](const std::string& opt_key, int opt_index)
     {
         Line line {"",""};
-        line = ironing_optgroup->create_single_option_line(ironing_optgroup->get_option(opt_key));
+        line = ironing_optgroup->create_single_option_line(ironing_optgroup->get_option(opt_key, opt_index));
 
         line.near_label_widget = [this, optgroup_wk = ConfigOptionsGroupWkp(ironing_optgroup), opt_key, opt_index](wxWindow* parent) {
             auto check_box = new ::CheckBox(parent); // ORCA modernize checkboxes
@@ -3677,6 +3684,7 @@ void TabFilament::add_filament_overrides_page()
                         }
                     }
                 }
+                evt.Skip();
             }, check_box->GetId());
 
             m_overrides_options[opt_key] = check_box;
@@ -3866,7 +3874,7 @@ void TabFilament::build()
 
         // Orca: adaptive pressure advance and calibration model
         optgroup->append_single_option_line("adaptive_pressure_advance", "material_flow_ratio_and_pressure_advance#enable-adaptive-pressure-advance-beta");
-        optgroup->append_single_option_line("adaptive_pressure_advance_overhangs", "material_flow_ratio_and_pressure_advance##enable-adaptive-pressure-advance-for-overhangs-beta");
+        optgroup->append_single_option_line("adaptive_pressure_advance_overhangs", "material_flow_ratio_and_pressure_advance#enable-adaptive-pressure-advance-for-overhangs-beta");
         optgroup->append_single_option_line("adaptive_pressure_advance_bridges", "material_flow_ratio_and_pressure_advance#pressure-advance-for-bridges");
 
         Option option = optgroup->get_option("adaptive_pressure_advance_model");
@@ -3883,8 +3891,8 @@ void TabFilament::build()
         optgroup = page->new_optgroup(L("Print temperature"), L"param_extruder_temp");
         line = { L("Nozzle"), L("Nozzle temperature when printing") };
         line.label_path = "material_temperatures#nozzle";
-        line.append_option(optgroup->get_option("nozzle_temperature_initial_layer"));
-        line.append_option(optgroup->get_option("nozzle_temperature"));
+        line.append_option(optgroup->get_option("nozzle_temperature_initial_layer", 0));
+        line.append_option(optgroup->get_option("nozzle_temperature", 0));
         optgroup->append_line(line);
 
         optgroup = page->new_optgroup(L("Bed temperature"), L"param_bed_temp");
@@ -3963,7 +3971,7 @@ void TabFilament::build()
         //BBS
         optgroup = page->new_optgroup(L("Volumetric speed limitation"), L"param_volumetric_speed");
         optgroup->append_single_option_line("filament_adaptive_volumetric_speed", "material_volumetric_speed_limitation#adaptive-volumetric-speed", 0);
-        optgroup->append_single_option_line("filament_max_volumetric_speed", "material_volumetric_speed_limitation#max-volumetric-speed");
+        optgroup->append_single_option_line("filament_max_volumetric_speed", "material_volumetric_speed_limitation#max-volumetric-speed", 0);
 
         //line = { "", "" };
         //line.full_width = 1;
@@ -4135,6 +4143,9 @@ void TabFilament::reload_config()
     this->compatible_widget_reload(m_compatible_printers);
     this->compatible_widget_reload(m_compatible_prints);
     Tab::reload_config();
+
+    // Recompute derived override UI from the newly loaded config
+    update_filament_overrides_page(&m_preset_bundle->printers.get_edited_preset().config);
 }
 
 //void TabFilament::update_volumetric_flow_preset_hints()
@@ -4366,7 +4377,7 @@ void TabPrinter::build_fff()
         optgroup->append_single_option_line("pellet_modded_printer", "printer_basic_information_advanced#pellet-modded-printer");
         optgroup->append_single_option_line("bbl_use_printhost", "printer_basic_information_advanced#use-3rd-party-print-host");
         optgroup->append_single_option_line("scan_first_layer" , "printer_basic_information_advanced#scan-first-layer");
-        optgroup->append_single_option_line("enable_power_loss_recovery");
+        optgroup->append_single_option_line("enable_power_loss_recovery", "printer_basic_information_advanced#power-loss-recovery");
         //option  = optgroup->get_option("wrapping_exclude_area");
         //option.opt.full_width = true;
         //optgroup->append_single_option_line(option);
@@ -4714,11 +4725,11 @@ PageShp TabPrinter::build_kinematics_page()
 
     // resonance avoidance ported over from qidi slicer
     optgroup = page->new_optgroup(L("Resonance Avoidance"), "param_resonance_avoidance");
-    optgroup->append_single_option_line("resonance_avoidance", "printer_motion_ability_resonance_avoidance#resonance-avoidance");
+    optgroup->append_single_option_line("resonance_avoidance", "printer_motion_ability#resonance-avoidance");
     // Resonance‑avoidance speed inputs
     {
         Line resonance_line = {L("Resonance Avoidance Speed"), L""};
-        resonance_line.label_path = "printer_motion_ability_resonance_avoidance#resonance-avoidance-speed";
+        resonance_line.label_path = "printer_motion_ability#resonance-avoidance-speed";
         resonance_line.append_option(optgroup->get_option("min_resonance_avoidance_speed"));
         resonance_line.append_option(optgroup->get_option("max_resonance_avoidance_speed"));
         optgroup->append_line(resonance_line);
@@ -4896,7 +4907,7 @@ if (is_marlin_flavor)
         optgroup = page->new_optgroup(L("Single extruder multi-material parameters"), "param_settings");
         optgroup->append_single_option_line("cooling_tube_retraction", "printer_multimaterial_semm_parameters#cooling-tube-position");
         optgroup->append_single_option_line("cooling_tube_length", "printer_multimaterial_semm_parameters#cooling-tube-length");
-        optgroup->append_single_option_line("parking_pos_retraction", "printer_multimaterial_semm_parameters#filament-parking-positions");
+        optgroup->append_single_option_line("parking_pos_retraction", "printer_multimaterial_semm_parameters#filament-parking-position");
         optgroup->append_single_option_line("extra_loading_move", "printer_multimaterial_semm_parameters#extra-loading-distance");
         optgroup->append_single_option_line("high_current_on_filament_swap", "printer_multimaterial_semm_parameters#high-extruder-current-on-filament-swap");
 
@@ -6693,18 +6704,18 @@ wxSizer* Tab::compatible_widget_create(wxWindow* parent, PresetDependencies &dep
         this->update_changed_ui();
     };
 
-    deps.checkbox_title->Bind(wxEVT_LEFT_DOWN,([this, &deps, on_toggle](wxMouseEvent e) {
+    deps.checkbox_title->Bind(wxEVT_LEFT_DOWN,([this, &deps, on_toggle](wxMouseEvent& e) {
         if (e.GetEventType() == wxEVT_LEFT_DCLICK) return;
         on_toggle(!deps.checkbox->GetValue());
         e.Skip();
     }));
 
-    deps.checkbox_title->Bind(wxEVT_LEFT_DCLICK,([this, &deps, on_toggle](wxMouseEvent e) {
+    deps.checkbox_title->Bind(wxEVT_LEFT_DCLICK,([this, &deps, on_toggle](wxMouseEvent& e) {
         on_toggle(!deps.checkbox->GetValue());
         e.Skip();
     }));
 
-    deps.checkbox->Bind(wxEVT_TOGGLEBUTTON, ([this, on_toggle](wxCommandEvent e) {
+    deps.checkbox->Bind(wxEVT_TOGGLEBUTTON, ([this, on_toggle](wxCommandEvent& e) {
         on_toggle(e.IsChecked());
         e.Skip();
     }), deps.checkbox->GetId());
@@ -6729,7 +6740,7 @@ wxSizer* Tab::compatible_widget_create(wxWindow* parent, PresetDependencies &dep
     }
     */
 
-    deps.btn->Bind(wxEVT_BUTTON, ([this, parent, &deps](wxCommandEvent e)
+    deps.btn->Bind(wxEVT_BUTTON, ([this, parent, &deps](wxCommandEvent& e)
     {
         // Collect names of non-default non-external profiles.
         PrinterTechnology printer_technology = m_preset_bundle->printers.get_edited_preset().printer_technology();
@@ -6811,7 +6822,7 @@ wxSizer* TabPrinter::create_bed_shape_widget(wxWindow* parent)
     auto sizer = new wxBoxSizer(wxHORIZONTAL);
     sizer->Add(btn, 0, wxALIGN_CENTER_VERTICAL);
 
-    btn->Bind(wxEVT_BUTTON, ([this](wxCommandEvent e) {
+    btn->Bind(wxEVT_BUTTON, ([this](wxCommandEvent& e) {
             bool  is_configed_by_BBL = PresetUtils::system_printer_bed_model(m_preset_bundle->printers.get_edited_preset()).size() > 0;
             BedShapeDialog dlg(this);
             dlg.build_dialog(m_config->option<ConfigOptionPoints>("printable_area")->values,
diff --git a/src/slic3r/GUI/Tab.hpp b/src/slic3r/GUI/Tab.hpp
index 824ef2df9f..96b35b26e1 100644
--- a/src/slic3r/GUI/Tab.hpp
+++ b/src/slic3r/GUI/Tab.hpp
@@ -141,7 +141,7 @@ protected:
 
 	//BBS: GUI refactor
 	wxPanel*			m_top_panel;
-	wxStaticText* m_static_title;
+	ScalableButton* m_mode_icon; // ORCA m_static_title replacement
 	wxBoxSizer* m_main_sizer;
 	wxBoxSizer* m_top_sizer;
 	wxBoxSizer* m_top_left_sizer;
diff --git a/src/slic3r/GUI/UnsavedChangesDialog.cpp b/src/slic3r/GUI/UnsavedChangesDialog.cpp
index b05bfcc703..54a0574fbc 100644
--- a/src/slic3r/GUI/UnsavedChangesDialog.cpp
+++ b/src/slic3r/GUI/UnsavedChangesDialog.cpp
@@ -1808,13 +1808,12 @@ FullCompareDialog::FullCompareDialog(const wxString& option_name, const wxString
 
     sizer->Add(grid_sizer, 1, wxEXPAND);
 
-    wxStdDialogButtonSizer* buttons = this->CreateStdDialogButtonSizer(wxOK);
-    wxGetApp().UpdateDarkUI(static_cast<wxButton*>(this->FindWindowById(wxID_OK, this)), true);
+    auto dlg_btns = new DialogButtons(this, {"OK"});
 
     wxBoxSizer* topSizer = new wxBoxSizer(wxVERTICAL);
 
     topSizer->Add(sizer,   1, wxEXPAND | wxLEFT | wxTOP | wxRIGHT, border);
-    topSizer->Add(buttons, 0, wxEXPAND | wxALL, border);
+    topSizer->Add(dlg_btns , 0, wxEXPAND);
 
     SetSizer(topSizer);
     topSizer->SetSizeHints(this);
diff --git a/src/slic3r/GUI/UpdateDialogs.cpp b/src/slic3r/GUI/UpdateDialogs.cpp
index 5e2abe899d..e45a83b4c3 100644
--- a/src/slic3r/GUI/UpdateDialogs.cpp
+++ b/src/slic3r/GUI/UpdateDialogs.cpp
@@ -137,32 +137,12 @@ MsgUpdateConfig::MsgUpdateConfig(const std::vector<Update> &updates, bool force_
 
 	auto sizer_button = new wxBoxSizer(wxHORIZONTAL);
     sizer_button->Add(0, 0, 1, wxEXPAND, 5);
-
-
-	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>(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal));
-
-    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));
-
   
 	auto m_butto_ok = new Button(this, _L("OK"));
-    m_butto_ok->SetBackgroundColor(btn_bg_green);
-    m_butto_ok->SetBorderColor(*wxWHITE);
-    m_butto_ok->SetTextColor(*wxWHITE);
-    m_butto_ok->SetFont(Label::Body_12);
-    m_butto_ok->SetSize(wxSize(FromDIP(58), FromDIP(24)));
-    m_butto_ok->SetMinSize(wxSize(FromDIP(58), FromDIP(24)));
-
+    m_butto_ok->SetStyle(ButtonStyle::Confirm, ButtonType::Choice);
 
     auto m_button_cancel = new Button(this, _L("Cancel"));
-    m_button_cancel->SetBackgroundColor(*wxWHITE);
-    m_button_cancel->SetBorderColor(wxColour(38, 46, 48));
-    m_button_cancel->SetFont(Label::Body_12);
-    m_button_cancel->SetSize(wxSize(FromDIP(58), FromDIP(24)));
-    m_button_cancel->SetMinSize(wxSize(FromDIP(58), FromDIP(24)));
-
+    m_button_cancel->SetStyle(ButtonStyle::Regular, ButtonType::Choice);
 
     sizer_button->Add(m_butto_ok, 0, wxALL, 5);
     sizer_button->Add(m_button_cancel, 0, wxALL, 5);
diff --git a/src/slic3r/GUI/UpgradePanel.cpp b/src/slic3r/GUI/UpgradePanel.cpp
index caee5e72b6..3a42f7343d 100644
--- a/src/slic3r/GUI/UpgradePanel.cpp
+++ b/src/slic3r/GUI/UpgradePanel.cpp
@@ -226,17 +226,7 @@ MachineInfoPanel::MachineInfoPanel(wxWindow* parent, wxWindowID id, const wxPoin
     m_main_right_sizer->Add(0, FromDIP(50), 0, wxEXPAND, FromDIP(5));
 
     m_button_upgrade_firmware = new Button(this, _L("Update firmware"));
-    StateColor btn_bg(std::pair<wxColour, int>(wxColour(255, 255, 255), StateColor::Disabled), 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::Enabled),
-                      std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal));
-    StateColor btn_bd(std::pair<wxColour, int>(wxColour(144, 144, 144), StateColor::Disabled), std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Enabled));
-    StateColor btn_text(std::pair<wxColour, int>(wxColour(144, 144, 144), StateColor::Disabled), std::pair<wxColour, int>(wxColour(255, 255, 255), StateColor::Enabled));
-    m_button_upgrade_firmware->SetBackgroundColor(btn_bg);
-    m_button_upgrade_firmware->SetBorderColor(btn_bd);
-    m_button_upgrade_firmware->SetTextColor(btn_text);
-    m_button_upgrade_firmware->SetFont(Label::Body_10);
-    m_button_upgrade_firmware->SetMinSize(wxSize(FromDIP(-1), FromDIP(24)));
-    m_button_upgrade_firmware->SetCornerRadius(FromDIP(12));
+    m_button_upgrade_firmware->SetStyle(ButtonStyle::Confirm, ButtonType::Choice);
     m_main_right_sizer->Add(m_button_upgrade_firmware, 0, wxALIGN_CENTER_HORIZONTAL | wxALL, FromDIP(5));
 
     m_staticText_upgrading_info = new wxStaticText(this, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, 0);
@@ -1440,7 +1430,7 @@ void UpgradePanel::update(MachineObject *obj)
         if (m_obj->upgrade_force_upgrade) {
             m_show_forced_hint = false;   //lock hint
             if (force_dlg == nullptr) {
-                force_dlg = new SecondaryCheckDialog(this->GetParent(), wxID_ANY, _L("Update firmware"), SecondaryCheckDialog::ButtonStyle::CONFIRM_AND_CANCEL, wxDefaultPosition, wxDefaultSize);
+                force_dlg = new SecondaryCheckDialog(this->GetParent(), wxID_ANY, _L("Update firmware"), SecondaryCheckDialog::VisibleButtons::CONFIRM_AND_CANCEL, wxDefaultPosition, wxDefaultSize);  // ORCA VisibleButtons instead ButtonStyle 
                 force_dlg->Bind(EVT_SECONDARY_CHECK_CONFIRM, [this](wxCommandEvent& e) {
                     if (m_obj) {
                         m_obj->command_upgrade_confirm();
@@ -1465,7 +1455,7 @@ void UpgradePanel::update(MachineObject *obj)
         if (m_obj->upgrade_consistency_request) {
             m_show_consistency_hint = false;
             if (consistency_dlg == nullptr) {
-                consistency_dlg = new SecondaryCheckDialog(this->GetParent(), wxID_ANY, _L("Update firmware"), SecondaryCheckDialog::ButtonStyle::CONFIRM_AND_CANCEL, wxDefaultPosition, wxDefaultSize);
+                consistency_dlg = new SecondaryCheckDialog(this->GetParent(), wxID_ANY, _L("Update firmware"), SecondaryCheckDialog::VisibleButtons::CONFIRM_AND_CANCEL, wxDefaultPosition, wxDefaultSize);  // ORCA VisibleButtons instead ButtonStyle 
                 consistency_dlg->Bind(EVT_SECONDARY_CHECK_CONFIRM, [this](wxCommandEvent& e) {
                     if (m_obj) {
                         m_obj->command_consistency_upgrade_confirm();
diff --git a/src/slic3r/GUI/Widgets/AMSControl.cpp b/src/slic3r/GUI/Widgets/AMSControl.cpp
index 7850682c70..5e911eb584 100644
--- a/src/slic3r/GUI/Widgets/AMSControl.cpp
+++ b/src/slic3r/GUI/Widgets/AMSControl.cpp
@@ -133,37 +133,9 @@ AMSControl::AMSControl(wxWindow *parent, wxWindowID id, const wxPoint &pos, cons
     m_panel_option_right->SetMinSize(wxSize(FromDIP(180), -1));
     m_panel_option_right->SetMaxSize(wxSize(FromDIP(180), -1));
 
-    StateColor btn_bg_green(std::pair<wxColour, int>(AMS_CONTROL_DISABLE_COLOUR, StateColor::Disabled),
-        std::pair<wxColour, int>(wxColour(0, 137, 123), StateColor::Pressed),
-        std::pair<wxColour, int>(wxColour(38, 166, 154), StateColor::Hovered),
-        std::pair<wxColour, int>(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal));
-
-    StateColor btn_bg_white(std::pair<wxColour, int>(AMS_CONTROL_DISABLE_COLOUR, StateColor::Disabled),
-        std::pair<wxColour, int>(AMS_CONTROL_DISABLE_COLOUR, StateColor::Pressed),
-        std::pair<wxColour, int>(AMS_CONTROL_DEF_BLOCK_BK_COLOUR, StateColor::Hovered),
-        std::pair<wxColour, int>(AMS_CONTROL_WHITE_COLOUR, StateColor::Normal));
-
-    StateColor btn_bd_green(std::pair<wxColour, int>(wxColour(255, 255, 254), StateColor::Disabled),
-        std::pair<wxColour, int>(AMS_CONTROL_BRAND_COLOUR, StateColor::Enabled));
-
-    StateColor btn_bd_white(std::pair<wxColour, int>(wxColour(255, 255, 254), StateColor::Disabled),
-        std::pair<wxColour, int>(wxColour(38, 46, 48), StateColor::Enabled));
-
-    StateColor btn_text_green(std::pair<wxColour, int>(wxColour(255, 255, 254), StateColor::Disabled),
-        std::pair<wxColour, int>(wxColour(255, 255, 254), StateColor::Enabled));
-
-    StateColor btn_text_white(std::pair<wxColour, int>(wxColour(255, 255, 254), StateColor::Disabled),
-        std::pair<wxColour, int>(wxColour(38, 46, 48), StateColor::Enabled));
-
-
     /*option left*/
     m_button_auto_refill = new Button(m_panel_option_left, _L("Auto-refill"));
-    m_button_auto_refill->SetBackgroundColor(btn_bg_white);
-    m_button_auto_refill->SetBorderColor(btn_bd_white);
-    m_button_auto_refill->SetTextColor(btn_text_white);
-    m_button_auto_refill->SetFont(Label::Body_13);
-    m_button_auto_refill->SetMinSize(wxSize(FromDIP(80), FromDIP(34)));
-    m_button_auto_refill->SetMaxSize(wxSize(FromDIP(80), FromDIP(34)));
+    m_button_auto_refill->SetStyle(ButtonStyle::Regular, ButtonType::Choice);
 
     m_button_ams_setting_normal = ScalableBitmap(this, "ams_setting_normal", 24);
     m_button_ams_setting_hover = ScalableBitmap(this, "ams_setting_hover", 24);
@@ -182,12 +154,7 @@ AMSControl::AMSControl(wxWindow *parent, wxWindowID id, const wxPoint &pos, cons
 
     /*option right*/
     m_button_extruder_feed = new Button(m_panel_option_right, _L("Load"));
-    m_button_extruder_feed->SetFont(Label::Body_13);
-    m_button_extruder_feed->SetBackgroundColor(btn_bg_green);
-    m_button_extruder_feed->SetBorderColor(btn_bd_green);
-    m_button_extruder_feed->SetTextColor(btn_text_green);
-    m_button_extruder_feed->SetMinSize(wxSize(FromDIP(80),FromDIP(34)));
-    m_button_extruder_feed->SetMaxSize(wxSize(FromDIP(80),FromDIP(34)));
+    m_button_extruder_feed->SetStyle(ButtonStyle::Confirm, ButtonType::Choice);
     m_button_extruder_feed->EnableTooltipEvenDisabled();
 
 
@@ -203,12 +170,7 @@ AMSControl::AMSControl(wxWindow *parent, wxWindowID id, const wxPoint &pos, cons
     if (wxGetApp().app_config->get("language") == "pt_BR") m_button_extruder_feed->SetLabel("Load");
 
     m_button_extruder_back = new Button(m_panel_option_right, _L("Unload"));
-    m_button_extruder_back->SetBackgroundColor(btn_bg_white);
-    m_button_extruder_back->SetBorderColor(btn_bd_white);
-    m_button_extruder_back->SetTextColor(btn_text_white);
-    m_button_extruder_back->SetFont(Label::Body_13);
-    m_button_extruder_back->SetMinSize(wxSize(FromDIP(80), FromDIP(34)));
-    m_button_extruder_back->SetMaxSize(wxSize(FromDIP(80), FromDIP(34)));
+    m_button_auto_refill->SetStyle(ButtonStyle::Regular, ButtonType::Choice);
     m_button_extruder_back->EnableTooltipEvenDisabled();
 
     if (wxGetApp().app_config->get("language") == "de_DE") m_button_extruder_back->SetFont(Label::Body_9);
@@ -502,12 +464,9 @@ void AMSControl::msw_rescale()
 
     m_extruder->msw_rescale();
 
-    if (m_button_extruder_feed) m_button_extruder_feed->SetMinSize(wxSize(FromDIP(80), FromDIP(34)));
-    if (m_button_extruder_feed) m_button_extruder_feed->SetMaxSize(wxSize(FromDIP(80), FromDIP(34)));
-    if (m_button_extruder_back) m_button_extruder_back->SetMinSize(wxSize(FromDIP(80), FromDIP(34)));
-    if (m_button_extruder_back) m_button_extruder_back->SetMaxSize(wxSize(FromDIP(80), FromDIP(34)));
-    if (m_button_auto_refill) m_button_auto_refill->SetMinSize(wxSize(FromDIP(80), FromDIP(34)));
-    if (m_button_auto_refill) m_button_auto_refill->SetMaxSize(wxSize(FromDIP(80), FromDIP(34)));
+    if (m_button_extruder_feed) m_button_extruder_feed->Rescale(); // ORCA
+    if (m_button_extruder_back) m_button_extruder_back->Rescale(); // ORCA
+    if (m_button_auto_refill) m_button_auto_refill->Rescale();     // ORCA
     if (m_button_ams_setting) m_button_ams_setting->SetMinSize(wxSize(FromDIP(25), FromDIP(24)));
 
 
diff --git a/src/slic3r/GUI/Widgets/AMSItem.cpp b/src/slic3r/GUI/Widgets/AMSItem.cpp
index bc6918d7ec..129eec9c61 100644
--- a/src/slic3r/GUI/Widgets/AMSItem.cpp
+++ b/src/slic3r/GUI/Widgets/AMSItem.cpp
@@ -2731,10 +2731,11 @@ void AMSPreview::doRender(wxDC &dc)
     //single slot
     else if (m_amsinfo.cans.size() == 1) {
         auto iter = m_amsinfo.cans[0];
-        dc.SetPen(wxPen(*wxTRANSPARENT_PEN));
-        dc.SetBrush(StateColor::darkModeColorFor(AMS_CONTROL_DEF_BLOCK_BK_COLOUR));
-        wxSize rec_size = wxSize(FromDIP(16), FromDIP(24));
-        dc.DrawRoundedRectangle((size.x - rec_size.x) / 2, (size.y - rec_size.y) / 2, rec_size.x, rec_size.y, FromDIP(2));
+        // ORCA dont add additional background. four tray already doesnt use one
+        //dc.SetPen(wxPen(*wxTRANSPARENT_PEN));
+        //dc.SetBrush(StateColor::darkModeColorFor(AMS_CONTROL_DEF_BLOCK_BK_COLOUR));
+        //wxSize rec_size = wxSize(FromDIP(16), FromDIP(24));
+        //dc.DrawRoundedRectangle((size.x - rec_size.x) / 2, (size.y - rec_size.y) / 2, rec_size.x, rec_size.y, FromDIP(2));
         if (iter.material_cols.size() > 1)
         {
             int fleft = (size.x - AMS_ITEM_CUBE_SIZE.x) / 2;
diff --git a/src/slic3r/GUI/Widgets/Button.cpp b/src/slic3r/GUI/Widgets/Button.cpp
index 1b5e4eb119..ef5eb4b339 100644
--- a/src/slic3r/GUI/Widgets/Button.cpp
+++ b/src/slic3r/GUI/Widgets/Button.cpp
@@ -174,7 +174,7 @@ void Button::SetVertical(bool vertical)
 //                           Background                                             Foreground                       Border on focus
 // Button Colors             0-Disabled 1-Pressed  2-Hover    3-Normal   4-Enabled  5-Disabled 6-Normal   7-Hover    8-Dark     9-Light
 wxString btn_regular[10]  = {"#DFDFDF", "#DFDFDF", "#D4D4D4", "#DFDFDF", "#DFDFDF", "#6B6A6A", "#262E30", "#262E30", "#009688", "#009688"};
-wxString btn_confirm[10]  = {"#DFDFDF", "#009688", "#26A69A", "#009688", "#009688", "#6B6A6A", "#FEFEFE", "#FEFEFE", "#26A69A", "#00FFD4"};
+wxString btn_confirm[10]  = {"#DFDFDF", "#009688", "#26A69A", "#009688", "#009688", "#6B6A6A", "#FEFEFE", "#FEFEFE", "#22bfb0", "#00FFD4"};
 wxString btn_alert[10]    = {"#DFDFDF", "#DFDFDF", "#E14747", "#DFDFDF", "#DFDFDF", "#6B6A6A", "#262E30", "#FFFFFD", "#009688", "#009688"};
 wxString btn_disabled[10] = {"#DFDFDF", "#DFDFDF", "#DFDFDF", "#DFDFDF", "#DFDFDF", "#6B6A6A", "#6B6A6A", "#262E30", "#DFDFDF", "#DFDFDF"};
 
@@ -220,19 +220,24 @@ void Button::SetStyle(const ButtonStyle style, const ButtonType type)
                    style == ButtonStyle::Disabled ? btn_disabled :
                                                     btn_regular  ;
 
-    this->SetBackgroundColor(StateColor(
-        std::pair(wxColour(clr_arr[3]), (int)StateColor::NotHovered),
+    auto bg_color = StateColor(
         std::pair(wxColour(clr_arr[0]), (int)StateColor::Disabled),
         std::pair(wxColour(clr_arr[1]), (int)StateColor::Pressed),
         std::pair(wxColour(clr_arr[2]), (int)StateColor::Hovered),
         std::pair(wxColour(clr_arr[3]), (int)StateColor::Normal),
         std::pair(wxColour(clr_arr[4]), (int)StateColor::Enabled)
-    ));
-    this->SetBorderColor(StateColor(
-        std::pair(wxColour(clr_arr[3]), (int)StateColor::NotFocused),
+    );
+    bg_color.setTakeFocusedAsHovered(false);
+    this->SetBackgroundColor(bg_color);
+    wxColour focus_clr = clr_arr[is_dark ? 8 : 9];
+    auto border_color = StateColor(
         std::pair(wxColour(clr_arr[0]), (int)StateColor::Disabled),
-        std::pair(wxColour(clr_arr[is_dark ? 8 : 9]), (int)StateColor::Focused)
-    ));
+        std::pair(wxColour(clr_arr[2]), (int)(StateColor::Hovered | ~StateColor::Focused)),
+        std::pair(wxColour(focus_clr ), (int)StateColor::Focused),
+        std::pair(wxColour(clr_arr[3]), (int)StateColor::Normal)
+    );
+    border_color.setTakeFocusedAsHovered(false);
+    this->SetBorderColor(border_color);
     this->SetTextColor(StateColor(
         std::pair(wxColour(clr_arr[5]), (int)StateColor::Disabled),
         std::pair(wxColour(clr_arr[7]), (int)StateColor::Hovered),
diff --git a/src/slic3r/GUI/Widgets/DialogButtons.cpp b/src/slic3r/GUI/Widgets/DialogButtons.cpp
index 4db205eca9..05e3bcbbc1 100644
--- a/src/slic3r/GUI/Widgets/DialogButtons.cpp
+++ b/src/slic3r/GUI/Widgets/DialogButtons.cpp
@@ -5,13 +5,14 @@
 namespace Slic3r { namespace GUI {
 
 // ORCA standardize dialog buttons
-DialogButtons::DialogButtons(wxWindow* parent, std::vector<wxString> non_translated_labels, const wxString& primary_btn_translated_label)
+DialogButtons::DialogButtons(wxWindow* parent, std::vector<wxString> non_translated_labels, const wxString& primary_btn_translated_label, const int left_aligned_buttons_count)
     : wxPanel(parent, wxID_ANY)
 {
     m_parent  = parent;
     m_sizer   = new wxBoxSizer(wxHORIZONTAL);
     m_primary = primary_btn_translated_label;
     m_alert   = wxEmptyString;
+    m_left_aligned_buttons_count = left_aligned_buttons_count;
     SetBackgroundColour(StateColor::darkModeColorFor(wxColour("#FFFFFF")));
 
     // Add all to array
@@ -55,6 +56,13 @@ Button* DialogButtons::GetButtonFromLabel(wxString translated_label) {
     return nullptr;
 }
 
+Button* DialogButtons::GetButtonFromIndex(int index) {
+    if(index >= 0 && index < m_buttons.size())
+        return m_buttons[index];
+    else
+        return nullptr;
+}
+
 Button* DialogButtons::PickFromList(std::set<wxStandardID> ID_list) {
     // Picks first button from given list
     Button* b;
@@ -75,6 +83,8 @@ Button* DialogButtons::GetNO()     {return GetButtonFromID(wxID_NO)      ;}
 Button* DialogButtons::GetCANCEL() {return GetButtonFromID(wxID_CANCEL)  ;}
 Button* DialogButtons::GetRETURN() {return GetButtonFromID(wxID_BACKWARD);} // gets Return button
 Button* DialogButtons::GetNEXT()   {return GetButtonFromID(wxID_FORWARD) ;}
+Button* DialogButtons::GetFIRST()  {return GetButtonFromIndex(0)         ;}
+Button* DialogButtons::GetLAST()   {return GetButtonFromIndex(m_buttons.size() - 1);}
 
 void DialogButtons::SetPrimaryButton(wxString translated_label) {
     // use _L("Create") translated text for custom buttons
@@ -127,25 +137,18 @@ void DialogButtons::UpdateButtons() {
         btn->Bind(wxEVT_KEY_DOWN, &DialogButtons::on_keydown, this);
     }
 
-    int btn_gap = FromDIP(10);
+    int btn_gap = FromDIP(ButtonProps::ChoiceButtonGap());
 
-    auto list = m_left_align_IDs;
-    auto on_left = [list](int id){
-        return list.find(wxStandardID(id)) != list.end();
-    };
-
-    for (Button* btn : m_buttons)  // Left aligned
-        if(on_left(btn->GetId()))
-            m_sizer->Add(btn, 0,  wxLEFT | wxTOP | wxBOTTOM | wxALIGN_CENTER_VERTICAL, btn_gap);
-
-    m_sizer->AddStretchSpacer();
-
-    if(m_sizer->IsEmpty()) // add left margin if no button on left. fixes no gap on small windows
+    if(m_left_aligned_buttons_count == 0)
         m_sizer->AddSpacer(btn_gap);
 
-    for (Button* btn : m_buttons) // Right aligned
-        if(!on_left(btn->GetId()))
-            m_sizer->Add(btn, 0, wxRIGHT | wxTOP | wxBOTTOM | wxALIGN_CENTER_VERTICAL, btn_gap);
+    for (int i = 0; i < m_buttons.size(); i++) {
+        if(m_left_aligned_buttons_count == i)
+            m_sizer->AddStretchSpacer();
+
+        auto margin_to = (i >= m_left_aligned_buttons_count ? wxRIGHT : wxLEFT);
+        m_sizer->Add(m_buttons[i], 0, margin_to | wxTOP | wxBOTTOM | wxALIGN_CENTER_VERTICAL, btn_gap);
+    }
 
     SetPrimaryButton(m_primary);
     SetAlertButton(m_alert);
@@ -158,6 +161,11 @@ int DialogButtons::FromDIP(int d) {
     return m_parent->FromDIP(d);
 }
 
+void DialogButtons::SetLeftAlignedButtonsCount(int left_aligned_buttons_count){
+    m_left_aligned_buttons_count = left_aligned_buttons_count;
+    UpdateButtons();
+}
+
 // This might be helpful for future use
 
 // Append Button
diff --git a/src/slic3r/GUI/Widgets/DialogButtons.hpp b/src/slic3r/GUI/Widgets/DialogButtons.hpp
index df80e8aee3..d03a1dfd47 100644
--- a/src/slic3r/GUI/Widgets/DialogButtons.hpp
+++ b/src/slic3r/GUI/Widgets/DialogButtons.hpp
@@ -16,7 +16,7 @@ namespace Slic3r { namespace GUI {
 class DialogButtons  : public wxPanel{
 public:
 
-    DialogButtons(wxWindow* parent, std::vector<wxString> non_translated_labels, const wxString& primary_btn_label = "");
+    DialogButtons(wxWindow* parent, std::vector<wxString> non_translated_labels, const wxString& primary_btn_label = "",  const int left_aligned_buttons_count = 0);
 
     wxBoxSizer* GetSizer() const { return m_sizer; }
 
@@ -24,6 +24,8 @@ public:
 
     Button* GetButtonFromLabel(wxString label);
 
+    Button* GetButtonFromIndex(int index);
+
     Button* GetOK();
     Button* GetYES();
     Button* GetAPPLY();
@@ -32,11 +34,15 @@ public:
     Button* GetCANCEL();
     Button* GetRETURN();
     Button* GetNEXT();
+    Button* GetFIRST();
+    Button* GetLAST();
 
     void SetPrimaryButton(wxString label);
 
     void SetAlertButton(wxString label);
 
+    void SetLeftAlignedButtonsCount(int left_aligned_buttons_count);
+
     void UpdateButtons();
 
     ~DialogButtons();
@@ -47,6 +53,7 @@ private:
     std::vector<Button*> m_buttons;
     wxString             m_primary;
     wxString             m_alert;
+    int                  m_left_aligned_buttons_count;
 
     // missing ones Transfer / Update / Create
     const std::map<wxString, wxStandardID> m_standardIDs = {
@@ -106,12 +113,6 @@ private:
         wxID_EXIT
     };
 
-    std::set<wxStandardID> m_left_align_IDs {
-        wxID_DELETE,
-        wxID_BACKWARD,
-        wxID_FORWARD
-    };
-
     Button* PickFromList(std::set<wxStandardID> ID_list);
 
     int  FromDIP(int d);
diff --git a/src/slic3r/GUI/Widgets/StateColor.cpp b/src/slic3r/GUI/Widgets/StateColor.cpp
index a3de868aa4..d400f53de6 100644
--- a/src/slic3r/GUI/Widgets/StateColor.cpp
+++ b/src/slic3r/GUI/Widgets/StateColor.cpp
@@ -14,6 +14,7 @@ static std::map<wxColour, wxColour> gDarkColors{
     {"#DFDFDF", "#3E3E45"}, // rgb(223, 223, 223)  Button Background color
     {"#D4D4D4", "#4D4D54"}, // rgb(212, 212, 212)  Button Background color on Hover
     {"#6B6A6A", "#909090"}, // rgb(107, 107, 106)  Button Dimmed text
+    {"#26A69A", "#008172"}, // rgb(0, 150, 136)    Button Confirm Color hover | ORCA Color Hover
     {"#6B6B6A", "#B3B3B5"}, // rgb(107, 107, 106)  Input box side text
     {"#2C2C2E", "#B3B3B4"}, // rgb(44, 44, 46)     ???
     {"#6B6B6B", "#818183"}, // rgb(107, 107, 107)  Disabled Text
diff --git a/src/slic3r/GUI/calib_dlg.cpp b/src/slic3r/GUI/calib_dlg.cpp
index 8dd338f88e..24eb46b4a5 100644
--- a/src/slic3r/GUI/calib_dlg.cpp
+++ b/src/slic3r/GUI/calib_dlg.cpp
@@ -284,6 +284,19 @@ void PA_Calibration_Dlg::on_start(wxCommandEvent& event) {
     ParseStringValues(m_tiBMAccels->GetTextCtrl()->GetValue().ToStdString(), m_params.accelerations);
     ParseStringValues(m_tiBMSpeeds->GetTextCtrl()->GetValue().ToStdString(), m_params.speeds);
 
+    if (!m_params.accelerations.empty() && !m_params.speeds.empty()) {
+        // Guard against swapped inputs by ensuring acceleration magnitudes exceed speeds.
+        const double min_accel = *std::min_element(m_params.accelerations.begin(), m_params.accelerations.end());
+        const double max_speed = *std::max_element(m_params.speeds.begin(), m_params.speeds.end());
+        if (min_accel <= max_speed) {
+            MessageDialog msg_dlg(nullptr,
+                _L("Acceleration values must be greater than speed values.\nPlease verify the inputs."),
+                wxEmptyString, wxICON_WARNING | wxOK);
+            msg_dlg.ShowModal();
+            return;
+        }
+    }
+
     m_plater->calib_pa(m_params);
     EndModal(wxID_OK);
 
diff --git a/src/slic3r/Utils/Http.cpp b/src/slic3r/Utils/Http.cpp
index bcb9dda915..e10115b1f7 100644
--- a/src/slic3r/Utils/Http.cpp
+++ b/src/slic3r/Utils/Http.cpp
@@ -189,7 +189,6 @@ Http::priv::priv(const std::string &url)
 #ifdef __WINDOWS__
 	::curl_easy_setopt(curl, CURLOPT_SSLVERSION, CURL_SSLVERSION_MAX_TLSv1_2);
 #endif
-	::curl_easy_setopt(curl, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);
 	::curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L);
 	::curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0L);
 
diff --git a/tests/libslic3r/test_placeholder_parser.cpp b/tests/libslic3r/test_placeholder_parser.cpp
index 2394aad4bf..93c848b3a2 100644
--- a/tests/libslic3r/test_placeholder_parser.cpp
+++ b/tests/libslic3r/test_placeholder_parser.cpp
@@ -14,40 +14,22 @@ SCENARIO("Placeholder parser scripting", "[PlaceholderParser]") {
 	    { "nozzle_diameter", "0.6;0.6;0.6;0.6" },
 	    { "nozzle_temperature", "357;359;363;378" }
 	});
-    // To let the PlaceholderParser throw when referencing initial_layer_line_width if it is set to percent, as the PlaceholderParser does not know
+    // To test the "min_width_top_surface" over "inner_wall_line_width".
+    config.option<ConfigOptionFloatOrPercent>("inner_wall_line_width")->value = 150.;
+    config.option<ConfigOptionFloatOrPercent>("inner_wall_line_width")->percent = true;
+    // To let the PlaceholderParser throw when referencing scarf_joint_speed if it is set to percent, as the PlaceholderParser does not know
     // a percent to what.
-    config.option<ConfigOptionFloatOrPercent>("initial_layer_line_width")->value = 50.;
-    config.option<ConfigOptionFloatOrPercent>("initial_layer_line_width")->percent = true;
+    config.option<ConfigOptionFloatOrPercent>("scarf_joint_speed")->value = 50.;
+    config.option<ConfigOptionFloatOrPercent>("scarf_joint_speed")->percent = true;
 
     parser.apply_config(config);
     parser.set("foo", 0);
     parser.set("bar", 2);
     parser.set("num_extruders", 4);
 
-    SECTION("nested config options (legacy syntax)") { REQUIRE(parser.process("[nozzle_temperature_[foo]]") == "357"); }
+    SECTION("nested config options (legacy syntax)") { REQUIRE(parser.process("[nozzle_temperature[foo]]") == "357"); }
     SECTION("array reference") { REQUIRE(parser.process("{nozzle_temperature[foo]}") == "357"); }
-    SECTION("whitespaces and newlines are maintained") { REQUIRE(parser.process("test [ nozzle_temperature_ [foo] ] \n hu") == "test 357 \n hu"); }
-
-    // Test the "coFloatOrPercent" and "xxx_width" substitutions.
-
-    // FIXME: Don't know what exactly this referred to in Prusaslicer or
-    // whether it should apply to Orca or not.
-    // {outer_wall_line_width} returns as its default value, 0.
-    // SECTION("outer_wall_line_width") { REQUIRE(std::stod(parser.process("{outer_wall_line_width}")) == Catch::Approx(0.67500001192092896)); }
-    SECTION("support_object_xy_distance") { REQUIRE(std::stod(parser.process("{support_object_xy_distance}")) == Catch::Approx(0.35)); }
-    // initial_layer_line_width ratio over nozzle_diameter.
-    // FIXME: either something else which correctly calculates a ratio should be here,
-    // or something else should be found for for the REQUIRE_THROWS
-    // SECTION("initial_layer_line_width") { REQUIRE(std::stod(parser.process("{initial_layer_line_width}")) == Catch::Approx(0.9)); }
-    // small_perimeter_speed ratio over outer_wall_speed
-    SECTION("small_perimeter_speed") { REQUIRE(std::stod(parser.process("{small_perimeter_speed}")) == Catch::Approx(30.)); }
-    // infill_wall_overlap over inner_wall_line_width
-    // FIXME: Shouldn't this return the calculated value and not the percentage 15?
-    // SECTION("infill_wall_overlap") { REQUIRE(std::stod(parser.process("{infill_wall_overlap}")) == Catch::Approx(0.16875)); }
-
-    // If initial_layer_line_width is set to percent, then it is applied over respective extrusion types by overriding their respective speeds.
-    // The PlaceholderParser has no way to know which extrusion type the caller has in mind, therefore it throws.
-    SECTION("initial_layer_line_width throws failed to resolve the ratio_over dependencies") { REQUIRE_THROWS(parser.process("{initial_layer_line_width}")); }
+    SECTION("whitespaces and newlines are maintained") { REQUIRE(parser.process("test [ nozzle_temperature [foo] ] \n hu") == "test 357 \n hu"); }
 
     // Test the math expressions.
     SECTION("math: 2*3") { REQUIRE(parser.process("{2*3}") == "6"); }
@@ -84,6 +66,20 @@ SCENARIO("Placeholder parser scripting", "[PlaceholderParser]") {
     SECTION("math: interpolate_table(13, (0, 0), (20, 20), (30, 20))") { REQUIRE(std::stod(parser.process("{interpolate_table(13, (0, 0), (20, 20), (30, 20))}")) == Catch::Approx(13.)); }
     SECTION("math: interpolate_table(25, (0, 0), (20, 20), (30, 20))") { REQUIRE(std::stod(parser.process("{interpolate_table(25, (0, 0), (20, 20), (30, 20))}")) == Catch::Approx(20.)); }
 
+    // Test the "coFloatOrPercent" and "xxx_line_width" substitutions.
+    // min_width_top_surface ratio_over inner_wall_line_width.
+    SECTION("line_width") { REQUIRE(std::stod(parser.process("{line_width}")) == Catch::Approx(0.67500001192092896)); }
+    SECTION("min_width_top_surface") { REQUIRE(std::stod(parser.process("{min_width_top_surface}")) == Catch::Approx(2.7)); }
+    // Orca: this one is not coFloatOrPercent
+    //SECTION("support_object_xy_distance") { REQUIRE(std::stod(parser.process("{support_object_xy_distance}")) == Catch::Approx(0.3375)); }
+    // small_perimeter_speed over outer_wall_speed
+    SECTION("small_perimeter_speed") { REQUIRE(std::stod(parser.process("{small_perimeter_speed}")) == Catch::Approx(30.)); }
+    // infill_anchor over sparse_infill_line_width
+    SECTION("infill_anchor") { REQUIRE(std::stod(parser.process("{infill_anchor}")) == Catch::Approx(2.7)); }
+    // If scarf_joint_speed is set to percent, then it is applied over respective extrusion types by overriding their respective speeds.
+    // The PlaceholderParser has no way to know which extrusion type the caller has in mind, therefore it throws.
+    SECTION("scarf_joint_speed") { REQUIRE_THROWS(parser.process("{scarf_joint_speed}")); }
+
     // Test the boolean expression parser.
     auto boolean_expression = [&parser](const std::string& templ) { return parser.evaluate_boolean_expression(templ, parser.config()); };
 
@@ -116,3 +112,131 @@ SCENARIO("Placeholder parser scripting", "[PlaceholderParser]") {
     SECTION("complex expression2") { REQUIRE(boolean_expression("printer_notes=~/.*PRINTER_VEwerfNDOR_PRUSA3D.*/ or printer_notes=~/.*PRINTertER_MODEL_MK2.*/ or (nozzle_diameter[0]==0.6 and num_extruders>1)")); }
     SECTION("complex expression3") { REQUIRE(! boolean_expression("printer_notes=~/.*PRINTER_VEwerfNDOR_PRUSA3D.*/ or printer_notes=~/.*PRINTertER_MODEL_MK2.*/ or (nozzle_diameter[0]==0.3 and num_extruders>1)")); }
 }
+
+SCENARIO("Placeholder parser variables", "[PlaceholderParser]") {
+    PlaceholderParser 	parser;
+    auto 				config = DynamicPrintConfig::full_print_config();
+
+    config.set_deserialize_strict({
+        { "filament_notes", "testnotes" },
+        { "enable_pressure_advance", "1" },
+        { "nozzle_diameter", "0.6;0.6;0.6;0.6" },
+        { "nozzle_temperature", "357;359;363;378" }
+        });
+
+    PlaceholderParser::ContextData context_with_global_dict;
+    context_with_global_dict.global_config = std::make_unique<DynamicConfig>();
+
+    SECTION("create an int local variable") { REQUIRE(parser.process("{local myint = 33+2}{myint}", 0, nullptr, nullptr, nullptr) == "35"); }
+    SECTION("create a string local variable") { REQUIRE(parser.process("{local mystr = \"mine\" + \"only\" + \"mine\"}{mystr}", 0, nullptr, nullptr, nullptr) == "mineonlymine"); }
+    SECTION("create a bool local variable") { REQUIRE(parser.process("{local mybool = 1 + 1 == 2}{mybool}", 0, nullptr, nullptr, nullptr) == "true"); }
+    SECTION("create an int global variable") { REQUIRE(parser.process("{global myint = 33+2}{myint}", 0, nullptr, nullptr, &context_with_global_dict) == "35"); }
+    SECTION("create a string global variable") { REQUIRE(parser.process("{global mystr = \"mine\" + \"only\" + \"mine\"}{mystr}", 0, nullptr, nullptr, &context_with_global_dict) == "mineonlymine"); }
+    SECTION("create a bool global variable") { REQUIRE(parser.process("{global mybool = 1 + 1 == 2}{mybool}", 0, nullptr, nullptr, &context_with_global_dict) == "true"); }
+
+    SECTION("create an int local variable and overwrite it") { REQUIRE(parser.process("{local myint = 33+2}{myint = 12}{myint}", 0, nullptr, nullptr, nullptr) == "12"); }
+    SECTION("create a string local variable and overwrite it") { REQUIRE(parser.process("{local mystr = \"mine\" + \"only\" + \"mine\"}{mystr = \"yours\"}{mystr}", 0, nullptr, nullptr, nullptr) == "yours"); }
+    SECTION("create a bool local variable and overwrite it") { REQUIRE(parser.process("{local mybool = 1 + 1 == 2}{mybool = false}{mybool}", 0, nullptr, nullptr, nullptr) == "false"); }
+    SECTION("create an int global variable and overwrite it") { REQUIRE(parser.process("{global myint = 33+2}{myint = 12}{myint}", 0, nullptr, nullptr, &context_with_global_dict) == "12"); }
+    SECTION("create a string global variable and overwrite it") { REQUIRE(parser.process("{global mystr = \"mine\" + \"only\" + \"mine\"}{mystr = \"yours\"}{mystr}", 0, nullptr, nullptr, &context_with_global_dict) == "yours"); }
+    SECTION("create a bool global variable and overwrite it") { REQUIRE(parser.process("{global mybool = 1 + 1 == 2}{mybool = false}{mybool}", 0, nullptr, nullptr, &context_with_global_dict) == "false"); }
+
+    SECTION("create an int local variable and redefine it") { REQUIRE(parser.process("{local myint = 33+2}{local myint = 12}{myint}", 0, nullptr, nullptr, nullptr) == "12"); }
+    SECTION("create a string local variable and redefine it") { REQUIRE(parser.process("{local mystr = \"mine\" + \"only\" + \"mine\"}{local mystr = \"yours\"}{mystr}", 0, nullptr, nullptr, nullptr) == "yours"); }
+    SECTION("create a bool local variable and redefine it") { REQUIRE(parser.process("{local mybool = 1 + 1 == 2}{local mybool = false}{mybool}", 0, nullptr, nullptr, nullptr) == "false"); }
+    SECTION("create an int global variable and redefine it") { REQUIRE(parser.process("{global myint = 33+2}{global myint = 12}{myint}", 0, nullptr, nullptr, &context_with_global_dict) == "12"); }
+    SECTION("create a string global variable and redefine it") { REQUIRE(parser.process("{global mystr = \"mine\" + \"only\" + \"mine\"}{global mystr = \"yours\"}{mystr}", 0, nullptr, nullptr, &context_with_global_dict) == "yours"); }
+    SECTION("create a bool global variable and redefine it") { REQUIRE(parser.process("{global mybool = 1 + 1 == 2}{global mybool = false}{mybool}", 0, nullptr, nullptr, &context_with_global_dict) == "false"); }
+
+    SECTION("create an ints local variable with repeat()") { REQUIRE(parser.process("{local myint = repeat(2*3, 4*6)}{myint[5]}", 0, nullptr, nullptr, nullptr) == "24"); }
+    SECTION("create a strings local variable with repeat()") { REQUIRE(parser.process("{local mystr = repeat(2*3, \"mine\" + \"only\" + \"mine\")}{mystr[5]}", 0, nullptr, nullptr, nullptr) == "mineonlymine"); }
+    SECTION("create a bools local variable with repeat()") { REQUIRE(parser.process("{local mybool = repeat(5, 1 + 1 == 2)}{mybool[4]}", 0, nullptr, nullptr, nullptr) == "true"); }
+    SECTION("create an ints global variable with repeat()") { REQUIRE(parser.process("{global myint = repeat(2*3, 4*6)}{myint[5]}", 0, nullptr, nullptr, &context_with_global_dict) == "24"); }
+    SECTION("create a strings global variable with repeat()") { REQUIRE(parser.process("{global mystr = repeat(2*3, \"mine\" + \"only\" + \"mine\")}{mystr[5]}", 0, nullptr, nullptr, &context_with_global_dict) == "mineonlymine"); }
+    SECTION("create a bools global variable with repeat()") { REQUIRE(parser.process("{global mybool = repeat(5, 1 + 1 == 2)}{mybool[4]}", 0, nullptr, nullptr, &context_with_global_dict) == "true"); }
+
+    SECTION("create an ints local variable with initializer list") { REQUIRE(parser.process("{local myint = (2*3, 4*6, 5*5)}{myint[1]}", 0, nullptr, nullptr, nullptr) == "24"); }
+    SECTION("create a strings local variable with initializer list") { REQUIRE(parser.process("{local mystr = (2*3, \"mine\" + \"only\" + \"mine\", 8)}{mystr[1]}", 0, nullptr, nullptr, nullptr) == "mineonlymine"); }
+    SECTION("create a bools local variable with initializer list") { REQUIRE(parser.process("{local mybool = (3*3 == 8, 1 + 1 == 2)}{mybool[1]}", 0, nullptr, nullptr, nullptr) == "true"); }
+    SECTION("create an ints global variable with initializer list") { REQUIRE(parser.process("{global myint = (2*3, 4*6, 5*5)}{myint[1]}", 0, nullptr, nullptr, &context_with_global_dict) == "24"); }
+    SECTION("create a strings global variable with initializer list") { REQUIRE(parser.process("{global mystr = (2*3, \"mine\" + \"only\" + \"mine\", 8)}{mystr[1]}", 0, nullptr, nullptr, &context_with_global_dict) == "mineonlymine"); }
+    SECTION("create a bools global variable with initializer list") { REQUIRE(parser.process("{global mybool = (2*3 == 8, 1 + 1 == 2, 5*5 != 33)}{mybool[1]}", 0, nullptr, nullptr, &context_with_global_dict) == "true"); }
+
+    SECTION("create an ints local variable by a copy") { REQUIRE(parser.process("{local myint = nozzle_temperature}{myint[0]}", 0, &config, nullptr, nullptr) == "357"); }
+    SECTION("create a strings local variable by a copy") { REQUIRE(parser.process("{local mystr = filament_notes}{mystr[0]}", 0, &config, nullptr, nullptr) == "testnotes"); }
+    SECTION("create a bools local variable by a copy") { REQUIRE(parser.process("{local mybool = enable_pressure_advance}{mybool[0]}", 0, &config, nullptr, nullptr) == "true"); }
+    SECTION("create an ints global variable by a copy") { REQUIRE(parser.process("{global myint = nozzle_temperature}{myint[0]}", 0, &config, nullptr, &context_with_global_dict) == "357"); }
+    SECTION("create a strings global variable by a copy") { REQUIRE(parser.process("{global mystr = filament_notes}{mystr[0]}", 0, &config, nullptr, &context_with_global_dict) == "testnotes"); }
+    SECTION("create a bools global variable by a copy") { REQUIRE(parser.process("{global mybool = enable_pressure_advance}{mybool[0]}", 0, &config, nullptr, &context_with_global_dict) == "true"); }
+
+    SECTION("create an ints local variable by a copy and overwrite it") {
+        REQUIRE(parser.process("{local myint = nozzle_temperature}{myint = repeat(2*3, 4*6)}{myint[5]}", 0, &config, nullptr, nullptr) == "24");
+        REQUIRE(parser.process("{local myint = nozzle_temperature}{myint = (2*3, 4*6)}{myint[1]}", 0, &config, nullptr, nullptr) == "24");
+        REQUIRE(parser.process("{local myint = nozzle_temperature}{myint = (1)}{myint = nozzle_temperature}{myint[0]}", 0, &config, nullptr, nullptr) == "357");
+    }
+    SECTION("create a strings local variable by a copy and overwrite it") {
+        REQUIRE(parser.process("{local mystr = filament_notes}{mystr = repeat(2*3, \"mine\" + \"only\" + \"mine\")}{mystr[5]}", 0, &config, nullptr, nullptr) == "mineonlymine");
+        REQUIRE(parser.process("{local mystr = filament_notes}{mystr = (2*3, \"mine\" + \"only\" + \"mine\")}{mystr[1]}", 0, &config, nullptr, nullptr) == "mineonlymine");
+        REQUIRE(parser.process("{local mystr = filament_notes}{mystr = (2*3, \"mine\" + \"only\" + \"mine\")}{mystr = filament_notes}{mystr[0]}", 0, &config, nullptr, nullptr) == "testnotes");
+    }
+    SECTION("create a bools local variable by a copy and overwrite it") {
+        REQUIRE(parser.process("{local mybool = enable_pressure_advance}{mybool = repeat(2*3, true)}{mybool[5]}", 0, &config, nullptr, nullptr) == "true");
+        REQUIRE(parser.process("{local mybool = enable_pressure_advance}{mybool = (false, true)}{mybool[1]}", 0, &config, nullptr, nullptr) == "true");
+        REQUIRE(parser.process("{local mybool = enable_pressure_advance}{mybool = (false, false)}{mybool = enable_pressure_advance}{mybool[0]}", 0, &config, nullptr, nullptr) == "true");
+    }
+
+    SECTION("size() of a non-empty vector returns the right size") { REQUIRE(parser.process("{local myint = (0, 1, 2, 3)}{size(myint)}", 0, nullptr, nullptr, nullptr) == "4"); }
+    SECTION("size() of a an empty vector returns the right size") { REQUIRE(parser.process("{local myint = (0);myint=();size(myint)}", 0, nullptr, nullptr, nullptr) == "0"); }
+    SECTION("empty() of a non-empty vector returns false") { REQUIRE(parser.process("{local myint = (0, 1, 2, 3)}{empty(myint)}", 0, nullptr, nullptr, nullptr) == "false"); }
+    SECTION("empty() of a an empty vector returns true") { REQUIRE(parser.process("{local myint = (0);myint=();empty(myint)}", 0, nullptr, nullptr, nullptr) == "true"); }
+
+    SECTION("nested if with new variables") {
+        std::string script =
+            "{if 1 == 1}{local myints = (5, 4, 3, 2, 1)}{else}{local myfloats = (1., 2., 3., 4., 5., 6., 7.)}{endif}"
+            "{myints[1]},{size(myints)}";
+        REQUIRE(parser.process(script, 0, nullptr, nullptr, nullptr) == "4,5");
+    }
+    SECTION("nested if with new variables 2") {
+        std::string script =
+            "{if 1 == 0}{local myints = (5, 4, 3, 2, 1)}{else}{local myfloats = (1., 2., 3., 4., 5., 6., 7.)}{endif}"
+            "{size(myfloats)}";
+        REQUIRE(parser.process(script, 0, nullptr, nullptr, nullptr) == "7");
+    }
+    SECTION("nested if with new variables 2, mixing }{ with ;") {
+        std::string script =
+            "{if 1 == 0 then local myints = (5, 4, 3, 2, 1);else;local myfloats = (1., 2., 3., 4., 5., 6., 7.);endif}"
+            "{size(myfloats)}";
+        REQUIRE(parser.process(script, 0, nullptr, nullptr, nullptr) == "7");
+    }
+    SECTION("nested if with new variables, two level") {
+        std::string script =
+            "{if 1 == 1}{if 2 == 3}{nejaka / haluz}{else}{local myints = (6, 5, 4, 3, 2, 1)}{endif}{else}{if zase * haluz}{else}{local myfloats = (1., 2., 3., 4., 5., 6., 7.)}{endif}{endif}"
+            "{size(myints)}";
+        REQUIRE(parser.process(script, 0, nullptr, nullptr, nullptr) == "6");
+    }
+    SECTION("if with empty block and ;") {
+        std::string script =
+            "{if false then else;local myfloats = (1., 2., 3., 4., 5., 6., 7.);endif}"
+            "{size(myfloats)}";
+        REQUIRE(parser.process(script, 0, nullptr, nullptr, nullptr) == "7");
+    }
+    SECTION("nested if with new variables, two level, mixing }{ with ;") {
+        std::string script =
+            "{if 1 == 1 then if 2 == 3}nejaka / haluz{else local myints = (6, 5, 4, 3, 2, 1) endif else if zase * haluz then else local myfloats = (1., 2., 3., 4., 5., 6., 7.) endif endif}"
+            "{size(myints)}";
+        REQUIRE(parser.process(script, 0, nullptr, nullptr, nullptr) == "6");
+    }
+    SECTION("nested if with new variables, two level, mixing }{ with ; 2") {
+        std::string script =
+            "{if 1 == 1 then if 2 == 3 then nejaka / haluz else}{local myints = (6, 5, 4, 3, 2, 1)}{endif else if zase * haluz then else local myfloats = (1., 2., 3., 4., 5., 6., 7.) endif endif}"
+            "{size(myints)}";
+        REQUIRE(parser.process(script, 0, nullptr, nullptr, nullptr) == "6");
+    }
+    SECTION("nested if with new variables, two level, mixing }{ with ; 3") {
+        std::string script =
+            "{if 1 == 1 then if 2 == 3 then nejaka / haluz else}{local myints = (6, 5, 4, 3, 2, 1)}{endif else}{if zase * haluz}{else local myfloats = (1., 2., 3., 4., 5., 6., 7.) endif}{endif}"
+            "{size(myints)}";
+        REQUIRE(parser.process(script, 0, nullptr, nullptr, nullptr) == "6");
+    }
+    SECTION("if else completely empty") { REQUIRE(parser.process("{if false then elsif false then else endif}", 0, nullptr, nullptr, nullptr) == ""); }
+}