diff --git a/resources/icons/perimeters_shell.png b/resources/icons/perimeters_shell.png
deleted file mode 100644
index 4ab0be5c0..000000000
Binary files a/resources/icons/perimeters_shell.png and /dev/null differ
diff --git a/resources/icons/shell.svg b/resources/icons/shell.svg
new file mode 100644
index 000000000..ca745af49
--- /dev/null
+++ b/resources/icons/shell.svg
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 16 16"
+   enable-background="new 0 0 16 16"
+   xml:space="preserve"
+   sodipodi:docname="shell.svg"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"><metadata
+     id="metadata34"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs32" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1440"
+     inkscape:window-height="877"
+     id="namedview30"
+     showgrid="false"
+     inkscape:zoom="29.5"
+     inkscape:cx="10.711271"
+     inkscape:cy="6.7095972"
+     inkscape:window-x="1912"
+     inkscape:window-y="282"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1" /><g
+     id="g22"
+     style="stroke:#808080;stroke-opacity:1"><defs
+       id="defs3"><polygon
+         points="2,7.03 2,11.03 8,15.03 14,11.03 14,7.03 14,5.03 8,1.03 2,5.03 "
+         id="SVGID_1_" /></defs><clipPath
+       id="SVGID_2_"><use
+         height="100%"
+         width="100%"
+         y="0"
+         x="0"
+         style="overflow:visible"
+         id="use5"
+         overflow="visible"
+         xlink:href="#SVGID_1_" /></clipPath><g
+       id="g20"
+       clip-path="url(#SVGID_2_)"
+       style="stroke:#808080;stroke-opacity:1"><line
+         style="fill:none;stroke:#808080;stroke-width:0.69999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         id="line8"
+         y2="1.34"
+         x2="8.5600004"
+         y1="11.59"
+         x1="2.3199999"
+         stroke-miterlimit="10" /><line
+         style="fill:none;stroke:#808080;stroke-width:0.69999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         id="line10"
+         y2="2.9000001"
+         x2="11.12"
+         y1="13.15"
+         x1="4.8800001"
+         stroke-miterlimit="10" /><line
+         style="fill:none;stroke:#808080;stroke-width:0.69999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         id="line12"
+         y2="4.46"
+         x2="13.68"
+         y1="14.71"
+         x1="7.4400001"
+         stroke-miterlimit="10" /><line
+         style="fill:none;stroke:#808080;stroke-width:0.69999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         id="line14"
+         y2="8.5900002"
+         x2="14.68"
+         y1="2.3399999"
+         x1="4.4400001"
+         stroke-miterlimit="10" /><line
+         style="fill:none;stroke:#808080;stroke-width:0.69999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         id="line16"
+         y2="11.15"
+         x2="13.12"
+         y1="4.9099998"
+         x1="2.8800001"
+         stroke-miterlimit="10" /><line
+         style="fill:none;stroke:#808080;stroke-width:0.69999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         id="line18"
+         y2="13.71"
+         x2="11.56"
+         y1="7.4699998"
+         x1="1.3200001"
+         stroke-miterlimit="10" /></g></g><g
+     id="g26" /><path
+     style="fill:#ed6b21;fill-opacity:1"
+     inkscape:connector-curvature="0"
+     id="path24"
+     d="m 7.9810171,2.2476273 4.9999999,3.33 v 1.46 3.4600007 l -4.9999999,3.33 -5.0000003,-3.33 v -3.4500007 -1.47 l 5.0000003,-3.33 m 0,-1.2 -6.0000003,4 v 2 4.0000007 l 6.0000003,4 5.9999999,-4 v -4.0000007 -2 z" /><path
+     style="fill:none;stroke:#ed6b21;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 7.9810171,13.827628 V 8.4745763 L 2.9810168,5.5776273"
+     id="path4559"
+     inkscape:connector-curvature="0" /><path
+     style="fill:none;stroke:#ed6b21;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 12.981017,5.5776273 -4.9999999,2.896949 v 0"
+     id="path4561"
+     inkscape:connector-curvature="0" /></svg>
\ No newline at end of file
diff --git a/resources/icons/width.png b/resources/icons/width.png
deleted file mode 100644
index c3b50cce3..000000000
Binary files a/resources/icons/width.png and /dev/null differ
diff --git a/resources/icons/width.svg b/resources/icons/width.svg
new file mode 100644
index 000000000..5bdf6a68a
--- /dev/null
+++ b/resources/icons/width.svg
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 16 16"
+   enable-background="new 0 0 16 16"
+   xml:space="preserve"
+   sodipodi:docname="width.svg"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"><metadata
+     id="metadata34"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs32" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1440"
+     inkscape:window-height="877"
+     id="namedview30"
+     showgrid="false"
+     inkscape:zoom="22.627417"
+     inkscape:cx="-2.1696403"
+     inkscape:cy="3.6109015"
+     inkscape:window-x="1912"
+     inkscape:window-y="282"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1" /><g
+     id="g26"
+     transform="translate(20.338983,-1.9661017)"><g
+       id="g4"><rect
+         style="fill:#808080"
+         id="rect2"
+         height="2"
+         width="14"
+         y="13"
+         x="1" /></g><g
+       id="g8"><rect
+         style="fill:#808080"
+         id="rect6"
+         height="1.74"
+         width="14"
+         y="10.6"
+         x="1" /></g><g
+       id="g12"><rect
+         style="fill:#808080"
+         id="rect10"
+         height="1.47"
+         width="14"
+         y="8.1899996"
+         x="1" /></g><g
+       id="g16"><rect
+         style="fill:#ed6b21"
+         id="rect14"
+         height="1.2"
+         width="14"
+         y="5.79"
+         x="1" /></g><g
+       id="g20"><rect
+         style="fill:#ed6b21"
+         id="rect18"
+         height="0.93000001"
+         width="14"
+         y="3.3900001"
+         x="1" /></g><g
+       id="g24"><rect
+         style="fill:#808080"
+         id="rect22"
+         height="0.67000002"
+         width="14"
+         y="0.99000001"
+         x="1" /></g></g><path
+     style="fill:none;fill-opacity:1;stroke:#ed6b21;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 1.8612288,10.952331 5.8644067,6.9491525"
+     id="path4545"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cc" /><path
+     style="fill:none;fill-opacity:1;stroke:#ed6b21;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+     d="M 5.8644067,6.9491525 10.305085,2.5084742"
+     id="path4545-2"
+     inkscape:connector-curvature="0" /><path
+     style="fill:none;fill-opacity:1;stroke:#ed6b21;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 8.2881354,9.2711867 12.728814,4.8305083"
+     id="path4545-2-1"
+     inkscape:connector-curvature="0" /><path
+     style="fill:none;fill-opacity:1;stroke:#ed6b21;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 8.2881354,9.2711867 -2.6779659,2.7457643 2.125538,2.302315 3.0338035,-3.114817"
+     id="path4545-9"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccc" /><path
+     style="fill:none;fill-opacity:1;stroke:#ed6b21;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 9.372881,2.9322034 2.745763,2.677966"
+     id="path4545-2-3"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cc" /><path
+     style="fill:none;fill-opacity:1;stroke:#ed6b21;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 10.769511,11.204449 13.460189,8.5137708"
+     id="path4545-2-1-0"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cc" /></svg>
\ No newline at end of file
diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp
index 0a4941c93..5b601f2b5 100644
--- a/src/libslic3r/PrintConfig.cpp
+++ b/src/libslic3r/PrintConfig.cpp
@@ -253,7 +253,7 @@ void PrintConfigDef::init_fff_params()
 
     def = this->add("brim_ears_max_angle", coFloat);
     def->label = L("max angle");
-    def->tooltip = L("Maximum angle to let a brim ear appear.");
+    def->tooltip = L("Maximum angle to let a brim ear appear. \nIf set to 0, no brim will be created. \nIf set to ~178, brim will be created on everything but strait sections.");
     def->sidetext = L("°");
     def->min = 0;
     def->max = 180;
diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp
index d9990f417..f4127cd37 100644
--- a/src/slic3r/GUI/Tab.cpp
+++ b/src/slic3r/GUI/Tab.cpp
@@ -1002,7 +1002,7 @@ void TabPrint::build()
     m_presets = &m_preset_bundle->prints;
     Line line{ "", "" };
 	load_initial_data();
-    auto page = add_options_page(_(L("Perimeters & shell")), "perimeters_shell.png");
+    auto page = add_options_page(_(L("Perimeters & shell")), "shell");
 
         auto optgroup = page->new_optgroup(_(L("Vertical shells")));
 		optgroup->append_single_option_line("perimeters");
@@ -1196,7 +1196,7 @@ void TabPrint::build()
 		optgroup->append_single_option_line("max_volumetric_extrusion_rate_slope_negative");
 #endif /* HAS_PRESSURE_EQUALIZER */
 
-	page = add_options_page(_(L("Width & flow")), "width.png");
+	page = add_options_page(_(L("Width & flow")), "width");
 		optgroup = page->new_optgroup(_(L("Extrusion width")));
 		optgroup->append_single_option_line("extrusion_width");
 		optgroup->append_single_option_line("first_layer_extrusion_width");