diff --git a/resources/images/param_raft.svg b/resources/images/param_raft.svg
new file mode 100644
index 00000000000..d58506d2ca9
--- /dev/null
+++ b/resources/images/param_raft.svg
@@ -0,0 +1,5 @@
+<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="1.56567" y="1.61401" width="10.8689" height="8.39195" stroke="#262E30" stroke-width="0.5"/>
+<path d="M12.2944 10.256L11.666 10.7378C11.3101 11.0107 10.8133 11.0031 10.4658 10.7196V10.7196C10.1299 10.4454 9.65269 10.4283 9.29799 10.6775L9.12471 10.7993C8.77972 11.0418 8.31973 11.0418 7.97474 10.7993L7.7173 10.6184C7.40221 10.397 6.98795 10.3761 6.65224 10.5649L6.06592 10.8945C5.73021 11.0833 5.31595 11.0624 5.00086 10.841L4.74342 10.6601C4.39843 10.4176 3.93843 10.4176 3.59345 10.6601L3.43481 10.7716C3.07078 11.0274 2.58151 11.0119 2.23435 10.7337L1.63848 10.256" stroke="#262E30" stroke-width="0.5" stroke-linecap="round" stroke-linejoin="round"/>
+<rect x="1.56567" y="11.4534" width="10.8689" height="0.932677" fill="#ACACAC" stroke="#262E30" stroke-width="0.5"/>
+</svg>
diff --git a/resources/images/param_support_filament.svg b/resources/images/param_support_filament.svg
index ab63b5934ff..6abc4ff22e7 100644
--- a/resources/images/param_support_filament.svg
+++ b/resources/images/param_support_filament.svg
@@ -1,17 +1,6 @@
-<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_8074_35927)">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M1.15944 7.15506C1.27903 6.96932 1.52656 6.9157 1.7123 7.03529L3.26526 8.03522C3.66548 8.29291 3.90734 8.73631 3.90734 9.21232V11.3179C3.90734 11.5389 3.72825 11.7179 3.50734 11.7179C3.28643 11.7179 3.10734 11.5389 3.10734 11.3179V9.21232C3.10734 9.00831 3.00368 8.81829 2.83216 8.70784L1.2792 7.70792C1.09346 7.58832 1.03984 7.3408 1.15944 7.15506Z" fill="#262E30"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M4.25221 8.88174C4.37181 8.696 4.61933 8.64238 4.80507 8.76198L6.35803 9.7619C6.75825 10.0196 7.00011 10.463 7.00011 10.939V13.0446C7.00011 13.2655 6.82103 13.4446 6.60011 13.4446C6.3792 13.4446 6.20011 13.2655 6.20011 13.0446V10.939C6.20011 10.735 6.09646 10.545 5.92493 10.4345L4.37198 9.4346C4.18624 9.31501 4.13262 9.06748 4.25221 8.88174Z" fill="#262E30"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M11.2265 5.08779C11.3499 4.90456 11.5985 4.85606 11.7818 4.97946L12.9826 5.78822C13.3689 6.0484 13.6006 6.48366 13.6006 6.94943V8.9617C13.6006 9.45825 13.3376 9.91764 12.9094 10.169L7.16703 13.5401C6.73365 13.7946 6.19717 13.7972 5.76132 13.547L1.10297 10.8732C0.668082 10.6236 0.399902 10.1605 0.399902 9.65902V7.68977C0.399902 7.22168 0.633834 6.78457 1.0233 6.52491L1.68397 6.08445C1.86778 5.9619 2.11613 6.01157 2.23868 6.19538C2.36122 6.37919 2.31155 6.62753 2.12775 6.75008L1.46707 7.19055C1.30016 7.30183 1.1999 7.48916 1.1999 7.68977V9.65902C1.1999 9.87392 1.31484 10.0724 1.50122 10.1794L6.15957 12.8532C6.34636 12.9604 6.57628 12.9593 6.76201 12.8502L12.5043 9.47913C12.6879 9.37139 12.8006 9.17451 12.8006 8.9617V6.94943C12.8006 6.74982 12.7013 6.56327 12.5357 6.45177L11.3349 5.64301C11.1516 5.51961 11.1031 5.27103 11.2265 5.08779Z" fill="#262E30"/>
-<path d="M2.90218 8.16383C2.68141 8.04207 2.50146 7.73214 2.50146 7.47585V5.24162C2.50146 4.98534 2.67975 4.672 2.89718 4.54513L8.81046 1.09843C9.0279 0.971565 9.38696 0.966456 9.60773 1.08821L11.5497 2.15424C11.7704 2.27515 11.9512 2.58423 11.9512 2.84051V5.09603C11.9512 5.35231 11.7729 5.6665 11.5555 5.79422L5.67221 9.24603C5.45477 9.37375 5.09654 9.37801 4.87577 9.25625L2.90218 8.16383Z" fill="#CECECE"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M9.21324 1.40006C9.11854 1.40131 9.04659 1.42383 9.01214 1.44393L3.09886 4.89063C3.09884 4.89065 3.09889 4.89061 3.09886 4.89063C3.06632 4.90965 3.01243 4.96018 2.96563 5.04251C2.91902 5.12453 2.90156 5.19915 2.90156 5.24163V7.47585C2.90156 7.5172 2.91873 7.58983 2.96486 7.66912C3.01125 7.74885 3.06419 7.79633 3.09546 7.81357L5.06905 8.90599C5.06909 8.90601 5.069 8.90597 5.06905 8.90599C5.10409 8.92527 5.17631 8.94591 5.27032 8.94473C5.3645 8.94355 5.43569 8.92112 5.46972 8.90113L11.353 5.44932C11.3859 5.42999 11.44 5.37893 11.487 5.29605C11.5338 5.21354 11.5513 5.13858 11.5513 5.09603V2.84052C11.5513 2.79964 11.5342 2.7275 11.4881 2.6486C11.4417 2.56928 11.3887 2.52212 11.3576 2.50508L9.41534 1.43886C9.38078 1.4198 9.30798 1.3988 9.21324 1.40006ZM9.80069 0.737786C9.61455 0.63522 9.39687 0.597554 9.20264 0.600129C9.00831 0.602704 8.79208 0.646156 8.60913 0.752857C8.60918 0.752827 8.60908 0.752886 8.60913 0.752857L2.69585 4.19956C2.51095 4.30744 2.3668 4.47713 2.27013 4.64719C2.17325 4.81763 2.10156 5.02782 2.10156 5.24163V7.47585C2.10156 7.6908 2.17437 7.90127 2.2734 8.07147C2.3721 8.24108 2.51937 8.40932 2.70867 8.51385C2.70852 8.51377 2.70881 8.51393 2.70867 8.51385L4.68216 9.60622C4.86793 9.70867 5.08581 9.7471 5.28035 9.74467C5.47478 9.74223 5.69135 9.6987 5.87472 9.59104C5.87467 9.59107 5.87478 9.591 5.87472 9.59104L11.758 6.13923C11.9425 6.03084 12.0864 5.86085 12.183 5.69063C12.2797 5.52005 12.3513 5.30977 12.3513 5.09603V2.84052C12.3513 2.62511 12.278 2.41456 12.1786 2.24462C12.0794 2.07516 11.9316 1.90737 11.7421 1.8035C11.7421 1.80353 11.742 1.80347 11.7421 1.8035L9.80069 0.737786C9.80058 0.737728 9.80079 0.737843 9.80069 0.737786Z" fill="#262E30"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M11.7859 2.41034C11.9001 2.59942 11.8395 2.84531 11.6504 2.95956L5.90623 6.4301C5.71714 6.54434 5.47125 6.48367 5.35701 6.29459C5.24277 6.1055 5.30344 5.85961 5.49252 5.74537L11.2367 2.27483C11.4258 2.16059 11.6717 2.22126 11.7859 2.41034Z" fill="#262E30"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M13.157 6.47284C13.2712 6.66192 13.2106 6.90781 13.0215 7.02206L7.27732 10.4926C7.08824 10.6068 6.84235 10.5462 6.72811 10.3571C6.61387 10.168 6.67454 9.92211 6.86362 9.80787L12.6078 6.33733C12.7969 6.22309 13.0428 6.28376 13.157 6.47284Z" fill="#262E30"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M2.98561 4.83728C3.10521 4.65154 3.35273 4.59792 3.53847 4.71751L5.09143 5.71744C5.49165 5.97513 5.73351 6.41853 5.73351 6.89454V9.00017C5.73351 9.22108 5.55443 9.40017 5.33351 9.40017C5.1126 9.40017 4.93351 9.22108 4.93351 9.00017V6.89454C4.93351 6.69053 4.82986 6.50051 4.65833 6.39007L3.10538 5.39014C2.91963 5.27055 2.86601 5.02302 2.98561 4.83728Z" fill="#262E30"/>
-</g>
-<defs>
-<clipPath id="clip0_8074_35927">
-<rect width="14" height="14" fill="white"/>
-</clipPath>
-</defs>
+<svg width="14" height="15" viewBox="0 0 14 15" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.5926 11.7856C8.45601 12.019 8.27388 12.159 8.11451 12.159C7.45429 12.159 6.93066 10.2452 6.93066 7.88795C6.93066 5.53069 7.45429 3.61688 8.11451 3.61688C8.27388 3.61688 8.43324 3.73358 8.56984 3.94363" stroke="#262E30" stroke-width="0.5" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M6.34602 11.676C6.20942 11.9094 6.02729 12.0494 5.86793 12.0494C5.20771 12.0494 4.68408 10.1356 4.68408 7.77833C4.68408 5.42107 5.20771 3.50726 5.86793 3.50726C6.02729 3.50726 6.18666 3.62396 6.32326 3.83401" stroke="#262E30" stroke-width="0.5" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M10.6658 12.9518C11.4328 12.9518 12.0546 10.6843 12.0546 7.88723C12.0546 5.09013 11.4328 2.82263 10.6658 2.82263C9.89886 2.82263 9.2771 5.09013 9.2771 7.88723C9.2771 10.6843 9.89886 12.9518 10.6658 12.9518Z" fill="#CECECE" stroke="#262E30" stroke-width="0.5" stroke-miterlimit="10"/>
+<path d="M4.15364 11.9949C3.92598 12.5784 3.65278 12.9285 3.33406 12.9285C2.56 12.9285 1.94531 10.6646 1.94531 7.86389C1.94531 5.06319 2.58277 2.82263 3.35682 2.82263C3.67555 2.82263 3.97151 3.2194 4.19918 3.87289" stroke="#262E30" stroke-width="0.5" stroke-miterlimit="10" stroke-linecap="round"/>
 </svg>
diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp
index eabc89fc9e4..1117583ef94 100644
--- a/src/libslic3r/PrintConfig.cpp
+++ b/src/libslic3r/PrintConfig.cpp
@@ -1958,7 +1958,7 @@ void PrintConfigDef::init_fff_params()
     def->tooltip = L("Z gap between object and raft. Ignored for soluble interface");
     def->sidetext = L("mm");
     def->min = 0;
-    def->mode = comDevelop;
+    def->mode = comAdvanced;
     def->set_default_value(new ConfigOptionFloat(0.1));
 
     def = this->add("raft_expansion", coFloat);
@@ -1967,7 +1967,7 @@ void PrintConfigDef::init_fff_params()
     def->tooltip = L("Expand all raft layers in XY plane");
     def->sidetext = L("mm");
     def->min = 0;
-    def->mode = comDevelop;
+    def->mode = comAdvanced;
     def->set_default_value(new ConfigOptionFloat(1.5));
 
     def = this->add("raft_first_layer_density", coPercent);
@@ -1977,7 +1977,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("%");
     def->min = 10;
     def->max = 100;
-    def->mode = comDevelop;
+    def->mode = comAdvanced;
     def->set_default_value(new ConfigOptionPercent(90));
 
     def = this->add("raft_first_layer_expansion", coFloat);
@@ -1986,7 +1986,7 @@ void PrintConfigDef::init_fff_params()
     def->tooltip = L("Expand the first raft or support layer to improve bed plate adhesion");
     def->sidetext = L("mm");
     def->min = 0;
-    def->mode = comDevelop;
+    def->mode = comAdvanced;
     //BBS: change from 3.0 to 2.0
     def->set_default_value(new ConfigOptionFloat(2.0));
 
@@ -1998,7 +1998,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("layers");
     def->min = 0;
     def->max = 100;
-    def->mode = comDevelop;
+    def->mode = comAdvanced;
     def->set_default_value(new ConfigOptionInt(0));
 
     def = this->add("resolution", coFloat);
diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp
index d982775ed8c..34e6223dbcd 100644
--- a/src/slic3r/GUI/Tab.cpp
+++ b/src/slic3r/GUI/Tab.cpp
@@ -1855,6 +1855,11 @@ void TabPrint::build()
         optgroup->append_single_option_line("support_critical_regions_only");
         //optgroup->append_single_option_line("enforce_support_layers");
 
+        optgroup = page->new_optgroup(L("Raft"), L"param_raft");
+        optgroup->append_single_option_line("raft_layers");
+        optgroup->append_single_option_line("raft_first_layer_density");
+        optgroup->append_single_option_line("raft_first_layer_expansion");
+
         optgroup = page->new_optgroup(L("Support filament"), L"param_support_filament");
         optgroup->append_single_option_line("support_filament", "support#support-filament");
         optgroup->append_single_option_line("support_interface_filament", "support#support-filament");
@@ -1893,9 +1898,6 @@ void TabPrint::build()
         optgroup->append_single_option_line("brim_type", "auto-brim");
         optgroup->append_single_option_line("brim_width", "auto-brim#manual");
         optgroup->append_single_option_line("brim_object_gap", "auto-brim#brim-object-gap");
-        optgroup->append_single_option_line("raft_layers");
-        //optgroup->append_single_option_line("raft_first_layer_density");
-        //optgroup->append_single_option_line("raft_first_layer_expansion");
 
         optgroup = page->new_optgroup(L("Prime tower"), L"param_tower");
         optgroup->append_single_option_line("enable_prime_tower");