diff --git a/README.md b/README.md
index de79530a09..fac36af946 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-
+
### Your own 3D parametric modeler
diff --git a/src/Doc/sphinx/_static/favicon.ico b/src/Doc/sphinx/_static/favicon.ico
index dcefbc956d..8f2c2966a2 100644
Binary files a/src/Doc/sphinx/_static/favicon.ico and b/src/Doc/sphinx/_static/favicon.ico differ
diff --git a/src/Gui/Icons/AddonManager.svg b/src/Gui/Icons/AddonManager.svg
index f630e855ac..7a823c5f28 100644
--- a/src/Gui/Icons/AddonManager.svg
+++ b/src/Gui/Icons/AddonManager.svg
@@ -2,25 +2,20 @@
diff --git a/src/Gui/Icons/freecad.xpm b/src/Gui/Icons/freecad.xpm
index 92b0d2745f..d2334e9219 100644
--- a/src/Gui/Icons/freecad.xpm
+++ b/src/Gui/Icons/freecad.xpm
@@ -1,268 +1,67 @@
/* XPM */
-static char * freecad_xpm[] = {
-"32 32 233 2",
-" c None",
-". c #280000",
-"+ c #EF2929",
-"@ c #EE2828",
-"# c #ED2828",
-"$ c #EC2828",
-"% c #EC2727",
-"& c #EB2727",
-"* c #EA2626",
-"= c #E92626",
-"- c #E82525",
-"; c #E72525",
-"> c #E72424",
-", c #E62424",
-"' c #E52424",
-") c #E52323",
-"! c #E22222",
-"~ c #DF2020",
-"{ c #DC1F1F",
-"] c #06083E",
-"^ c #02043A",
-"/ c #03063B",
-"( c #DA1D1D",
-"_ c #D91D1D",
-": c #34497C",
-"< c #729ECE",
-"[ c #374C80",
-"} c #D71C1C",
-"| c #D61B1B",
-"1 c #06093F",
-"2 c #5F84B5",
-"3 c #729FCF",
-"4 c #6993C3",
-"5 c #070B41",
-"6 c #06093E",
-"7 c #060A3F",
-"8 c #D41A1A",
-"9 c #D31A1A",
-"0 c #04083D",
-"a c #709CCC",
-"b c #709DCD",
-"c c #192459",
-"d c #02063C",
-"e c #060A40",
-"f c #4E6EA1",
-"g c #5173A5",
-"h c #04073D",
-"i c #D11919",
-"j c #D11818",
-"k c #5779AA",
-"l c #121A4F",
-"m c #4B689C",
-"n c #719ECE",
-"o c #6A97C8",
-"p c #6E9ACB",
-"q c #6C97C8",
-"r c #446093",
-"s c #3D578A",
-"t c #6E9ACA",
-"u c #6E9BCC",
-"v c #6F9CCC",
-"w c #03063C",
-"x c #CE1717",
-"y c #CD1717",
-"z c #CD1616",
-"A c #CC1616",
-"B c #709DCE",
-"C c #719DCE",
-"D c #6F9CCD",
-"E c #6995C7",
-"F c #6895C7",
-"G c #6693C5",
-"H c #6794C4",
-"I c #6C99CA",
-"J c #6D9ACA",
-"K c #618DC0",
-"L c #6895C6",
-"M c #5073A5",
-"N c #05083D",
-"O c #CB1515",
-"P c #CA1515",
-"Q c #C91414",
-"R c #6B97C9",
-"S c #6894C6",
-"T c #6A95C5",
-"U c #5985B9",
-"V c #11194E",
-"W c #C81414",
-"X c #C71313",
-"Y c #628FC1",
-"Z c #709CCD",
-"` c #577CAE",
-" . c #080D43",
-".. c #567BAE",
-"+. c #5884B7",
-"@. c #6F9BCC",
-"#. c #05083F",
-"$. c #C61212",
-"%. c #C51212",
-"&. c #6996C8",
-"*. c #05073D",
-"=. c #03073D",
-"-. c #557AAD",
-";. c #638FC2",
-">. c #436093",
-",. c #03053C",
-"'. c #03083D",
-"). c #C31111",
-"!. c #C21111",
-"~. c #608DBF",
-"{. c #090E43",
-"]. c #4F7BB0",
-"^. c #6994C5",
-"/. c #5277AA",
-"(. c #2A3E74",
-"_. c #02063B",
-":. c #C00F0F",
-"<. c #BF0F0F",
-"[. c #33487C",
-"}. c #648DBF",
-"|. c #6491C3",
-"1. c #5986BA",
-"2. c #6691C2",
-"3. c #4975AB",
-"4. c #3D68A1",
-"5. c #4772A9",
-"6. c #6692C4",
-"7. c #010339",
-"8. c #BD0E0E",
-"9. c #BC0D0D",
-"0. c #6B98C9",
-"a. c #5884B8",
-"b. c #4F7BB1",
-"c. c #5580B5",
-"d. c #6893C5",
-"e. c #05083E",
-"f. c #4671A8",
-"g. c #5783B7",
-"h. c #5E87B9",
-"i. c #2C4277",
-"j. c #01043A",
-"k. c #BA0C0C",
-"l. c #2C3F74",
-"m. c #567BAD",
-"n. c #6E9BCB",
-"o. c #527EB3",
-"p. c #0A1146",
-"q. c #090E45",
-"r. c #4974AB",
-"s. c #638EC0",
-"t. c #141D53",
-"u. c #02073D",
-"v. c #B70B0B",
-"w. c #B70A0A",
-"x. c #405E91",
-"y. c #6591C3",
-"z. c #5E8ABD",
-"A. c #5378AC",
-"B. c #03073C",
-"C. c #5177AA",
-"D. c #5783B8",
-"E. c #5A86BA",
-"F. c #385488",
-"G. c #B40909",
-"H. c #6C98C9",
-"I. c #4671A9",
-"J. c #5277AB",
-"K. c #090F46",
-"L. c #0A1147",
-"M. c #5176AA",
-"N. c #2E5994",
-"O. c #30497E",
-"P. c #00043A",
-"Q. c #B10707",
-"R. c #0D1449",
-"S. c #3B669E",
-"T. c #37629B",
-"U. c #6691C3",
-"V. c #6692C3",
-"W. c #38629C",
-"X. c #2C5792",
-"Y. c #37629C",
-"Z. c #6793C5",
-"`. c #05093F",
-" + c #AF0606",
-".+ c #AE0606",
-"++ c #46679B",
-"@+ c #5885B9",
-"#+ c #436DA5",
-"$+ c #6390C2",
-"%+ c #5C88BB",
-"&+ c #436EA5",
-"*+ c #345F99",
-"=+ c #37619B",
-"-+ c #6996C7",
-";+ c #6D9ACB",
-">+ c #537FB4",
-",+ c #6490C2",
-"'+ c #406196",
-")+ c #01063B",
-"!+ c #AC0404",
-"~+ c #AB0404",
-"{+ c #01033A",
-"]+ c #6B97C8",
-"^+ c #6794C5",
-"/+ c #2E477C",
-"(+ c #355085",
-"_+ c #608ABD",
-":+ c #5480B5",
-"<+ c #224C89",
-"[+ c #37558A",
-"}+ c #03063D",
-"|+ c #0B1347",
-"1+ c #3F6195",
-"2+ c #446599",
-"3+ c #02053C",
-"4+ c #A90303",
-"5+ c #A80202",
-"6+ c #02043B",
-"7+ c #3F6094",
-"8+ c #3E5D92",
-"9+ c #04073E",
-"0+ c #00023A",
-"a+ c #0B1348",
-"b+ c #6590C2",
-"c+ c #01043B",
-"d+ c #02053B",
-"e+ c #A60101",
-"f+ c #567EB2",
-"g+ c #496EA2",
-"h+ c #263C72",
-"i+ c #22366C",
-"j+ c #01053A",
-" ",
-" . . . . . . . . . . . . . . . . . ",
-" . + + + + + + + + + + + + + + + . ",
-" . + @ # # # # # $ % % % & & & + . ",
-" . + & & * * * * * = = = = - - + . ",
-" . + - - - ; ; ; > , , , , , ' + . ",
-" . + ' ) ) + + + + + + + + + + + . ",
-" . + ! ! ! + . . . . . . . . . . . ",
-" . + ~ ~ ~ + . ",
-" . + { { { + . ] ^ / ",
-" . + ( _ _ + . : < [ ",
-" . + } } | + . 1 2 3 4 5 6 7 ",
-" . + 8 8 9 + . . . . . . . 1 0 a b 3 c d e f g h ",
-" . + i j j + + + + + + + . k l 1 m n o p q r s t u v w ",
-" . + x x x y y z z z A + . B n C D E F G H I J K L M N ",
-" . + O O O O P P P P Q + . R S L I n T T n F U U b V ",
-" . + W W W W X X X X X + . u Y Z ` .e e ...p +.@.#. ",
-" . + $.%.%.+ + + + + + + . I &...*. =.-.;.G >.,.'. ",
-" . + ).!.!.+ . . . . . . . ~.C {. .b ].u ^./.(._. ",
-" . + :.:.<.+ . ,.[.}.Z |.1.^.1 #.2.3.4.5.6.p 7. ",
-" . + 8.8.9.+ . ^ @.0.a.b.c.d.e. N 2.f.g.J h.i.j. ",
-" . + k.k.k.+ . =.l.m.q n.o.b p. q.v r.s.t.u. ",
-" . + v.w.w.+ . #.,.x.y.z.A.B. d C.D.E.F. ",
-" . + G.G.G.+ . h H.I.E J.K.=.=.L.M.G N.~.O.P. ",
-" . + Q.Q.Q.+ . R.n.S.T.g.@.U.V.u o.W.X.Y.Z.`. ",
-" . + +.+.++ . w ++@+#+$+%+&+T.*+=+z.-+;+>+,+'+)+ ",
-" . + !+~+~++ . {+]+^+Z./+(+_+:+<+0.[+}+|+1+S 2+3+ ",
-" . + 4+4+5++ . 6+7+8+9+0+ a+J *+b+c+ d+{+c+ ",
-" . + e+e+e++ . d )+ d f+$+g+d ",
-" . + + + + + . h+]+i+ ",
-" . . . . . . . {+7.j+ ",
-" "};
+static char *b2877f70bb2b4697e4de66cf1b8d3a67GbKalYwBddLgmyqY[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 29 1 ",
+" c None",
+". c #CB333B",
+"X c #CB343C",
+"o c #CF353E",
+"O c #DC3F47",
+"+ c #FC555B",
+"@ c #FE575E",
+"# c #FF585D",
+"$ c #C06B88",
+"% c #7480BB",
+"& c #418FDD",
+"* c #428FDD",
+"= c #418EDE",
+"- c #418FDE",
+"; c #418EDF",
+": c #418FDF",
+"> c #428FDE",
+", c #4190DE",
+"< c #4290DE",
+"1 c #73ADE6",
+"2 c #7FABE0",
+"3 c #93BFED",
+"4 c #CBE0F4",
+"5 c #F6E2E3",
+"6 c #F7E3E4",
+"7 c #FEE7E7",
+"8 c #E3EEF9",
+"9 c #F2F7FB",
+"0 c #FEFEFE",
+/* pixels */
+" X...............O##### ",
+" X...............O###### ",
+" X...............O####### ",
+" X...............O######## ",
+" X...............O######### ",
+" .....5555555555677777####@ ",
+" .....0000000000000000###@% ",
+" .....0000000000000000##@%- ",
+" .....0000000000000000#@%-- ",
+" .....0000000000000000@%--- ",
+" .....0000098888888888%---- ",
+" .....000003--------------- ",
+" .....000003-------------- ",
+" .....000003------------ ",
+" .....00000433331------- ",
+" .....00000000008------- ",
+" .....00000000008-------- ",
+" .....00000000008--------- ",
+" .....00000000008---------- ",
+" .....00000000008---------- ",
+" .....000003-------------- ",
+" ....o000003-------------, ",
+" ...o+000003--------- ",
+" ..o+#000003--------- ",
+" .o+##000003--------, ",
+" o+###000003--------- ",
+" +####777772---------, ",
+" #########$----------, ",
+" ########$--- --- ",
+" #######$---- - ",
+" ######$----- ",
+" #####$----- "
+};
diff --git a/src/Gui/Icons/preferences-import-export.svg b/src/Gui/Icons/preferences-import-export.svg
index 2882b11a5b..667005b383 100644
--- a/src/Gui/Icons/preferences-import-export.svg
+++ b/src/Gui/Icons/preferences-import-export.svg
@@ -44,26 +44,6 @@
y1="1047.3622"
x2="81"
y2="993.36218" />
-
-
-
-
-
-
-
-
-
-
-
@@ -190,33 +141,6 @@
id="path9" />
-
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/src/Gui/Icons/preferences-workbenches.svg b/src/Gui/Icons/preferences-workbenches.svg
index 335f0ac0d0..3765f184d3 100644
--- a/src/Gui/Icons/preferences-workbenches.svg
+++ b/src/Gui/Icons/preferences-workbenches.svg
@@ -15,73 +15,6 @@
xmlns:dc="http://purl.org/dc/elements/1.1/">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ id="radialGradient3079"
+ xlink:href="#linearGradient3816" />
+ id="linearGradient3816">
+ style="stop-color:#000000;stop-opacity:1" />
+ style="stop-color:#2e3436;stop-opacity:0;" />
+ y2="48"
+ x2="22"
+ y1="22"
+ x1="19"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient3835-9"
+ xlink:href="#linearGradient3813" />
+
+
@@ -190,99 +125,94 @@
+ id="path2991-0" />
+ id="path3763-3" />
+ id="path2993-6" />
+ id="g3851-1"
+ transform="matrix(0.60559561,0,0,0.60231489,11.869492,12.886321)">
+
-
-
-
-
-
-
-
-
+ transform="matrix(0.8782269,0,0,0.88301047,5.1375817,7.8341081)"
+ id="g3821-0">
+ id="path2995-6"
+ d="M 37,55 3,47 V 15 l 34,8 z"
+ style="fill:url(#linearGradient3835-9);fill-opacity:1;stroke:#271903;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
+ id="path3811-3"
+ d="m 5,17.6 v 27.9 l 30,6.9 V 24.5 Z"
+ style="fill:none;stroke:#e9b96e;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+
+
+
+
+
+
+
+
+ transform="translate(-6e-6,-0.36363683)"
+ id="layer1-4-4">
+ id="g3813-3-7"
+ transform="matrix(0.8506406,0,0,0.8506406,187.82699,-0.1960013)">
+ id="g2"
+ transform="matrix(2.6926726,-0.00767619,-2.8711457e-5,2.6926727,-213.45294,6.7837082)">
+ d="m 22,3.9997423 -3.999742,4.0002581 h -8 V 10.999806 H 14 v 4.000259 h -3.999742 v 4.999678 L 5.9999997,24 h 4.0503843 c 0.30326,-1e-6 0.571883,-0.195269 0.66559,-0.48369 l 0.723985,-2.22828 c 0.06925,-0.213087 0.236489,-0.379833 0.449583,-0.449065 l 0.556553,-0.180868 c 0.213108,-0.06926 0.446577,-0.03248 0.627866,0.09922 l 1.894968,1.377173 c 0.245331,0.178232 0.57787,0.178229 0.823203,0 l 1.698598,-1.234547 c 0.245363,-0.178242 0.347963,-0.493948 0.254247,-0.782378 l -0.723984,-2.22828 c -0.06926,-0.213109 -0.03197,-0.446575 0.09974,-0.627866 l 0.344164,-0.473355 c 0.131697,-0.181276 0.34179,-0.288856 0.565855,-0.28887 l 2.343001,5.1e-4 c 0.303278,10e-6 0.571885,-0.19577 0.66559,-0.484207 l 0.649054,-1.996771 c 0.0937,-0.288413 -0.0089,-0.60465 -0.254247,-0.782895 L 19.538664,11.858666 C 19.357381,11.726957 19.250306,11.516889 19.250311,11.292812 V 10.70732 c 1.9e-5,-0.224072 0.107062,-0.434681 0.288353,-0.566372 L 21.711646,8.5622376 C 21.892924,8.4305313 21.999999,8.219938 22,7.9958659 Z"
+ style="fill:#418fde;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.64567;stroke-linecap:square"
+ id="path8" />
-
+ id="path7"
+ style="display:inline;fill:#ff585d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.64567;stroke-linecap:square"
+ d="m 18,0 -4,4 h 4 V 8 L 22,4 V 0 Z M 6,16 2,20 v 4 h 4 l 4,-4 H 6 Z" />
+ d="M 6,0 2,4 V 20 L 6,16 V 4 h 8 l 4,-4 z"
+ style="fill:#cb333b;fill-rule:evenodd;stroke-width:2.64567;stroke-linecap:square"
+ id="path3" />
+ d="M 5.9999997,19.999743 H 10.000258 V 15.000065 H 14 V 10.999806 H 10.000258 V 8.0000004 h 8 V 3.9997423 H 5.9999997 Z"
+ style="fill:#fefefe;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.64567;stroke-linecap:square"
+ id="path9" />
diff --git a/src/Gui/Stylesheets/images_dark-light/background_freecad.svg b/src/Gui/Stylesheets/images_dark-light/background_freecad.svg
index 36e0a90441..be574d0891 100644
--- a/src/Gui/Stylesheets/images_dark-light/background_freecad.svg
+++ b/src/Gui/Stylesheets/images_dark-light/background_freecad.svg
@@ -2,105 +2,18 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ id="defs4" />
@@ -127,17 +40,25 @@
id="layer1"
transform="translate(-1074.0664,-169.59799)">
+ d="m 22,3.9997423 -3.999742,4.0002581 h -8 V 10.999806 H 14 v 4.000259 h -3.999742 v 4.999678 L 5.9999997,24 h 4.0503843 c 0.30326,-1e-6 0.571883,-0.195269 0.66559,-0.48369 l 0.723985,-2.22828 c 0.06925,-0.213087 0.236489,-0.379833 0.449583,-0.449065 l 0.556553,-0.180868 c 0.213108,-0.06926 0.446577,-0.03248 0.627866,0.09922 l 1.894968,1.377173 c 0.245331,0.178232 0.57787,0.178229 0.823203,0 l 1.698598,-1.234547 c 0.245363,-0.178242 0.347963,-0.493948 0.254247,-0.782378 l -0.723984,-2.22828 c -0.06926,-0.213109 -0.03197,-0.446575 0.09974,-0.627866 l 0.344164,-0.473355 c 0.131697,-0.181276 0.34179,-0.288856 0.565855,-0.28887 l 2.343001,5.1e-4 c 0.303278,10e-6 0.571885,-0.19577 0.66559,-0.484207 l 0.649054,-1.996771 c 0.0937,-0.288413 -0.0089,-0.60465 -0.254247,-0.782895 L 19.538664,11.858666 C 19.357381,11.726957 19.250306,11.516889 19.250311,11.292812 V 10.70732 c 1.9e-5,-0.224072 0.107062,-0.434681 0.288353,-0.566372 L 21.711646,8.5622376 C 21.892924,8.4305313 21.999999,8.219938 22,7.9958659 Z"
+ style="fill:#418fde;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.64567;stroke-linecap:square"
+ id="path8" />
+ id="path7"
+ style="display:inline;fill:#ff585d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.64567;stroke-linecap:square"
+ d="m 18,0 -4,4 h 4 V 8 L 22,4 V 0 Z M 6,16 2,20 v 4 h 4 l 4,-4 H 6 Z" />
+
+
diff --git a/src/Gui/Stylesheets/images_dark-light/background_freecad_dark.svg b/src/Gui/Stylesheets/images_dark-light/background_freecad_dark.svg
index afe8f4147c..6628a6d448 100644
--- a/src/Gui/Stylesheets/images_dark-light/background_freecad_dark.svg
+++ b/src/Gui/Stylesheets/images_dark-light/background_freecad_dark.svg
@@ -2,85 +2,18 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ id="defs4" />
@@ -104,16 +37,11 @@
+ id="g2"
+ transform="matrix(7.7916667,0,0,7.7916667,-15.583333,0)">
-
+ d="M 5.9999164,0 2,3.9999164 V 20.000083 24 h 3.9999164 4.0505516 c 0.303258,-1e-6 0.571818,-0.195371 0.665525,-0.48379 l 0.72393,-2.228192 c 0.06925,-0.213086 0.236606,-0.379716 0.449699,-0.448947 l 0.556484,-0.180983 c 0.213107,-0.06926 0.446637,-0.03243 0.627925,0.09926 l 1.894803,1.377172 c 0.245329,0.178231 0.577863,0.178228 0.823195,0 l 1.69878,-1.234542 c 0.245362,-0.178241 0.347893,-0.493907 0.254178,-0.782336 l -0.723931,-2.228443 c -0.06926,-0.213107 -0.03194,-0.446383 0.09977,-0.627673 l 0.344168,-0.473513 c 0.131696,-0.181275 0.341695,-0.288756 0.565759,-0.28877 l 2.342998,5.01e-4 c 0.303276,10e-6 0.57182,-0.195856 0.665524,-0.484291 l 0.649232,-1.996825 c 0.0937,-0.288412 -0.0091,-0.604593 -0.254429,-0.782838 L 19.53877,11.858623 C 19.357488,11.726915 19.250246,11.51694 19.250251,11.292864 v -0.585561 c 1.9e-5,-0.224071 0.107229,-0.43457 0.288519,-0.56626 L 21.711564,8.5623329 C 21.892841,8.4306272 22.000082,8.2198931 22.000083,7.9958222 V 3.9999164 0 h -4.000167 z m 0,3.9999164 H 14 17.999916 V 8.0000835 H 10.000334 V 10.999833 H 14 V 15 h -3.999666 v 4.999833 l -2.5e-4,2.5e-4 H 5.9999164 v -4.000167 z"
+ style="fill:#000000;fill-opacity:0.12;fill-rule:evenodd;stroke-width:2.64567;stroke-linecap:square"
+ id="path1" />
diff --git a/src/Gui/Stylesheets/images_dark-light/background_freecad_light.svg b/src/Gui/Stylesheets/images_dark-light/background_freecad_light.svg
index ff104ab773..c2d74d710b 100644
--- a/src/Gui/Stylesheets/images_dark-light/background_freecad_light.svg
+++ b/src/Gui/Stylesheets/images_dark-light/background_freecad_light.svg
@@ -2,85 +2,18 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ id="defs4" />
@@ -106,14 +39,13 @@
-
-
+
+
+
diff --git a/src/Main/icon.ico b/src/Main/icon.ico
index 528a657109..a27c561617 100644
Binary files a/src/Main/icon.ico and b/src/Main/icon.ico differ
diff --git a/src/Mod/AddonManager/Resources/icons/ExtMan_workbench_icon.svg b/src/Mod/AddonManager/Resources/icons/ExtMan_workbench_icon.svg
index c94cbcca0b..ae29e44317 100644
--- a/src/Mod/AddonManager/Resources/icons/ExtMan_workbench_icon.svg
+++ b/src/Mod/AddonManager/Resources/icons/ExtMan_workbench_icon.svg
@@ -1,50 +1,149 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
diff --git a/src/Mod/AddonManager/Resources/icons/preferences-addon_manager.svg b/src/Mod/AddonManager/Resources/icons/preferences-addon_manager.svg
index f630e855ac..bc1330a0d7 100644
--- a/src/Mod/AddonManager/Resources/icons/preferences-addon_manager.svg
+++ b/src/Mod/AddonManager/Resources/icons/preferences-addon_manager.svg
@@ -2,25 +2,20 @@
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:dc="http://purl.org/dc/elements/1.1/">
+ id="linearGradient3816">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ xlink:href="#linearGradient3816" />
-
-
-
-
+ id="radialGradient3079-9"
+ xlink:href="#linearGradient3816" />
+ x1="19"
+ y1="22"
+ x2="22"
+ y2="48" />
+ x1="47"
+ y1="23"
+ x2="53"
+ y2="47" />
-
-
-
@@ -414,105 +97,104 @@
+ id="layer1">
-
+ transform="matrix(0.98607933,0,0,0.88301034,1.1932644,6.9511055)"
+ cx="32.5"
+ cy="52"
+ rx="28.5"
+ ry="7" />
-
-
-
-
-
-
-
-
-
-
+ transform="matrix(0.38342204,0.09235009,0,0.38551049,8.9413422,23.163046)">
+ id="layer1-4">
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Mod/TechDraw/Patterns/default.png b/src/Mod/TechDraw/Patterns/default.png
index ecb8b6cf5a..a5b56f5ec4 100644
Binary files a/src/Mod/TechDraw/Patterns/default.png and b/src/Mod/TechDraw/Patterns/default.png differ
diff --git a/src/Mod/TechDraw/TDTest/TestImage.png b/src/Mod/TechDraw/TDTest/TestImage.png
index 119ab54cc7..a5b56f5ec4 100644
Binary files a/src/Mod/TechDraw/TDTest/TestImage.png and b/src/Mod/TechDraw/TDTest/TestImage.png differ
diff --git a/src/Tools/_TEMPLATEPY_/Resources/icons/_TEMPLATEPY_Workbench.svg b/src/Tools/_TEMPLATEPY_/Resources/icons/_TEMPLATEPY_Workbench.svg
index 5fde3692af..f54a3de710 100644
--- a/src/Tools/_TEMPLATEPY_/Resources/icons/_TEMPLATEPY_Workbench.svg
+++ b/src/Tools/_TEMPLATEPY_/Resources/icons/_TEMPLATEPY_Workbench.svg
@@ -2,198 +2,17 @@
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:dc="http://purl.org/dc/elements/1.1/">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ id="defs3142" />
@@ -202,54 +21,38 @@
image/svg+xml
-
+
+ id="layer1">
-
-
-
-
-
+
+
+
+
+
+
diff --git a/src/Tools/_TEMPLATE_/Gui/Resources/icons/_TEMPLATE_Workbench.svg b/src/Tools/_TEMPLATE_/Gui/Resources/icons/_TEMPLATE_Workbench.svg
index 5fde3692af..f54a3de710 100644
--- a/src/Tools/_TEMPLATE_/Gui/Resources/icons/_TEMPLATE_Workbench.svg
+++ b/src/Tools/_TEMPLATE_/Gui/Resources/icons/_TEMPLATE_Workbench.svg
@@ -2,198 +2,17 @@
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:dc="http://purl.org/dc/elements/1.1/">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ id="defs3142" />
@@ -202,54 +21,38 @@
image/svg+xml
-
+
+ id="layer1">
-
-
-
-
-
+
+
+
+
+
+
diff --git a/tools/build/WindowsInstaller/Bitmaps/BanerBitmap.bmp b/tools/build/WindowsInstaller/Bitmaps/BanerBitmap.bmp
index 842378b4de..a516a0f837 100644
Binary files a/tools/build/WindowsInstaller/Bitmaps/BanerBitmap.bmp and b/tools/build/WindowsInstaller/Bitmaps/BanerBitmap.bmp differ
diff --git a/tools/build/WindowsInstaller/graphics/header.bmp b/tools/build/WindowsInstaller/graphics/header.bmp
index 03fca77405..e66c600887 100644
Binary files a/tools/build/WindowsInstaller/graphics/header.bmp and b/tools/build/WindowsInstaller/graphics/header.bmp differ
diff --git a/tools/build/WindowsInstaller/graphics/orange.bmp b/tools/build/WindowsInstaller/graphics/orange.bmp
index 9c45bcc1e5..26f5f30be1 100644
Binary files a/tools/build/WindowsInstaller/graphics/orange.bmp and b/tools/build/WindowsInstaller/graphics/orange.bmp differ
diff --git a/tools/build/WindowsInstaller/graphics/orange.svg b/tools/build/WindowsInstaller/graphics/orange.svg
new file mode 100644
index 0000000000..7f3609637c
--- /dev/null
+++ b/tools/build/WindowsInstaller/graphics/orange.svg
@@ -0,0 +1,384 @@
+
+
+
+
diff --git a/tools/build/WindowsInstaller/icons/FreeCAD-clean.ico b/tools/build/WindowsInstaller/icons/FreeCAD-clean.ico
index f024c104ab..1a5680d374 100644
Binary files a/tools/build/WindowsInstaller/icons/FreeCAD-clean.ico and b/tools/build/WindowsInstaller/icons/FreeCAD-clean.ico differ
diff --git a/tools/build/WindowsInstaller/icons/FreeCAD-icon-57px-height.bmp b/tools/build/WindowsInstaller/icons/FreeCAD-icon-57px-height.bmp
index 0daf71507a..918a4d2576 100644
Binary files a/tools/build/WindowsInstaller/icons/FreeCAD-icon-57px-height.bmp and b/tools/build/WindowsInstaller/icons/FreeCAD-icon-57px-height.bmp differ
diff --git a/tools/build/WindowsInstaller/icons/FreeCAD-icon.bmp b/tools/build/WindowsInstaller/icons/FreeCAD-icon.bmp
index 60b58b8b39..51ac4c1bcd 100644
Binary files a/tools/build/WindowsInstaller/icons/FreeCAD-icon.bmp and b/tools/build/WindowsInstaller/icons/FreeCAD-icon.bmp differ
diff --git a/tools/build/WindowsInstaller/icons/FreeCAD-icon.xcf b/tools/build/WindowsInstaller/icons/FreeCAD-icon.xcf
index 4b1d603ea7..f7fbf21c54 100644
Binary files a/tools/build/WindowsInstaller/icons/FreeCAD-icon.xcf and b/tools/build/WindowsInstaller/icons/FreeCAD-icon.xcf differ
diff --git a/tools/build/WindowsInstaller/icons/FreeCAD.ico b/tools/build/WindowsInstaller/icons/FreeCAD.ico
index 528a657109..a27c561617 100644
Binary files a/tools/build/WindowsInstaller/icons/FreeCAD.ico and b/tools/build/WindowsInstaller/icons/FreeCAD.ico differ