diff --git a/icons/README.md b/icons/README.md
new file mode 100644
index 000000000..83b10e551
--- /dev/null
+++ b/icons/README.md
@@ -0,0 +1,5 @@
+The icons used by EPP match those used by Eclipse platform.
+
+Apart from the README, this directory should have same contents as https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/tree/master/products/icons.
+(Before 4.39 tracked https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/tree/R4_38_maintenance/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/icons).
+See the platform repo for more details about the history.
diff --git a/icons/eclipse.ico b/icons/eclipse.ico
deleted file mode 100644
index fac2dda09..000000000
Binary files a/icons/eclipse.ico and /dev/null differ
diff --git a/icons/icon.xpm b/icons/eclipse.xpm
similarity index 100%
rename from icons/icon.xpm
rename to icons/eclipse.xpm
diff --git a/icons/solaris/Eclipse.l.pm b/icons/solaris/Eclipse.l.pm
deleted file mode 100644
index 7dc989699..000000000
--- a/icons/solaris/Eclipse.l.pm
+++ /dev/null
@@ -1,228 +0,0 @@
-/* XPM */
-static char * eclipse_l_xpm[] = {
-"48 48 177 2",
-"  	c None",
-". 	c #F7941E",
-"+ 	c #040707",
-"@ 	c #0E0E1B",
-"# 	c #18152E",
-"$ 	c #221B42",
-"% 	c #2A2050",
-"& 	c #2C2255",
-"* 	c #271F4B",
-"= 	c #0C0C16",
-"- 	c #08090E",
-"; 	c #090A11",
-"> 	c #1B1633",
-", 	c #07090C",
-"' 	c #1D1838",
-") 	c #161329",
-"! 	c #110F1F",
-"~ 	c #251D46",
-"{ 	c #06080B",
-"] 	c #1A1631",
-"^ 	c #17142B",
-"/ 	c #040708",
-"( 	c #100F1F",
-"_ 	c #0D0C17",
-": 	c #261E48",
-"< 	c #231C44",
-"[ 	c #050809",
-"} 	c #18152F",
-"| 	c #141226",
-"1 	c #0E0E1A",
-"2 	c #261E4A",
-"3 	c #241D46",
-"4 	c #0C0D17",
-"5 	c #1F1D32",
-"6 	c #49406C",
-"7 	c #524A74",
-"8 	c #5B537B",
-"9 	c #5F567E",
-"0 	c #5F577E",
-"a 	c #60577F",
-"b 	c #60587F",
-"c 	c #5F577F",
-"d 	c #5E567D",
-"e 	c #5E567E",
-"f 	c #5D557D",
-"g 	c #5A527A",
-"h 	c #544B75",
-"i 	c #4C436F",
-"j 	c #1D1B2E",
-"k 	c #5E5B70",
-"l 	c #AEAABE",
-"m 	c #DEDCE4",
-"n 	c #F8F8FA",
-"o 	c #FEFEFE",
-"p 	c #FFFFFF",
-"q 	c #FDFCFD",
-"r 	c #E9E8ED",
-"s 	c #C3C1CF",
-"t 	c #585669",
-"u 	c #F6941E",
-"v 	c #090A10",
-"w 	c #8B889A",
-"x 	c #C7C4D2",
-"y 	c #E8E7EC",
-"z 	c #F7F6F8",
-"A 	c #DFDDE5",
-"B 	c #8C8A98",
-"C 	c #787192",
-"D 	c #827D9A",
-"E 	c #8E88A3",
-"F 	c #948FA8",
-"G 	c #9691AA",
-"H 	c #938EA8",
-"I 	c #8A84A0",
-"J 	c #736D8C",
-"K 	c #0B0C14",
-"L 	c #0F0E1E",
-"M 	c #2E2358",
-"N 	c #0B0C15",
-"O 	c #1F1D31",
-"P 	c #514873",
-"Q 	c #574F78",
-"R 	c #615980",
-"S 	c #615A80",
-"T 	c #635B83",
-"U 	c #504872",
-"V 	c #1F1E31",
-"W 	c #3C3A4A",
-"X 	c #BCB9C9",
-"Y 	c #DAD8E1",
-"Z 	c #F1F0F4",
-"` 	c #FBFBFC",
-" .	c #F6F5F8",
-"..	c #EFEFF2",
-"+.	c #BEBBCA",
-"@.	c #3B394A",
-"#.	c #BBB8C8",
-"$.	c #D9D7E0",
-"%.	c #E9E8EE",
-"&.	c #F3F2F5",
-"*.	c #F5F5F7",
-"=.	c #EAE9EE",
-"-.	c #DBD9E2",
-";.	c #5C547C",
-">.	c #625A82",
-",.	c #675E8A",
-"'.	c #625A81",
-").	c #564E77",
-"!.	c #504873",
-"~.	c #201E32",
-"{.	c #2D2256",
-"].	c #362A66",
-"^.	c #0C0C17",
-"/.	c #7D7796",
-"(.	c #8F89A4",
-"_.	c #9B95B4",
-":.	c #9A94B3",
-"<.	c #85809D",
-"[.	c #605A7B",
-"}.	c #0D0D19",
-"|.	c #8E8B9C",
-"1.	c #D3D1DC",
-"2.	c #EEEDF1",
-"3.	c #FCFCFC",
-"4.	c #F9F9FA",
-"5.	c #F4F4F6",
-"6.	c #E0DEE6",
-"7.	c #817E90",
-"8.	c #0F0E1B",
-"9.	c #575468",
-"0.	c #B1AEC0",
-"a.	c #CECCD8",
-"b.	c #E6E5EB",
-"c.	c #EDECF0",
-"d.	c #4A475D",
-"e.	c #121023",
-"f.	c #372B6A",
-"g.	c #3B2E71",
-"h.	c #3B2E70",
-"i.	c #362A67",
-"j.	c #131124",
-"k.	c #080A0E",
-"l.	c #2E2459",
-"m.	c #3D2F74",
-"n.	c #3D2F73",
-"o.	c #3C2F73",
-"p.	c #3C2E72",
-"q.	c #2D2357",
-"r.	c #100F1E",
-"s.	c #342864",
-"t.	c #3E3177",
-"u.	c #322760",
-"v.	c #121124",
-"w.	c #221B43",
-"x.	c #382C6C",
-"y.	c #3F327A",
-"z.	c #362A68",
-"A.	c #211A3E",
-"B.	c #392D6E",
-"C.	c #41337E",
-"D.	c #352966",
-"E.	c #050708",
-"F.	c #17132A",
-"G.	c #342965",
-"H.	c #433581",
-"I.	c #332862",
-"J.	c #2D2358",
-"K.	c #3B2E72",
-"L.	c #443684",
-"M.	c #423481",
-"N.	c #372B6B",
-"O.	c #3F327B",
-"P.	c #453788",
-"Q.	c #3D3077",
-"R.	c #352A68",
-"S.	c #201A3D",
-"T.	c #2F255C",
-"                                                                                                ",
-"                                                                                                ",
-"                                    . . . .                                                     ",
-"                              . . . .       + + + + + + + + +                                   ",
-"                        . . . . .   + + @ # $ % & & & & & * $ # = + +                           ",
-"                    . . . . .   - ; > % & & & & & & & & & & & & & * # ; +                       ",
-"                  . . . .   + , ' & & & & & & & & & & & & & & & & & & & > , +                   ",
-"                . . . .   + ) % & & & & & & & & & & & & & & & & & & & & & % ! +                 ",
-"            . . . . .   , ' & & & & & & & & & & & & & & & & & & & & & & & & & ' +               ",
-"          . . . . .   , ~ & & & & & & & & & & & & & & & & & & & & & & & & & & & ~ ,             ",
-"          . . . .   , ~ & & & & & & & & & & & & & & & & & & & & & & & & & & & & & ~ ,           ",
-"        . . . .   + $ & & & & & & & & & & & & & & & & & & & & & & & & & & & & & & & ' +         ",
-"      . . . .   { ] & & & & & & & & & & & & & & & & & & & & & & & & & & & & & & & & & ^ /       ",
-"      . . . .   ( & & & & & & & & & & & & & & & & & & & & & & & & & & & & & & & & & & & _       ",
-"    . . . .   { : & & & & & & & & & & & & & & & & & & & & & & & & & & & & & & & & & & & < [     ",
-"    . . . .   } & & & & & & & & & & & & & & & & & & & & & & & & & & & & & & & & & & & & & |     ",
-"  . . . .   1 2 & & & & & & & & & & & & & & & & & & & & & & & & & & & & & & & & & & & & & 3 4   ",
-"  . . . .   5 6 7 8 9 9 9 0 a b b b b b b b b b c 0 9 d d d d e 0 a b b b b b 0 9 e f g h i j   ",
-"  . . . .   k l m n o p p p p p p p p p p p p p p p o o o o o o o p p p p p p p o o p q r s t   ",
-". . . u   v w x y n o p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p o z A B = ",
-". . . u   ; C D E F G G G G G G G G G G G G G G G G G G G G G G G G G G G G G G G G G G H I J K ",
-". . . .   L & & & & & & M M M M M M M M M M M M M M M M M M M M M M M M M M M M M & & & & & & N ",
-". . . .   O P Q c R R S T T T T T T T T T T T T T T T T T T T T T T T T T T T T T S b b 0 Q U V ",
-". . . .   W X Y Z n q o p p p p p p p p p p p p p p p p p o o p o p p p p p p p p o `  ...A +.@.",
-". . . .   W #.$.%.&.` o p p p p p p p p p p p p p p p p p p p p p p p p p p p p p o q *.=.-.X @.",
-". . . .   V P Q ;.e b >.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.'.b 0 ;.).!.~.",
-". . . .   ( & & & & & {.].].].].].].].].].].].].].].].].].].].].].].].].].].].].].& & & & & & 4 ",
-". . . .   ^./.(.G G G G _._._._._._._._._._._._._._._._._._._._._._._._._._._._.:.G G G H <.[.}.",
-". . . u   4 |.1.2.n 3.o p p p p p p p p p p p p p p p p p p p p p p p p p p p p p o q 4.5.6.7.8.",
-"  . . . .   9.0.a.b.*.q o p p p p p p p p o o o o o o o o p p p p p p p p p p p p o 3.z c.x d.  ",
-"  . . u .   e.& & & & & & f.g.g.g.g.g.g.g.g.g.h.h.h.h.g.g.g.g.g.g.g.g.g.g.g.g.i.& & & & & & j.  ",
-"  . . u .   k.3 & & & & & l.m.m.m.m.m.m.m.m.m.n.o.o.n.n.m.m.m.m.m.m.m.m.m.m.p.q.& & & & & $ 4   ",
-"    . . . .   r.& & & & & & s.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.u.& & & & & & v.    ",
-"    . . . .   + w.& & & & & & x.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.z.& & & & & & A.[     ",
-"      . . . .   ^.& & & & & & & B.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.D.& & & & & & % ;       ",
-"      . . . .   E.F.& & & & & & & G.C.H.H.H.H.H.H.H.H.H.H.H.H.H.H.H.C.I.& & & & & & & j.+       ",
-"        . . . .   + ' & & & & & & & J.K.L.L.L.L.L.L.L.L.L.L.L.L.M.x.J.& & & & & & & ' +         ",
-"          . . . .   + ~ & & & & & & & & M N.O.P.P.P.P.P.P.L.Q.R.M & & & & & & & & ' +           ",
-"            . . . .   , S.& & & & & & & & & & & T.I.I.I.M & & & & & & & & & & & ' +             ",
-"              . . . .   + > & & & & & & & & & & & & & & & & & & & & & & & & & # +               ",
-"                . . . .   + @ * & & & & & & & & & & & & & & & & & & & & & * @ +                 ",
-"                  . . . .     , # % & & & & & & & & & & & & & & & & & % # +                     ",
-"                    . . . . .   + , ) ~ & & & & & & & & & & & & & ~ j., +                       ",
-"                        . . . . .     + ; ) ' $ % & & & % $ ' j.; +                             ",
-"                              . . . .       + + + + + + + + +                                   ",
-"                                      . . . .                                                   ",
-"                                                                                                ",
-"                                                                                                "};
diff --git a/icons/solaris/Eclipse.m.pm b/icons/solaris/Eclipse.m.pm
deleted file mode 100644
index c6ef373b0..000000000
--- a/icons/solaris/Eclipse.m.pm
+++ /dev/null
@@ -1,183 +0,0 @@
-/* XPM */
-static char * eclipse_m_xpm[] = {
-"32 32 148 2",
-"  	c None",
-". 	c #F7941E",
-"+ 	c #C17519",
-"@ 	c #3A260C",
-"# 	c #040707",
-"$ 	c #0F0E1C",
-"% 	c #0E0E1B",
-"& 	c #07090E",
-"* 	c #965C15",
-"= 	c #131124",
-"- 	c #201A3D",
-"; 	c #2C2255",
-"> 	c #251D46",
-", 	c #161329",
-"' 	c #0A0B12",
-") 	c #E1871C",
-"! 	c #181309",
-"~ 	c #271F4B",
-"{ 	c #1B1633",
-"] 	c #07090D",
-"^ 	c #A66516",
-"/ 	c #221B42",
-"( 	c #0C0C16",
-"_ 	c #0C0C17",
-": 	c #06080A",
-"< 	c #231B43",
-"[ 	c #2A2050",
-"} 	c #7D4E14",
-"| 	c #151329",
-"1 	c #211B3F",
-"2 	c #050809",
-"3 	c #0A0B13",
-"4 	c #29204F",
-"5 	c #131024",
-"6 	c #B76F19",
-"7 	c #2D2943",
-"8 	c #4D4470",
-"9 	c #5A517A",
-"0 	c #5D557D",
-"a 	c #5E567E",
-"b 	c #5F577E",
-"c 	c #5F577F",
-"d 	c #5F567E",
-"e 	c #5E567D",
-"f 	c #5C547C",
-"g 	c #60577F",
-"h 	c #5D547C",
-"i 	c #5A527A",
-"j 	c #524A74",
-"k 	c #3B3557",
-"l 	c #231A14",
-"m 	c #7C788D",
-"n 	c #D3D1DC",
-"o 	c #FDFCFD",
-"p 	c #FFFFFF",
-"q 	c #F3F2F5",
-"r 	c #B5B3C2",
-"s 	c #090B12",
-"t 	c #938EA6",
-"u 	c #B7B4C6",
-"v 	c #C8C6D3",
-"w 	c #CAC8D5",
-"x 	c #B1AEC1",
-"y 	c #292934",
-"z 	c #2C2256",
-"A 	c #2E2359",
-"B 	c #2D2357",
-"C 	c #17132B",
-"D 	c #4C4A59",
-"E 	c #C0BDCC",
-"F 	c #EEEDF1",
-"G 	c #FEFEFE",
-"H 	c #FBFBFC",
-"I 	c #F3F3F6",
-"J 	c #D1CFDA",
-"K 	c #666374",
-"L 	c #3C3B4A",
-"M 	c #9A96AE",
-"N 	c #B6B3C5",
-"O 	c #C3C0CF",
-"P 	c #CAC7D4",
-"Q 	c #CCC9D8",
-"R 	c #C7C5D2",
-"S 	c #BDBACA",
-"T 	c #A6A2B8",
-"U 	c #535066",
-"V 	c #352965",
-"W 	c #30255C",
-"X 	c #18142D",
-"Y 	c #0C0D17",
-"Z 	c #8F8BA0",
-"` 	c #C6C3D1",
-" .	c #CDCAD9",
-"..	c #CBC8D6",
-"+.	c #C8C5D3",
-"@.	c #A9A5BA",
-"#.	c #292837",
-"$.	c #3E2918",
-"%.	c #757285",
-"&.	c #CDCAD6",
-"*.	c #F0EFF3",
-"=.	c #FCFCFC",
-"-.	c #B3B0C0",
-";.	c #100F1F",
-">.	c #C07419",
-",.	c #2E2458",
-"'.	c #3C2E72",
-").	c #3C2E71",
-"!.	c #322760",
-"~.	c #221C42",
-"{.	c #28204D",
-"].	c #3E3076",
-"^.	c #392D6E",
-"/.	c #0F0F1D",
-"(.	c #8B5514",
-"_.	c #121020",
-":.	c #382C6C",
-"<.	c #40327B",
-"[.	c #3C2F74",
-"}.	c #1D1839",
-"|.	c #050708",
-"1.	c #1C150A",
-"2.	c #201A3E",
-"3.	c #372B6A",
-"4.	c #423480",
-"5.	c #3C3075",
-"6.	c #2D2358",
-"7.	c #30265E",
-"8.	c #443685",
-"9.	c #3F327B",
-"0.	c #352966",
-"a.	c #07090C",
-"b.	c #2E2358",
-"c.	c #342965",
-"d.	c #392D6F",
-"e.	c #362A68",
-"f.	c #2F255B",
-"g.	c #C67819",
-"h.	c #E3881C",
-"i.	c #1C1509",
-"j.	c #110F1F",
-"k.	c #18152E",
-"l.	c #AE6A17",
-"m.	c #1D1838",
-"n.	c #CB7A1A",
-"o.	c #55360F",
-"p.	c #0B0C14",
-"q.	c #0D0D19",
-"                                                                ",
-"                          .                                     ",
-"                  . . . + @ # $ % % % % & #                     ",
-"              . . . * # = - ; ; ; ; ; ; ; > , '                 ",
-"            . . ) ! = ~ ; ; ; ; ; ; ; ; ; ; ; ; { ]             ",
-"        . . . ^ ] / ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ~ (           ",
-"      . . . ^ _ > ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; =         ",
-"      . . ) ] > ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; %       ",
-"    . . . : < ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; [ &     ",
-"  . . . } | ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; 1 2   ",
-"  . . . 3 4 ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; 5   ",
-"  . . 6 7 8 9 0 0 a b b b c b d e 0 f f f 0 b g g b e h i j k   ",
-". . . l m n o p p p p p p p p p p p p p p p p p p p p p p q r % ",
-". . . s t u v w w w w w w w w w w w w w w w w w w w w w w v x y ",
-". . . ( ; ; ; z A A A A A A A A A A A A A A A A A A A B ; ; ; C ",
-". . . D E F o G p p p p p p p p p p p G G G p p p p p G H I J K ",
-". . . L M N O P Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q w R S T U ",
-". . . _ ; ; ; B V V V V V V V V V V V V V V V V V V V W ; ; ; X ",
-". . . Y Z ` w w  . . . . . . . . . . . . . . . . . . ...w +.@.#.",
-". . . $.%.&.*.o p p p p p p G G G G G p p p p p p p p G =.q -.;.",
-"  . . >.X ; ; ; ,.'.'.'.'.'.'.).).).'.'.'.'.'.'.'.'.!.; ; ; ~.  ",
-"  . . . : {.; ; ; V ].].].].].].].].].].].].].].].^.; ; ; ; /.  ",
-"  . . . (._.; ; ; ; :.<.<.<.<.<.<.<.<.<.<.<.<.<.[.B ; ; ; }.|.  ",
-"    . . . 1.2.; ; ; ; 3.4.4.4.4.4.4.4.4.4.4.4.5.6.; ; ; [ ]     ",
-"      . . ) ] > ; ; ; ; 7.5.8.8.8.8.8.8.8.9.0.; ; ; ; [ (       ",
-"      . . . + a.> ; ; ; ; ; b.c.d.d.d.e.f.; ; ; ; ; [ (         ",
-"        . . . g.] - ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; > _           ",
-"            . . h.i.j.~ ; ; ; ; ; ; ; ; ; ; ; [ k.#             ",
-"              . . . l.# j.m.[ ; ; ; ; ; ; / = ]                 ",
-"                  . . . n.o.# p.% % % q.# #                     ",
-"                          .                                     ",
-"                                                                "};
diff --git a/icons/solaris/Eclipse.s.pm b/icons/solaris/Eclipse.s.pm
deleted file mode 100644
index 28a0652de..000000000
--- a/icons/solaris/Eclipse.s.pm
+++ /dev/null
@@ -1,127 +0,0 @@
-/* XPM */
-static char * eclipse_s_xpm[] = {
-"24 24 100 2",
-"  	c None",
-". 	c #07090E",
-"+ 	c #110F1F",
-"@ 	c #18152E",
-"# 	c #131124",
-"$ 	c #0D0D19",
-"% 	c #040707",
-"& 	c #0F0E1C",
-"* 	c #201A3D",
-"= 	c #2C2255",
-"- 	c #271F4B",
-"; 	c #07090D",
-"> 	c #0C0C17",
-", 	c #251D46",
-"' 	c #221B43",
-") 	c #2A2050",
-"! 	c #0A0B12",
-"~ 	c #100F1E",
-"{ 	c #1F193B",
-"] 	c #251D47",
-"^ 	c #121022",
-"/ 	c #2E3030",
-"( 	c #C0BDCC",
-"_ 	c #D7D5DF",
-": 	c #FFFFFF",
-"< 	c #F4F4F6",
-"[ 	c #CDCAD6",
-"} 	c #63626D",
-"| 	c #2B2B36",
-"1 	c #7E7897",
-"2 	c #8C87A2",
-"3 	c #9691AA",
-"4 	c #9691AB",
-"5 	c #938EA8",
-"6 	c #85809D",
-"7 	c #58546D",
-"8 	c #4A4959",
-"9 	c #787192",
-"0 	c #8E88A3",
-"a 	c #9791AC",
-"b 	c #908BA5",
-"c 	c #5F5A75",
-"d 	c #7B7B7F",
-"e 	c #C2BFCE",
-"f 	c #E8E7EC",
-"g 	c #FAFAFB",
-"h 	c #FEFEFE",
-"i 	c #F0EFF3",
-"j 	c #9795A3",
-"k 	c #191630",
-"l 	c #2F245A",
-"m 	c #352964",
-"n 	c #31265E",
-"o 	c #241D46",
-"p 	c #38393F",
-"q 	c #9D99B1",
-"r 	c #B2AFC1",
-"s 	c #C7C3D2",
-"t 	c #CDCAD9",
-"u 	c #CCC9D8",
-"v 	c #CBC8D6",
-"w 	c #C0BECD",
-"x 	c #A4A0B6",
-"y 	c #646276",
-"z 	c #1B1E1E",
-"A 	c #AAA6BB",
-"B 	c #9591AA",
-"C 	c #B4B1C3",
-"D 	c #CBC8D7",
-"E 	c #CDCADB",
-"F 	c #CECBDC",
-"G 	c #CCC9DA",
-"H 	c #CBC8D9",
-"I 	c #C1BECD",
-"J 	c #A5A2B7",
-"K 	c #9893AC",
-"L 	c #4D4C58",
-"M 	c #1D1838",
-"N 	c #30255D",
-"O 	c #3D2F74",
-"P 	c #352966",
-"Q 	c #2A2051",
-"R 	c #090A11",
-"S 	c #352A67",
-"T 	c #3F327A",
-"U 	c #3B2F73",
-"V 	c #423480",
-"W 	c #3B2E72",
-"X 	c #2D2358",
-"Y 	c #2F245B",
-"Z 	c #433582",
-"` 	c #453685",
-" .	c #3C3075",
-"..	c #322761",
-"+.	c #0D0D18",
-"@.	c #31265F",
-"#.	c #332862",
-"$.	c #1B1633",
-"%.	c #161329",
-"&.	c #111021",
-"                . + @ @ @ # $ %                 ",
-"          % & * = = = = = = = - # %             ",
-"        ; * = = = = = = = = = = = - >           ",
-"      > , = = = = = = = = = = = = = = #         ",
-"    ; - = = = = = = = = = = = = = = = = +       ",
-"  % ' = = = = = = = = = = = = = = = = = ) !     ",
-"  ~ = = = = = = = = = = = = = = = = = = = {     ",
-"  ] = = = = = = = = = = = = = = = = = = = = ^   ",
-"/ ( _ : : : : : : : : : : : : : : : : : < [ }   ",
-"| 1 2 3 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 3 5 6 7   ",
-"8 9 0 3 a a a a a a a a a a a a a a a 4 b 1 c % ",
-"d e f g : : : : : : : : : : : : : : : h i [ j % ",
-"k = = l m m m m m m m m m m m m m m m n = = o % ",
-"p q r s t t t t t t u u t t t t t t t v w x y   ",
-"z A B C D E F F F G H H G E F F F F F I J K L   ",
-"  M = = N O O O O O O O O O O O O O P = = Q R   ",
-"  > = = = S T T T T T T T T T T T U = = = @     ",
-"    @ = = = S V V V V V V V V V W X = = , %     ",
-"    % M = = = Y W Z ` ` ` `  ...= = = ) +.      ",
-"      % M = = = = = @.#.#.= = = = = - >         ",
-"        % # ) = = = = = = = = = = $..           ",
-"            . %., = = = = = - $.!               ",
-"                  % &.&.&.. %                   ",
-"                                                "};
diff --git a/icons/solaris/Eclipse.t.pm b/icons/solaris/Eclipse.t.pm
deleted file mode 100644
index 9add2212f..000000000
--- a/icons/solaris/Eclipse.t.pm
+++ /dev/null
@@ -1,89 +0,0 @@
-/* XPM */
-static char * eclipse_t_xpm[] = {
-"16 16 70 1",
-" 	c None",
-".	c #040707",
-"+	c #121123",
-"@	c #18152E",
-"#	c #201A3D",
-"$	c #1B1633",
-"%	c #17142B",
-"&	c #0B0C15",
-"*	c #111021",
-"=	c #271F4B",
-"-	c #2C2255",
-";	c #080A10",
-">	c #131124",
-",	c #251D46",
-"'	c #080A0F",
-")	c #221B42",
-"!	c #19152F",
-"~	c #4F5053",
-"{	c #B7B4C6",
-"]	c #B6B3C5",
-"^	c #C8C6D3",
-"/	c #CAC8D5",
-"(	c #C8C5D3",
-"_	c #B4B1C3",
-":	c #75718B",
-"<	c #312F45",
-"[	c #4C446F",
-"}	c #5C557D",
-"|	c #625A81",
-"1	c #615980",
-"2	c #5F577E",
-"3	c #0F0E1C",
-"4	c #ADACB3",
-"5	c #DAD8E1",
-"6	c #FFFFFF",
-"7	c #FEFEFE",
-"8	c #F4F4F6",
-"9	c #312E45",
-"0	c #574F78",
-"a	c #645B85",
-"b	c #675F8B",
-"c	c #5D557D",
-"d	c #494853",
-"e	c #A9A5BA",
-"f	c #C4C2D0",
-"g	c #CECBDB",
-"h	c #CBC8D7",
-"i	c #C9C7D4",
-"j	c #9B99A7",
-"k	c #191530",
-"l	c #29204E",
-"m	c #392C6D",
-"n	c #3D3075",
-"o	c #3C3074",
-"p	c #3C2F73",
-"q	c #2F245B",
-"r	c #1D1837",
-"s	c #1A1632",
-"t	c #2D2357",
-"u	c #41347E",
-"v	c #40327B",
-"w	c #342864",
-"x	c #0A0B13",
-"y	c #352967",
-"z	c #3D3077",
-"A	c #3F317A",
-"B	c #372B6A",
-"C	c #07090E",
-"D	c #1D1838",
-"E	c #161329",
-"    .+@#$%&     ",
-"   *=------$;   ",
-"  >---------,'  ",
-" *-----------). ",
-".=------------! ",
-"~{]^////////(_: ",
-"<[}||||||||||123",
-"456666667666668*",
-"90abbbbbbbbbb1c+",
-"defggggggggghijk",
-"*l-mnnnnnnopq-r ",
-" s-tpuuuuuvw-,x ",
-"  s--yzAABq-,C  ",
-"   *=------D'   ",
-"    .+$)#E&     ",
-"                "};
diff --git a/packages/org.eclipse.epp.package.committers.product/epp.product b/packages/org.eclipse.epp.package.committers.product/epp.product
index 989203e8a..11142b59a 100644
--- a/packages/org.eclipse.epp.package.committers.product/epp.product
+++ b/packages/org.eclipse.epp.package.committers.product/epp.product
@@ -3,12 +3,18 @@
 
 <product name="Eclipse IDE for Eclipse Committers" uid="epp.package.committers" id="org.eclipse.epp.package.committers.product" application="org.eclipse.ui.ide.workbench" version="4.38.0.qualifier" type="mixed" includeLaunchers="true" autoIncludeRequirements="true">
 
-   <aboutInfo>
-      <image path="/org.eclipse.epp.package.committers/eclipse_lg.png"/>
-      <text>
-         Specified in the plugin.xml of the branding plugin.
-      </text>
-   </aboutInfo>
+<!--
+
+This product definition is based on Eclipse Platform's platform.product.
+
+We need to redefine all the settings in platform.product to avoid duplicate
+settings, especially about -Dosgi.requiredJavaVersion=21
+(see a6b90b060b8c3684596e691254bf2f74a559b8aa / Bug 580807 for more history as to why)
+
+This file should be easy to compre against platform.product and non-obvious differences
+can and should be documented to keep ongoing maintenance easier.
+This file should also be easy to compare against all the other epp.product files
+-->
 
    <configIni use="default">
    </configIni>
@@ -19,6 +25,22 @@
 --launcher.defaultAction openFile
 --launcher.appendVmargs
       </programArgs>
+      <!--
+             -Dosgi.instance.area.default=@user.home/eclipse-workspace :
+             EPP has traditionally provided a different (more explicitly Eclipse) default
+
+             -Declipse.e4.inject.javax.warning=false :
+             disable javax.warning - this isn't something users can do anything about. Platform leaves them enabled because end
+             users don't typically use platform as a starting point, but ISVs who can help resolve it do
+
+             -Dsun.java.command=Eclipse :
+             When Eclipse is launched using the dll/so as the vm this provides a name
+             name for tools like jps.
+             (see 62b3bb4973a0ae375e56046f0b3ff910bc44f970 / Bug 568052 for more history as to why)
+
+             -XX:+UseG1GC and -XX:+UseStringDeduplication :
+             EPP has traditionally provided a different (more memory efficient) default
+      -->
       <vmArgs>-Dosgi.requiredJavaVersion=21
 -Dosgi.instance.area.default=@user.home/eclipse-workspace
 -Dosgi.dataAreaRequiresExplicitInit=true
@@ -31,32 +53,39 @@
 -XX:+UseStringDeduplication
 --add-modules=ALL-SYSTEM
       </vmArgs>
-      <vmArgsMac>-XstartOnFirstThread
--Dorg.eclipse.swt.internal.carbon.smallFonts
--Xdock:icon=../Resources/Eclipse.icns
+      <vmArgsMac>-Xdock:icon=../Resources/Eclipse.icns -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
       </vmArgsMac>
    </launcherArgs>
 
    <windowImages i16="/org.eclipse.epp.package.committers/eclipse16.png" i32="/org.eclipse.epp.package.committers/eclipse32.png" i48="/org.eclipse.epp.package.committers/eclipse48.png" i256="/org.eclipse.epp.package.committers/eclipse256.png"/>
 
+   <!-- EPP has its own splash screen that includes "IDE" in the graphic -->
    <splash
       location="org.eclipse.epp.package.common"
       startupProgressRect="2,290,448,10"
       startupMessageRect="7,265,320,20"
       startupForegroundColor="ffffff" />
    <launcher name="eclipse">
-      <linux icon="../../icons/icon.xpm"/>
+      <linux icon="../../icons/eclipse.xpm"/>
       <macosx icon="../../icons/Eclipse.icns">
          <bundleUrlTypes>
             <bundleUrlType scheme="eclipse+command" name="Eclipse Command"/>
+            <!-- include the additional handler for mpc - this needs to be defined here so macOS entitlements work properly -->
             <bundleUrlType scheme="eclipse+mpc" name="Eclipse Marketplace"/>
          </bundleUrlTypes>
       </macosx>
       <win useIco="false">
-         <bmp/>
+         <bmp/> <!-- Use default branding icon of the eclipse exe for Windows -->
       </win>
    </launcher>
 
+   <aboutInfo>
+      <image path="/org.eclipse.epp.package.committers/eclipse_lg.png"/>
+      <text>
+         Specified in the plugin.xml of the branding plugin.
+      </text>
+   </aboutInfo>
+
    <intro introId="org.eclipse.ui.intro.universal"/>
 
    <vm>
@@ -65,22 +94,6 @@
       <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21</windows>
    </vm>
 
-   <configurations>
-      <plugin id="org.apache.aries.spifly.dynamic.bundle" autoStart="true" startLevel="2" />
-      <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
-      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="4" />
-      <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
-      <plugin id="slf4j.simple" autoStart="true" startLevel="2" />
-      <property name="org.eclipse.update.reconcile" value="false" />
-      <property name="eclipse.buildId" value="${unqualifiedVersion}.${buildQualifier}" />
-      <property name="osgi.bundles.defaultStartLevel" value="4" />
-      <property name="osgi.instance.area.default" value="@user.home/workspace" />
-      <property name="osgi.instance.area.default" value="@user.home/Documents/workspace" os="macosx" />
-   </configurations>
-
    <license>
         <url>http://eclipse.org/legal/epl/notice.php</url>
         <text>
@@ -227,9 +240,12 @@ United States, other countries, or both.
          </text>
    </license>
 
-   <features>
-
+   <plugins>
+      <!-- either m2e.logback or slf4j.simple should be provided in each package -->
+      <plugin id="slf4j.simple"/>
+   </plugins>
 
+   <features>
       <!-- common features that all products have -->
       <feature id="org.eclipse.epp.package.common.feature" version="4.38.0.qualifier"/>
       <feature id="org.eclipse.platform" installMode="root"/>
@@ -273,10 +289,22 @@ United States, other countries, or both.
       <feature id="org.eclipse.mylyn.jdt.feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.pde.feature" installMode="root"/>
    </features>
-   <plugins>
-      <!-- either m2e.logback or slf4j.simple should be provided in each package -->
-      <plugin id="slf4j.simple"/>
-   </plugins>
+
+   <configurations>
+      <plugin id="org.apache.aries.spifly.dynamic.bundle" autoStart="true" startLevel="2" />
+      <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
+      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="4" />
+      <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
+      <plugin id="slf4j.simple" autoStart="true" startLevel="2" />
+      <property name="org.eclipse.update.reconcile" value="false" />
+      <property name="eclipse.buildId" value="${unqualifiedVersion}.${buildQualifier}" />
+      <property name="osgi.bundles.defaultStartLevel" value="4" />
+      <property name="osgi.instance.area.default" value="@user.home/workspace" />
+      <property name="osgi.instance.area.default" value="@user.home/Documents/workspace" os="macosx" />
+   </configurations>
 
    <repositories>
       <repository location="https://download.eclipse.org/eclipse/updates/4.38" name="The Eclipse Project Updates" enabled="true" />
diff --git a/packages/org.eclipse.epp.package.cpp.product/epp.product b/packages/org.eclipse.epp.package.cpp.product/epp.product
index 09fa5248a..0d7c8b2b4 100644
--- a/packages/org.eclipse.epp.package.cpp.product/epp.product
+++ b/packages/org.eclipse.epp.package.cpp.product/epp.product
@@ -3,12 +3,18 @@
 
 <product name="Eclipse IDE for C/C++ Developers" uid="epp.package.cpp" id="org.eclipse.epp.package.cpp.product" application="org.eclipse.ui.ide.workbench" version="4.38.0.qualifier" type="mixed" includeLaunchers="true" autoIncludeRequirements="true">
 
-   <aboutInfo>
-      <image path="/org.eclipse.epp.package.cpp/eclipse_lg.png"/>
-      <text>
-         Specified in the plugin.xml of the branding plugin.
-      </text>
-   </aboutInfo>
+<!--
+
+This product definition is based on Eclipse Platform's platform.product.
+
+We need to redefine all the settings in platform.product to avoid duplicate
+settings, especially about -Dosgi.requiredJavaVersion=21
+(see a6b90b060b8c3684596e691254bf2f74a559b8aa / Bug 580807 for more history as to why)
+
+This file should be easy to compre against platform.product and non-obvious differences
+can and should be documented to keep ongoing maintenance easier.
+This file should also be easy to compare against all the other epp.product files
+-->
 
    <configIni use="default">
    </configIni>
@@ -19,6 +25,22 @@
 --launcher.defaultAction openFile
 --launcher.appendVmargs
       </programArgs>
+      <!--
+             -Dosgi.instance.area.default=@user.home/eclipse-workspace :
+             EPP has traditionally provided a different (more explicitly Eclipse) default
+
+             -Declipse.e4.inject.javax.warning=false :
+             disable javax.warning - this isn't something users can do anything about. Platform leaves them enabled because end
+             users don't typically use platform as a starting point, but ISVs who can help resolve it do
+
+             -Dsun.java.command=Eclipse :
+             When Eclipse is launched using the dll/so as the vm this provides a name
+             name for tools like jps.
+             (see 62b3bb4973a0ae375e56046f0b3ff910bc44f970 / Bug 568052 for more history as to why)
+
+             -XX:+UseG1GC and -XX:+UseStringDeduplication :
+             EPP has traditionally provided a different (more memory efficient) default
+      -->
       <vmArgs>-Dosgi.requiredJavaVersion=21
 -Dosgi.instance.area.default=@user.home/eclipse-workspace
 -Dosgi.dataAreaRequiresExplicitInit=true
@@ -31,32 +53,39 @@
 -XX:+UseStringDeduplication
 --add-modules=ALL-SYSTEM
       </vmArgs>
-      <vmArgsMac>-XstartOnFirstThread
--Dorg.eclipse.swt.internal.carbon.smallFonts
--Xdock:icon=../Resources/Eclipse.icns
+      <vmArgsMac>-Xdock:icon=../Resources/Eclipse.icns -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
       </vmArgsMac>
    </launcherArgs>
 
    <windowImages i16="/org.eclipse.epp.package.cpp/eclipse16.png" i32="/org.eclipse.epp.package.cpp/eclipse32.png" i48="/org.eclipse.epp.package.cpp/eclipse48.png" i256="/org.eclipse.epp.package.cpp/eclipse256.png"/>
 
+   <!-- EPP has its own splash screen that includes "IDE" in the graphic -->
    <splash
       location="org.eclipse.epp.package.common"
       startupProgressRect="2,290,448,10"
       startupMessageRect="7,265,320,20"
       startupForegroundColor="ffffff" />
    <launcher name="eclipse">
-      <linux icon="../../icons/icon.xpm"/>
+      <linux icon="../../icons/eclipse.xpm"/>
       <macosx icon="../../icons/Eclipse.icns">
          <bundleUrlTypes>
             <bundleUrlType scheme="eclipse+command" name="Eclipse Command"/>
+            <!-- include the additional handler for mpc - this needs to be defined here so macOS entitlements work properly -->
             <bundleUrlType scheme="eclipse+mpc" name="Eclipse Marketplace"/>
          </bundleUrlTypes>
       </macosx>
       <win useIco="false">
-         <bmp/>
+         <bmp/> <!-- Use default branding icon of the eclipse exe for Windows -->
       </win>
    </launcher>
 
+   <aboutInfo>
+      <image path="/org.eclipse.epp.package.cpp/eclipse_lg.png"/>
+      <text>
+         Specified in the plugin.xml of the branding plugin.
+      </text>
+   </aboutInfo>
+
    <intro introId="org.eclipse.ui.intro.universal"/>
 
    <vm>
@@ -65,22 +94,6 @@
       <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21</windows>
    </vm>
 
-   <configurations>
-      <plugin id="org.apache.aries.spifly.dynamic.bundle" autoStart="true" startLevel="2" />
-      <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
-      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="4" />
-      <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
-      <plugin id="slf4j.simple" autoStart="true" startLevel="2" />
-      <property name="org.eclipse.update.reconcile" value="false" />
-      <property name="eclipse.buildId" value="${unqualifiedVersion}.${buildQualifier}" />
-      <property name="osgi.bundles.defaultStartLevel" value="4" />
-      <property name="osgi.instance.area.default" value="@user.home/workspace" />
-      <property name="osgi.instance.area.default" value="@user.home/Documents/workspace" os="macosx" />
-   </configurations>
-
    <license>
         <url>http://eclipse.org/legal/epl/notice.php</url>
         <text>
@@ -227,6 +240,11 @@ United States, other countries, or both.
          </text>
    </license>
 
+   <plugins>
+      <!-- either m2e.logback or slf4j.simple should be provided in each package -->
+      <plugin id="slf4j.simple"/>
+   </plugins>
+
    <features>
       <!-- common features that all products have -->
       <feature id="org.eclipse.epp.package.common.feature" version="4.38.0.qualifier"/>
@@ -282,10 +300,22 @@ United States, other countries, or both.
       <feature id="org.eclipse.tracecompass.lttng2.ust" installMode="root"/>
       <feature id="org.eclipse.mylyn.cdt.feature" installMode="root"/>
    </features>
-   <plugins>
-      <!-- either m2e.logback or slf4j.simple should be provided in each package -->
-      <plugin id="slf4j.simple"/>
-   </plugins>
+
+   <configurations>
+      <plugin id="org.apache.aries.spifly.dynamic.bundle" autoStart="true" startLevel="2" />
+      <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
+      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="4" />
+      <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
+      <plugin id="slf4j.simple" autoStart="true" startLevel="2" />
+      <property name="org.eclipse.update.reconcile" value="false" />
+      <property name="eclipse.buildId" value="${unqualifiedVersion}.${buildQualifier}" />
+      <property name="osgi.bundles.defaultStartLevel" value="4" />
+      <property name="osgi.instance.area.default" value="@user.home/workspace" />
+      <property name="osgi.instance.area.default" value="@user.home/Documents/workspace" os="macosx" />
+   </configurations>
 
    <repositories>
       <repository location="https://download.eclipse.org/eclipse/updates/4.38" name="The Eclipse Project Updates" enabled="true" />
diff --git a/packages/org.eclipse.epp.package.dsl.product/epp.product b/packages/org.eclipse.epp.package.dsl.product/epp.product
index e47268e19..213e84769 100644
--- a/packages/org.eclipse.epp.package.dsl.product/epp.product
+++ b/packages/org.eclipse.epp.package.dsl.product/epp.product
@@ -3,12 +3,18 @@
 
 <product name="Eclipse DSL Tools" uid="epp.package.dsl" id="org.eclipse.epp.package.dsl.product" application="org.eclipse.ui.ide.workbench" version="4.38.0.qualifier" type="features" includeLaunchers="true" autoIncludeRequirements="true">
 
-   <aboutInfo>
-      <image path="/org.eclipse.epp.package.dsl/eclipse_lg.png"/>
-      <text>
-         Specified in the plugin.xml of the branding plugin.
-      </text>
-   </aboutInfo>
+<!--
+
+This product definition is based on Eclipse Platform's platform.product.
+
+We need to redefine all the settings in platform.product to avoid duplicate
+settings, especially about -Dosgi.requiredJavaVersion=21
+(see a6b90b060b8c3684596e691254bf2f74a559b8aa / Bug 580807 for more history as to why)
+
+This file should be easy to compre against platform.product and non-obvious differences
+can and should be documented to keep ongoing maintenance easier.
+This file should also be easy to compare against all the other epp.product files
+-->
 
    <configIni use="default">
    </configIni>
@@ -19,6 +25,25 @@
 --launcher.defaultAction openFile
 --launcher.appendVmargs
       </programArgs>
+      <!--
+             -Dosgi.instance.area.default=@user.home/eclipse-workspace :
+             EPP has traditionally provided a different (more explicitly Eclipse) default
+
+             -Declipse.e4.inject.javax.warning=false :
+             disable javax.warning - this isn't something users can do anything about. Platform leaves them enabled because end
+             users don't typically use platform as a starting point, but ISVs who can help resolve it do
+
+             -Dsun.java.command=Eclipse :
+             When Eclipse is launched using the dll/so as the vm this provides a name
+             name for tools like jps.
+             (see 62b3bb4973a0ae375e56046f0b3ff910bc44f970 / Bug 568052 for more history as to why)
+
+             -XX:+UseG1GC and -XX:+UseStringDeduplication :
+             EPP has traditionally provided a different (more memory efficient) default
+
+             -Dorg.slf4j.simpleLogger.defaultLogLevel=off absent:
+             This produce uses m2e logback instead
+      -->
       <vmArgs>-Dosgi.requiredJavaVersion=21
 -Dosgi.instance.area.default=@user.home/eclipse-workspace
 -Dosgi.dataAreaRequiresExplicitInit=true
@@ -30,32 +55,39 @@
 -XX:+UseStringDeduplication
 --add-modules=ALL-SYSTEM
       </vmArgs>
-      <vmArgsMac>-XstartOnFirstThread
--Dorg.eclipse.swt.internal.carbon.smallFonts
--Xdock:icon=../Resources/Eclipse.icns
+      <vmArgsMac>-Xdock:icon=../Resources/Eclipse.icns -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
       </vmArgsMac>
    </launcherArgs>
 
    <windowImages i16="/org.eclipse.epp.package.dsl/eclipse16.png" i32="/org.eclipse.epp.package.dsl/eclipse32.png" i48="/org.eclipse.epp.package.dsl/eclipse48.png" i256="/org.eclipse.epp.package.dsl/eclipse256.png"/>
 
+   <!-- EPP has its own splash screen that includes "IDE" in the graphic -->
    <splash
       location="org.eclipse.epp.package.common"
       startupProgressRect="2,290,448,10"
       startupMessageRect="7,265,320,20"
       startupForegroundColor="ffffff" />
    <launcher name="eclipse">
-      <linux icon="../../icons/icon.xpm"/>
+      <linux icon="../../icons/eclipse.xpm"/>
       <macosx icon="../../icons/Eclipse.icns">
          <bundleUrlTypes>
             <bundleUrlType scheme="eclipse+command" name="Eclipse Command"/>
+            <!-- include the additional handler for mpc - this needs to be defined here so macOS entitlements work properly -->
             <bundleUrlType scheme="eclipse+mpc" name="Eclipse Marketplace"/>
          </bundleUrlTypes>
       </macosx>
       <win useIco="false">
-         <bmp/>
+         <bmp/> <!-- Use default branding icon of the eclipse exe for Windows -->
       </win>
    </launcher>
 
+   <aboutInfo>
+      <image path="/org.eclipse.epp.package.dsl/eclipse_lg.png"/>
+      <text>
+         Specified in the plugin.xml of the branding plugin.
+      </text>
+   </aboutInfo>
+
    <intro introId="org.eclipse.ui.intro.universal"/>
 
    <vm>
@@ -64,21 +96,6 @@
       <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21</windows>
    </vm>
 
-   <configurations>
-      <plugin id="org.apache.aries.spifly.dynamic.bundle" autoStart="true" startLevel="2" />
-      <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
-      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="4" />
-      <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
-      <property name="org.eclipse.update.reconcile" value="false" />
-      <property name="eclipse.buildId" value="${unqualifiedVersion}.${buildQualifier}" />
-      <property name="osgi.bundles.defaultStartLevel" value="4" />
-      <property name="osgi.instance.area.default" value="@user.home/workspace" />
-      <property name="osgi.instance.area.default" value="@user.home/Documents/workspace" os="macosx" />
-   </configurations>
-
    <license>
         <url>http://eclipse.org/legal/epl/notice.php</url>
         <text>
@@ -225,9 +242,12 @@ United States, other countries, or both.
          </text>
    </license>
 
-   <features>
-
+   <plugins>
+      <!-- either m2e.logback or slf4j.simple should be provided in each package -->
+      <!-- If you add entries here, change <product type=""> to mixed -->
+   </plugins>
 
+   <features>
       <!-- common features that all products have -->
       <feature id="org.eclipse.epp.package.common.feature" version="4.38.0.qualifier"/>
       <feature id="org.eclipse.platform" installMode="root"/>
@@ -258,6 +278,22 @@ United States, other countries, or both.
       <feature id="org.eclipse.buildship" installMode="root"/>
    </features>
 
+   <configurations>
+      <plugin id="org.apache.aries.spifly.dynamic.bundle" autoStart="true" startLevel="2" />
+      <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
+      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="4" />
+      <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
+      <!-- no starting slf4j.simple because this package uses m2e logback -->
+      <property name="org.eclipse.update.reconcile" value="false" />
+      <property name="eclipse.buildId" value="${unqualifiedVersion}.${buildQualifier}" />
+      <property name="osgi.bundles.defaultStartLevel" value="4" />
+      <property name="osgi.instance.area.default" value="@user.home/workspace" />
+      <property name="osgi.instance.area.default" value="@user.home/Documents/workspace" os="macosx" />
+   </configurations>
+
    <repositories>
       <repository location="https://download.eclipse.org/eclipse/updates/4.38" name="The Eclipse Project Updates" enabled="true" />
       <repository location="https://download.eclipse.org/releases/2025-12" name="2025-12" enabled="true" />
diff --git a/packages/org.eclipse.epp.package.embedcpp.product/epp.product b/packages/org.eclipse.epp.package.embedcpp.product/epp.product
index 2aae1f3ba..bccbfd90a 100644
--- a/packages/org.eclipse.epp.package.embedcpp.product/epp.product
+++ b/packages/org.eclipse.epp.package.embedcpp.product/epp.product
@@ -3,12 +3,18 @@
 
 <product name="Eclipse IDE for Embedded C/C++ Developers" uid="epp.package.embedcpp" application="org.eclipse.ui.ide.workbench" version="4.38.0.qualifier" type="mixed" includeLaunchers="true" autoIncludeRequirements="true">
 
-   <aboutInfo>
-      <image path="/org.eclipse.epp.package.embedcpp/eclipse_lg.png"/>
-      <text>
-         Specified in the plugin.xml of the branding plugin.
-      </text>
-   </aboutInfo>
+<!--
+
+This product definition is based on Eclipse Platform's platform.product.
+
+We need to redefine all the settings in platform.product to avoid duplicate
+settings, especially about -Dosgi.requiredJavaVersion=21
+(see a6b90b060b8c3684596e691254bf2f74a559b8aa / Bug 580807 for more history as to why)
+
+This file should be easy to compre against platform.product and non-obvious differences
+can and should be documented to keep ongoing maintenance easier.
+This file should also be easy to compare against all the other epp.product files
+-->
 
    <configIni use="default">
    </configIni>
@@ -19,6 +25,22 @@
 --launcher.defaultAction openFile
 --launcher.appendVmargs
       </programArgs>
+      <!--
+             -Dosgi.instance.area.default=@user.home/eclipse-workspace :
+             EPP has traditionally provided a different (more explicitly Eclipse) default
+
+             -Declipse.e4.inject.javax.warning=false :
+             disable javax.warning - this isn't something users can do anything about. Platform leaves them enabled because end
+             users don't typically use platform as a starting point, but ISVs who can help resolve it do
+
+             -Dsun.java.command=Eclipse :
+             When Eclipse is launched using the dll/so as the vm this provides a name
+             name for tools like jps.
+             (see 62b3bb4973a0ae375e56046f0b3ff910bc44f970 / Bug 568052 for more history as to why)
+
+             -XX:+UseG1GC and -XX:+UseStringDeduplication :
+             EPP has traditionally provided a different (more memory efficient) default
+      -->
       <vmArgs>-Dosgi.requiredJavaVersion=21
 -Dosgi.instance.area.default=@user.home/eclipse-workspace
 -Dosgi.dataAreaRequiresExplicitInit=true
@@ -31,32 +53,39 @@
 -XX:+UseStringDeduplication
 --add-modules=ALL-SYSTEM
       </vmArgs>
-      <vmArgsMac>-XstartOnFirstThread
--Dorg.eclipse.swt.internal.carbon.smallFonts
--Xdock:icon=../Resources/Eclipse.icns
+      <vmArgsMac>-Xdock:icon=../Resources/Eclipse.icns -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
       </vmArgsMac>
    </launcherArgs>
 
    <windowImages i16="/org.eclipse.epp.package.embedcpp/eclipse16.png" i32="/org.eclipse.epp.package.embedcpp/eclipse32.png" i48="/org.eclipse.epp.package.embedcpp/eclipse48.png" i256="/org.eclipse.epp.package.embedcpp/eclipse256.png"/>
 
+   <!-- EPP has its own splash screen that includes "IDE" in the graphic -->
    <splash
       location="org.eclipse.epp.package.common"
       startupProgressRect="2,290,448,10"
       startupMessageRect="7,265,320,20"
       startupForegroundColor="ffffff" />
    <launcher name="eclipse">
-      <linux icon="../../icons/icon.xpm"/>
+      <linux icon="../../icons/eclipse.xpm"/>
       <macosx icon="../../icons/Eclipse.icns">
          <bundleUrlTypes>
             <bundleUrlType scheme="eclipse+command" name="Eclipse Command"/>
+            <!-- include the additional handler for mpc - this needs to be defined here so macOS entitlements work properly -->
             <bundleUrlType scheme="eclipse+mpc" name="Eclipse Marketplace"/>
          </bundleUrlTypes>
       </macosx>
       <win useIco="false">
-         <bmp/>
+         <bmp/> <!-- Use default branding icon of the eclipse exe for Windows -->
       </win>
    </launcher>
 
+   <aboutInfo>
+      <image path="/org.eclipse.epp.package.embedcpp/eclipse_lg.png"/>
+      <text>
+         Specified in the plugin.xml of the branding plugin.
+      </text>
+   </aboutInfo>
+
    <intro introId="org.eclipse.ui.intro.universal"/>
 
    <vm>
@@ -65,22 +94,6 @@
       <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21</windows>
    </vm>
 
-   <configurations>
-      <plugin id="org.apache.aries.spifly.dynamic.bundle" autoStart="true" startLevel="2" />
-      <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
-      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="4" />
-      <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
-      <plugin id="slf4j.simple" autoStart="true" startLevel="2" />
-      <property name="org.eclipse.update.reconcile" value="false" />
-      <property name="eclipse.buildId" value="${unqualifiedVersion}.${buildQualifier}" />
-      <property name="osgi.bundles.defaultStartLevel" value="4" />
-      <property name="osgi.instance.area.default" value="@user.home/workspace" />
-      <property name="osgi.instance.area.default" value="@user.home/Documents/workspace" os="macosx" />
-   </configurations>
-
    <license>
         <url>http://eclipse.org/legal/epl/notice.php</url>
         <text>
@@ -227,9 +240,12 @@ United States, other countries, or both.
          </text>
    </license>
 
-   <features>
-
+   <plugins>
+      <!-- either m2e.logback or slf4j.simple should be provided in each package -->
+      <plugin id="slf4j.simple"/>
+   </plugins>
 
+   <features>
       <!-- common features that all products have -->
       <feature id="org.eclipse.epp.package.common.feature" version="4.38.0.qualifier"/>
       <feature id="org.eclipse.platform" installMode="root"/>
@@ -298,10 +314,22 @@ United States, other countries, or both.
       <feature id="org.eclipse.embedcdt.templates.xpack" installMode="root"/>
       <feature id="org.eclipse.mylyn.cdt.feature" installMode="root"/>
    </features>
-   <plugins>
-      <!-- either m2e.logback or slf4j.simple should be provided in each package -->
-      <plugin id="slf4j.simple"/>
-   </plugins>
+
+   <configurations>
+      <plugin id="org.apache.aries.spifly.dynamic.bundle" autoStart="true" startLevel="2" />
+      <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
+      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="4" />
+      <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
+      <plugin id="slf4j.simple" autoStart="true" startLevel="2" />
+      <property name="org.eclipse.update.reconcile" value="false" />
+      <property name="eclipse.buildId" value="${unqualifiedVersion}.${buildQualifier}" />
+      <property name="osgi.bundles.defaultStartLevel" value="4" />
+      <property name="osgi.instance.area.default" value="@user.home/workspace" />
+      <property name="osgi.instance.area.default" value="@user.home/Documents/workspace" os="macosx" />
+   </configurations>
 
    <repositories>
       <repository location="https://download.eclipse.org/eclipse/updates/4.38" name="The Eclipse Project Updates" enabled="true" />
diff --git a/packages/org.eclipse.epp.package.java.product/epp.product b/packages/org.eclipse.epp.package.java.product/epp.product
index 4b2c00823..a213959a2 100644
--- a/packages/org.eclipse.epp.package.java.product/epp.product
+++ b/packages/org.eclipse.epp.package.java.product/epp.product
@@ -3,12 +3,18 @@
 
 <product name="Eclipse IDE for Java Developers" uid="epp.package.java" id="org.eclipse.epp.package.java.product" application="org.eclipse.ui.ide.workbench" version="4.38.0.qualifier" type="features" includeLaunchers="true" autoIncludeRequirements="true">
 
-   <aboutInfo>
-      <image path="/org.eclipse.epp.package.java/eclipse_lg.png"/>
-      <text>
-         Specified in the plugin.xml of the branding plugin.
-      </text>
-   </aboutInfo>
+<!--
+
+This product definition is based on Eclipse Platform's platform.product.
+
+We need to redefine all the settings in platform.product to avoid duplicate
+settings, especially about -Dosgi.requiredJavaVersion=21
+(see a6b90b060b8c3684596e691254bf2f74a559b8aa / Bug 580807 for more history as to why)
+
+This file should be easy to compre against platform.product and non-obvious differences
+can and should be documented to keep ongoing maintenance easier.
+This file should also be easy to compare against all the other epp.product files
+-->
 
    <configIni use="default">
    </configIni>
@@ -19,6 +25,25 @@
 --launcher.defaultAction openFile
 --launcher.appendVmargs
       </programArgs>
+      <!--
+             -Dosgi.instance.area.default=@user.home/eclipse-workspace :
+             EPP has traditionally provided a different (more explicitly Eclipse) default
+
+             -Declipse.e4.inject.javax.warning=false :
+             disable javax.warning - this isn't something users can do anything about. Platform leaves them enabled because end
+             users don't typically use platform as a starting point, but ISVs who can help resolve it do
+
+             -Dsun.java.command=Eclipse :
+             When Eclipse is launched using the dll/so as the vm this provides a name
+             name for tools like jps.
+             (see 62b3bb4973a0ae375e56046f0b3ff910bc44f970 / Bug 568052 for more history as to why)
+
+             -XX:+UseG1GC and -XX:+UseStringDeduplication :
+             EPP has traditionally provided a different (more memory efficient) default
+
+             -Dorg.slf4j.simpleLogger.defaultLogLevel=off absent:
+             This produce uses m2e logback instead
+      -->
       <vmArgs>-Dosgi.requiredJavaVersion=21
 -Dosgi.instance.area.default=@user.home/eclipse-workspace
 -Dosgi.dataAreaRequiresExplicitInit=true
@@ -30,32 +55,39 @@
 -XX:+UseStringDeduplication
 --add-modules=ALL-SYSTEM
       </vmArgs>
-      <vmArgsMac>-XstartOnFirstThread
--Dorg.eclipse.swt.internal.carbon.smallFonts
--Xdock:icon=../Resources/Eclipse.icns
+      <vmArgsMac>-Xdock:icon=../Resources/Eclipse.icns -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
       </vmArgsMac>
    </launcherArgs>
 
    <windowImages i16="/org.eclipse.epp.package.java/eclipse16.png" i32="/org.eclipse.epp.package.java/eclipse32.png" i48="/org.eclipse.epp.package.java/eclipse48.png" i256="/org.eclipse.epp.package.java/eclipse256.png"/>
 
+   <!-- EPP has its own splash screen that includes "IDE" in the graphic -->
    <splash
       location="org.eclipse.epp.package.common"
       startupProgressRect="2,290,448,10"
       startupMessageRect="7,265,320,20"
       startupForegroundColor="ffffff" />
    <launcher name="eclipse">
-      <linux icon="../../icons/icon.xpm"/>
+      <linux icon="../../icons/eclipse.xpm"/>
       <macosx icon="../../icons/Eclipse.icns">
          <bundleUrlTypes>
             <bundleUrlType scheme="eclipse+command" name="Eclipse Command"/>
+            <!-- include the additional handler for mpc - this needs to be defined here so macOS entitlements work properly -->
             <bundleUrlType scheme="eclipse+mpc" name="Eclipse Marketplace"/>
          </bundleUrlTypes>
       </macosx>
       <win useIco="false">
-         <bmp/>
+         <bmp/> <!-- Use default branding icon of the eclipse exe for Windows -->
       </win>
    </launcher>
 
+   <aboutInfo>
+      <image path="/org.eclipse.epp.package.java/eclipse_lg.png"/>
+      <text>
+         Specified in the plugin.xml of the branding plugin.
+      </text>
+   </aboutInfo>
+
    <intro introId="org.eclipse.ui.intro.universal"/>
 
    <vm>
@@ -64,21 +96,6 @@
       <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21</windows>
    </vm>
 
-   <configurations>
-      <plugin id="org.apache.aries.spifly.dynamic.bundle" autoStart="true" startLevel="2" />
-      <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
-      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="4" />
-      <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
-      <property name="org.eclipse.update.reconcile" value="false" />
-      <property name="eclipse.buildId" value="${unqualifiedVersion}.${buildQualifier}" />
-      <property name="osgi.bundles.defaultStartLevel" value="4" />
-      <property name="osgi.instance.area.default" value="@user.home/workspace" />
-      <property name="osgi.instance.area.default" value="@user.home/Documents/workspace" os="macosx" />
-   </configurations>
-
    <license>
         <url>http://eclipse.org/legal/epl/notice.php</url>
         <text>
@@ -225,9 +242,12 @@ United States, other countries, or both.
          </text>
    </license>
 
-   <features>
-
+   <plugins>
+      <!-- either m2e.logback or slf4j.simple should be provided in each package -->
+      <!-- If you add entries here, change <product type=""> to mixed -->
+   </plugins>
 
+   <features>
       <!-- common features that all products have -->
       <feature id="org.eclipse.epp.package.common.feature" version="4.38.0.qualifier"/>
       <feature id="org.eclipse.platform" installMode="root"/>
@@ -265,6 +285,22 @@ United States, other countries, or both.
       <feature id="org.eclipse.mylyn.jdt.feature" installMode="root"/>
    </features>
 
+   <configurations>
+      <plugin id="org.apache.aries.spifly.dynamic.bundle" autoStart="true" startLevel="2" />
+      <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
+      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="4" />
+      <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
+      <!-- no starting slf4j.simple because this package uses m2e logback -->
+      <property name="org.eclipse.update.reconcile" value="false" />
+      <property name="eclipse.buildId" value="${unqualifiedVersion}.${buildQualifier}" />
+      <property name="osgi.bundles.defaultStartLevel" value="4" />
+      <property name="osgi.instance.area.default" value="@user.home/workspace" />
+      <property name="osgi.instance.area.default" value="@user.home/Documents/workspace" os="macosx" />
+   </configurations>
+
    <repositories>
       <repository location="https://download.eclipse.org/eclipse/updates/4.38" name="The Eclipse Project Updates" enabled="true" />
       <repository location="https://download.eclipse.org/releases/2025-12" name="2025-12" enabled="true" />
diff --git a/packages/org.eclipse.epp.package.jee.product/epp.product b/packages/org.eclipse.epp.package.jee.product/epp.product
index b3cd57351..833023d82 100644
--- a/packages/org.eclipse.epp.package.jee.product/epp.product
+++ b/packages/org.eclipse.epp.package.jee.product/epp.product
@@ -3,12 +3,18 @@
 
 <product name="Eclipse IDE for Enterprise Java and Web Developers" uid="epp.package.jee" id="org.eclipse.epp.package.jee.product" application="org.eclipse.ui.ide.workbench" version="4.38.0.qualifier" type="features" includeLaunchers="true" autoIncludeRequirements="true">
 
-   <aboutInfo>
-      <image path="/org.eclipse.epp.package.jee/eclipse_lg.png"/>
-      <text>
-         Specified in the plugin.xml of the branding plugin.
-      </text>
-   </aboutInfo>
+<!--
+
+This product definition is based on Eclipse Platform's platform.product.
+
+We need to redefine all the settings in platform.product to avoid duplicate
+settings, especially about -Dosgi.requiredJavaVersion=21
+(see a6b90b060b8c3684596e691254bf2f74a559b8aa / Bug 580807 for more history as to why)
+
+This file should be easy to compre against platform.product and non-obvious differences
+can and should be documented to keep ongoing maintenance easier.
+This file should also be easy to compare against all the other epp.product files
+-->
 
    <configIni use="default">
    </configIni>
@@ -19,6 +25,25 @@
 --launcher.defaultAction openFile
 --launcher.appendVmargs
       </programArgs>
+      <!--
+             -Dosgi.instance.area.default=@user.home/eclipse-workspace :
+             EPP has traditionally provided a different (more explicitly Eclipse) default
+
+             -Declipse.e4.inject.javax.warning=false :
+             disable javax.warning - this isn't something users can do anything about. Platform leaves them enabled because end
+             users don't typically use platform as a starting point, but ISVs who can help resolve it do
+
+             -Dsun.java.command=Eclipse :
+             When Eclipse is launched using the dll/so as the vm this provides a name
+             name for tools like jps.
+             (see 62b3bb4973a0ae375e56046f0b3ff910bc44f970 / Bug 568052 for more history as to why)
+
+             -XX:+UseG1GC and -XX:+UseStringDeduplication :
+             EPP has traditionally provided a different (more memory efficient) default
+
+             -Dorg.slf4j.simpleLogger.defaultLogLevel=off absent:
+             This produce uses m2e logback instead
+      -->
       <vmArgs>-Dosgi.requiredJavaVersion=21
 -Dosgi.instance.area.default=@user.home/eclipse-workspace
 -Dosgi.dataAreaRequiresExplicitInit=true
@@ -30,32 +55,41 @@
 -XX:+UseStringDeduplication
 --add-modules=ALL-SYSTEM
       </vmArgs>
-      <vmArgsMac>-XstartOnFirstThread
--Dorg.eclipse.swt.internal.carbon.smallFonts
--Xdock:icon=../Resources/Eclipse.icns
+      <vmArgsMac>-Xdock:icon=../Resources/Eclipse.icns -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
       </vmArgsMac>
    </launcherArgs>
 
+   <!-- JEE has a different set of icons that the rest of EPP -->
    <windowImages i16="/org.eclipse.epp.package.jee/javaee-ide_x16.png" i32="/org.eclipse.epp.package.jee/javaee-ide_x32.png" i48="/org.eclipse.epp.package.jee/javaee-ide_x48.png"/>
 
+   <!-- EPP has its own splash screen that includes "IDE" in the graphic -->
    <splash
       location="org.eclipse.epp.package.common"
       startupProgressRect="2,290,448,10"
       startupMessageRect="7,265,320,20"
       startupForegroundColor="ffffff" />
    <launcher name="eclipse">
-      <linux icon="../../icons/icon.xpm"/>
+      <linux icon="../../icons/eclipse.xpm"/>
       <macosx icon="../../icons/Eclipse.icns">
          <bundleUrlTypes>
             <bundleUrlType scheme="eclipse+command" name="Eclipse Command"/>
+            <!-- include the additional handler for mpc - this needs to be defined here so macOS entitlements work properly -->
             <bundleUrlType scheme="eclipse+mpc" name="Eclipse Marketplace"/>
          </bundleUrlTypes>
       </macosx>
       <win useIco="false">
-         <bmp/>
+         <bmp/> <!-- Use default branding icon of the eclipse exe for Windows -->
       </win>
    </launcher>
 
+   <aboutInfo>
+      <image path="/org.eclipse.epp.package.jee/eclipse_lg.png"/>
+      <text>
+         Specified in the plugin.xml of the branding plugin.
+      </text>
+   </aboutInfo>
+
+   <!-- JEE has a different welcome than the rest of EPP -->
    <intro introId="org.eclipse.wtp.epp.package.jee.intro.intro"/>
 
    <vm>
@@ -64,21 +98,6 @@
       <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21</windows>
    </vm>
 
-   <configurations>
-      <plugin id="org.apache.aries.spifly.dynamic.bundle" autoStart="true" startLevel="2" />
-      <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
-      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="4" />
-      <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
-      <property name="org.eclipse.update.reconcile" value="false" />
-      <property name="eclipse.buildId" value="${unqualifiedVersion}.${buildQualifier}" />
-      <property name="osgi.bundles.defaultStartLevel" value="4" />
-      <property name="osgi.instance.area.default" value="@user.home/workspace" />
-      <property name="osgi.instance.area.default" value="@user.home/Documents/workspace" os="macosx" />
-   </configurations>
-
    <license>
         <url>http://eclipse.org/legal/epl/notice.php</url>
         <text>
@@ -225,9 +244,12 @@ United States, other countries, or both.
          </text>
    </license>
 
-   <features>
-
+   <plugins>
+      <!-- either m2e.logback or slf4j.simple should be provided in each package -->
+      <!-- If you add entries here, change <product type=""> to mixed -->
+   </plugins>
 
+   <features>
       <!-- common features that all products have -->
       <feature id="org.eclipse.epp.package.common.feature" version="4.38.0.qualifier"/>
       <feature id="org.eclipse.platform" installMode="root"/>
@@ -332,6 +354,22 @@ United States, other countries, or both.
       <feature id="org.eclipse.mylyn.pde.feature" installMode="root"/>
    </features>
 
+   <configurations>
+      <plugin id="org.apache.aries.spifly.dynamic.bundle" autoStart="true" startLevel="2" />
+      <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
+      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="4" />
+      <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
+      <!-- no starting slf4j.simple because this package uses m2e logback -->
+      <property name="org.eclipse.update.reconcile" value="false" />
+      <property name="eclipse.buildId" value="${unqualifiedVersion}.${buildQualifier}" />
+      <property name="osgi.bundles.defaultStartLevel" value="4" />
+      <property name="osgi.instance.area.default" value="@user.home/workspace" />
+      <property name="osgi.instance.area.default" value="@user.home/Documents/workspace" os="macosx" />
+   </configurations>
+
    <repositories>
       <repository location="https://download.eclipse.org/eclipse/updates/4.38" name="The Eclipse Project Updates" enabled="true" />
       <repository location="https://download.eclipse.org/releases/2025-12" name="2025-12" enabled="true" />
diff --git a/packages/org.eclipse.epp.package.modeling.product/epp.product b/packages/org.eclipse.epp.package.modeling.product/epp.product
index d58975551..76fb71fda 100644
--- a/packages/org.eclipse.epp.package.modeling.product/epp.product
+++ b/packages/org.eclipse.epp.package.modeling.product/epp.product
@@ -3,12 +3,18 @@
 
 <product name="Eclipse Modeling Tools" uid="epp.package.modeling" id="org.eclipse.epp.package.modeling.product" application="org.eclipse.ui.ide.workbench" version="4.38.0.qualifier" type="mixed" includeLaunchers="true" autoIncludeRequirements="true">
 
-   <aboutInfo>
-      <image path="/org.eclipse.epp.package.modeling/eclipse_lg.png"/>
-      <text>
-         Specified in the plugin.xml of the branding plugin.
-      </text>
-   </aboutInfo>
+<!--
+
+This product definition is based on Eclipse Platform's platform.product.
+
+We need to redefine all the settings in platform.product to avoid duplicate
+settings, especially about -Dosgi.requiredJavaVersion=21
+(see a6b90b060b8c3684596e691254bf2f74a559b8aa / Bug 580807 for more history as to why)
+
+This file should be easy to compre against platform.product and non-obvious differences
+can and should be documented to keep ongoing maintenance easier.
+This file should also be easy to compare against all the other epp.product files
+-->
 
    <configIni use="default">
    </configIni>
@@ -19,6 +25,22 @@
 --launcher.defaultAction openFile
 --launcher.appendVmargs
       </programArgs>
+      <!--
+             -Dosgi.instance.area.default=@user.home/eclipse-workspace :
+             EPP has traditionally provided a different (more explicitly Eclipse) default
+
+             -Declipse.e4.inject.javax.warning=false :
+             disable javax.warning - this isn't something users can do anything about. Platform leaves them enabled because end
+             users don't typically use platform as a starting point, but ISVs who can help resolve it do
+
+             -Dsun.java.command=Eclipse :
+             When Eclipse is launched using the dll/so as the vm this provides a name
+             name for tools like jps.
+             (see 62b3bb4973a0ae375e56046f0b3ff910bc44f970 / Bug 568052 for more history as to why)
+
+             -XX:+UseG1GC and -XX:+UseStringDeduplication :
+             EPP has traditionally provided a different (more memory efficient) default
+      -->
       <vmArgs>-Dosgi.requiredJavaVersion=21
 -Dosgi.instance.area.default=@user.home/eclipse-workspace
 -Dosgi.dataAreaRequiresExplicitInit=true
@@ -31,32 +53,39 @@
 -XX:+UseStringDeduplication
 --add-modules=ALL-SYSTEM
       </vmArgs>
-      <vmArgsMac>-XstartOnFirstThread
--Dorg.eclipse.swt.internal.carbon.smallFonts
--Xdock:icon=../Resources/Eclipse.icns
+      <vmArgsMac>-Xdock:icon=../Resources/Eclipse.icns -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
       </vmArgsMac>
    </launcherArgs>
 
    <windowImages i16="/org.eclipse.epp.package.modeling/eclipse16.png" i32="/org.eclipse.epp.package.modeling/eclipse32.png" i48="/org.eclipse.epp.package.modeling/eclipse48.png" i256="/org.eclipse.epp.package.modeling/eclipse256.png"/>
 
+   <!-- EPP has its own splash screen that includes "IDE" in the graphic -->
    <splash
       location="org.eclipse.epp.package.common"
       startupProgressRect="2,290,448,10"
       startupMessageRect="7,265,320,20"
       startupForegroundColor="ffffff" />
    <launcher name="eclipse">
-      <linux icon="../../icons/icon.xpm"/>
+      <linux icon="../../icons/eclipse.xpm"/>
       <macosx icon="../../icons/Eclipse.icns">
          <bundleUrlTypes>
             <bundleUrlType scheme="eclipse+command" name="Eclipse Command"/>
+            <!-- include the additional handler for mpc - this needs to be defined here so macOS entitlements work properly -->
             <bundleUrlType scheme="eclipse+mpc" name="Eclipse Marketplace"/>
          </bundleUrlTypes>
       </macosx>
       <win useIco="false">
-         <bmp/>
+         <bmp/> <!-- Use default branding icon of the eclipse exe for Windows -->
       </win>
    </launcher>
 
+   <aboutInfo>
+      <image path="/org.eclipse.epp.package.modeling/eclipse_lg.png"/>
+      <text>
+         Specified in the plugin.xml of the branding plugin.
+      </text>
+   </aboutInfo>
+
    <intro introId="org.eclipse.ui.intro.universal"/>
 
    <vm>
@@ -65,22 +94,6 @@
       <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21</windows>
    </vm>
 
-   <configurations>
-      <plugin id="org.apache.aries.spifly.dynamic.bundle" autoStart="true" startLevel="2" />
-      <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
-      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="4" />
-      <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
-      <plugin id="slf4j.simple" autoStart="true" startLevel="2" />
-      <property name="org.eclipse.update.reconcile" value="false" />
-      <property name="eclipse.buildId" value="${unqualifiedVersion}.${buildQualifier}" />
-      <property name="osgi.bundles.defaultStartLevel" value="4" />
-      <property name="osgi.instance.area.default" value="@user.home/workspace" />
-      <property name="osgi.instance.area.default" value="@user.home/Documents/workspace" os="macosx" />
-   </configurations>
-
    <license>
         <url>http://eclipse.org/legal/epl/notice.php</url>
         <text>
@@ -227,9 +240,12 @@ United States, other countries, or both.
          </text>
    </license>
 
-   <features>
-
+   <plugins>
+      <!-- either m2e.logback or slf4j.simple should be provided in each package -->
+      <plugin id="slf4j.simple"/>
+   </plugins>
 
+   <features>
       <!-- common features that all products have -->
       <feature id="org.eclipse.epp.package.common.feature" version="4.38.0.qualifier"/>
       <feature id="org.eclipse.platform" installMode="root"/>
@@ -279,10 +295,22 @@ United States, other countries, or both.
       <feature id="org.eclipse.mylyn.jdt.feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.pde.feature" installMode="root"/>
    </features>
-   <plugins>
-      <!-- either m2e.logback or slf4j.simple should be provided in each package -->
-      <plugin id="slf4j.simple"/>
-   </plugins>
+
+   <configurations>
+      <plugin id="org.apache.aries.spifly.dynamic.bundle" autoStart="true" startLevel="2" />
+      <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
+      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="4" />
+      <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
+      <plugin id="slf4j.simple" autoStart="true" startLevel="2" />
+      <property name="org.eclipse.update.reconcile" value="false" />
+      <property name="eclipse.buildId" value="${unqualifiedVersion}.${buildQualifier}" />
+      <property name="osgi.bundles.defaultStartLevel" value="4" />
+      <property name="osgi.instance.area.default" value="@user.home/workspace" />
+      <property name="osgi.instance.area.default" value="@user.home/Documents/workspace" os="macosx" />
+   </configurations>
 
    <repositories>
       <repository location="https://download.eclipse.org/eclipse/updates/4.38" name="The Eclipse Project Updates" enabled="true" />
diff --git a/packages/org.eclipse.epp.package.php.product/epp.product b/packages/org.eclipse.epp.package.php.product/epp.product
index 6fcf8841d..10db2a1b6 100644
--- a/packages/org.eclipse.epp.package.php.product/epp.product
+++ b/packages/org.eclipse.epp.package.php.product/epp.product
@@ -3,12 +3,18 @@
 
 <product name="Eclipse IDE for PHP Developers" uid="epp.package.php" id="org.eclipse.epp.package.php.product" application="org.eclipse.ui.ide.workbench" version="4.38.0.qualifier" type="mixed" includeLaunchers="true" autoIncludeRequirements="true">
 
-   <aboutInfo>
-      <image path="/org.eclipse.epp.package.php/eclipse_lg.png"/>
-      <text>
-         Specified in the plugin.xml of the branding plugin.
-      </text>
-   </aboutInfo>
+<!--
+
+This product definition is based on Eclipse Platform's platform.product.
+
+We need to redefine all the settings in platform.product to avoid duplicate
+settings, especially about -Dosgi.requiredJavaVersion=21
+(see a6b90b060b8c3684596e691254bf2f74a559b8aa / Bug 580807 for more history as to why)
+
+This file should be easy to compre against platform.product and non-obvious differences
+can and should be documented to keep ongoing maintenance easier.
+This file should also be easy to compare against all the other epp.product files
+-->
 
    <configIni use="default">
    </configIni>
@@ -19,6 +25,22 @@
 --launcher.defaultAction openFile
 --launcher.appendVmargs
       </programArgs>
+      <!--
+             -Dosgi.instance.area.default=@user.home/eclipse-workspace :
+             EPP has traditionally provided a different (more explicitly Eclipse) default
+
+             -Declipse.e4.inject.javax.warning=false :
+             disable javax.warning - this isn't something users can do anything about. Platform leaves them enabled because end
+             users don't typically use platform as a starting point, but ISVs who can help resolve it do
+
+             -Dsun.java.command=Eclipse :
+             When Eclipse is launched using the dll/so as the vm this provides a name
+             name for tools like jps.
+             (see 62b3bb4973a0ae375e56046f0b3ff910bc44f970 / Bug 568052 for more history as to why)
+
+             -XX:+UseG1GC and -XX:+UseStringDeduplication :
+             EPP has traditionally provided a different (more memory efficient) default
+      -->
       <vmArgs>-Dosgi.requiredJavaVersion=21
 -Dosgi.instance.area.default=@user.home/eclipse-workspace
 -Dosgi.dataAreaRequiresExplicitInit=true
@@ -31,32 +53,39 @@
 -XX:+UseStringDeduplication
 --add-modules=ALL-SYSTEM
       </vmArgs>
-      <vmArgsMac>-XstartOnFirstThread
--Dorg.eclipse.swt.internal.carbon.smallFonts
--Xdock:icon=../Resources/Eclipse.icns
+      <vmArgsMac>-Xdock:icon=../Resources/Eclipse.icns -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
       </vmArgsMac>
    </launcherArgs>
 
    <windowImages i16="/org.eclipse.epp.package.php/eclipse16.png" i32="/org.eclipse.epp.package.php/eclipse32.png" i48="/org.eclipse.epp.package.php/eclipse48.png" i256="/org.eclipse.epp.package.php/eclipse256.png"/>
 
+   <!-- EPP has its own splash screen that includes "IDE" in the graphic -->
    <splash
       location="org.eclipse.epp.package.common"
       startupProgressRect="2,290,448,10"
       startupMessageRect="7,265,320,20"
       startupForegroundColor="ffffff" />
    <launcher name="eclipse">
-      <linux icon="../../icons/icon.xpm"/>
+      <linux icon="../../icons/eclipse.xpm"/>
       <macosx icon="../../icons/Eclipse.icns">
          <bundleUrlTypes>
             <bundleUrlType scheme="eclipse+command" name="Eclipse Command"/>
+            <!-- include the additional handler for mpc - this needs to be defined here so macOS entitlements work properly -->
             <bundleUrlType scheme="eclipse+mpc" name="Eclipse Marketplace"/>
          </bundleUrlTypes>
       </macosx>
       <win useIco="false">
-         <bmp/>
+         <bmp/> <!-- Use default branding icon of the eclipse exe for Windows -->
       </win>
    </launcher>
 
+   <aboutInfo>
+      <image path="/org.eclipse.epp.package.php/eclipse_lg.png"/>
+      <text>
+         Specified in the plugin.xml of the branding plugin.
+      </text>
+   </aboutInfo>
+
    <intro introId="org.eclipse.ui.intro.universal"/>
 
    <vm>
@@ -65,22 +94,6 @@
       <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21</windows>
    </vm>
 
-   <configurations>
-      <plugin id="org.apache.aries.spifly.dynamic.bundle" autoStart="true" startLevel="2" />
-      <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
-      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="4" />
-      <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
-      <plugin id="slf4j.simple" autoStart="true" startLevel="2" />
-      <property name="org.eclipse.update.reconcile" value="false" />
-      <property name="eclipse.buildId" value="${unqualifiedVersion}.${buildQualifier}" />
-      <property name="osgi.bundles.defaultStartLevel" value="4" />
-      <property name="osgi.instance.area.default" value="@user.home/workspace" />
-      <property name="osgi.instance.area.default" value="@user.home/Documents/workspace" os="macosx" />
-   </configurations>
-
    <license>
         <url>http://eclipse.org/legal/epl/notice.php</url>
         <text>
@@ -227,9 +240,12 @@ United States, other countries, or both.
          </text>
    </license>
 
-   <features>
-
+   <plugins>
+      <!-- either m2e.logback or slf4j.simple should be provided in each package -->
+      <plugin id="slf4j.simple"/>
+   </plugins>
 
+   <features>
       <!-- common features that all products have -->
       <feature id="org.eclipse.epp.package.common.feature" version="4.38.0.qualifier"/>
       <feature id="org.eclipse.platform" installMode="root"/>
@@ -265,10 +281,22 @@ United States, other countries, or both.
       <feature id="org.eclipse.wildwebdeveloper.embedder.node.feature" installMode="root"/>
       <feature id="org.eclipse.php.mylyn" installMode="root"/>
    </features>
-   <plugins>
-      <!-- either m2e.logback or slf4j.simple should be provided in each package -->
-      <plugin id="slf4j.simple"/>
-   </plugins>
+
+   <configurations>
+      <plugin id="org.apache.aries.spifly.dynamic.bundle" autoStart="true" startLevel="2" />
+      <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
+      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="4" />
+      <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
+      <plugin id="slf4j.simple" autoStart="true" startLevel="2" />
+      <property name="org.eclipse.update.reconcile" value="false" />
+      <property name="eclipse.buildId" value="${unqualifiedVersion}.${buildQualifier}" />
+      <property name="osgi.bundles.defaultStartLevel" value="4" />
+      <property name="osgi.instance.area.default" value="@user.home/workspace" />
+      <property name="osgi.instance.area.default" value="@user.home/Documents/workspace" os="macosx" />
+   </configurations>
 
    <repositories>
       <repository location="https://download.eclipse.org/eclipse/updates/4.38" name="The Eclipse Project Updates" enabled="true" />
diff --git a/packages/org.eclipse.epp.package.rcp.product/epp.product b/packages/org.eclipse.epp.package.rcp.product/epp.product
index b4cdc611b..29a27c16a 100644
--- a/packages/org.eclipse.epp.package.rcp.product/epp.product
+++ b/packages/org.eclipse.epp.package.rcp.product/epp.product
@@ -3,12 +3,18 @@
 
 <product name="Eclipse for RCP and RAP Developers" uid="epp.package.rcp" id="org.eclipse.epp.package.rcp.product" application="org.eclipse.ui.ide.workbench" version="4.38.0.qualifier" type="features" includeLaunchers="true" autoIncludeRequirements="true">
 
-   <aboutInfo>
-      <image path="/org.eclipse.epp.package.rcp/eclipse_lg.png"/>
-      <text>
-         Specified in the plugin.xml of the branding plugin.
-      </text>
-   </aboutInfo>
+<!--
+
+This product definition is based on Eclipse Platform's platform.product.
+
+We need to redefine all the settings in platform.product to avoid duplicate
+settings, especially about -Dosgi.requiredJavaVersion=21
+(see a6b90b060b8c3684596e691254bf2f74a559b8aa / Bug 580807 for more history as to why)
+
+This file should be easy to compre against platform.product and non-obvious differences
+can and should be documented to keep ongoing maintenance easier.
+This file should also be easy to compare against all the other epp.product files
+-->
 
    <configIni use="default">
    </configIni>
@@ -19,6 +25,25 @@
 --launcher.defaultAction openFile
 --launcher.appendVmargs
       </programArgs>
+      <!--
+             -Dosgi.instance.area.default=@user.home/eclipse-workspace :
+             EPP has traditionally provided a different (more explicitly Eclipse) default
+
+             -Declipse.e4.inject.javax.warning=false :
+             disable javax.warning - this isn't something users can do anything about. Platform leaves them enabled because end
+             users don't typically use platform as a starting point, but ISVs who can help resolve it do
+
+             -Dsun.java.command=Eclipse :
+             When Eclipse is launched using the dll/so as the vm this provides a name
+             name for tools like jps.
+             (see 62b3bb4973a0ae375e56046f0b3ff910bc44f970 / Bug 568052 for more history as to why)
+
+             -XX:+UseG1GC and -XX:+UseStringDeduplication :
+             EPP has traditionally provided a different (more memory efficient) default
+
+             -Dorg.slf4j.simpleLogger.defaultLogLevel=off absent:
+             This produce uses m2e logback instead
+      -->
       <vmArgs>-Dosgi.requiredJavaVersion=21
 -Dosgi.instance.area.default=@user.home/eclipse-workspace
 -Dosgi.dataAreaRequiresExplicitInit=true
@@ -30,32 +55,39 @@
 -XX:+UseStringDeduplication
 --add-modules=ALL-SYSTEM
       </vmArgs>
-      <vmArgsMac>-XstartOnFirstThread
--Dorg.eclipse.swt.internal.carbon.smallFonts
--Xdock:icon=../Resources/Eclipse.icns
+      <vmArgsMac>-Xdock:icon=../Resources/Eclipse.icns -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
       </vmArgsMac>
    </launcherArgs>
 
    <windowImages i16="/org.eclipse.epp.package.rcp/eclipse16.png" i32="/org.eclipse.epp.package.rcp/eclipse32.png" i48="/org.eclipse.epp.package.rcp/eclipse48.png" i256="/org.eclipse.epp.package.rcp/eclipse256.png"/>
 
+   <!-- EPP has its own splash screen that includes "IDE" in the graphic -->
    <splash
       location="org.eclipse.epp.package.common"
       startupProgressRect="2,290,448,10"
       startupMessageRect="7,265,320,20"
       startupForegroundColor="ffffff" />
    <launcher name="eclipse">
-      <linux icon="../../icons/icon.xpm"/>
+      <linux icon="../../icons/eclipse.xpm"/>
       <macosx icon="../../icons/Eclipse.icns">
          <bundleUrlTypes>
             <bundleUrlType scheme="eclipse+command" name="Eclipse Command"/>
+            <!-- include the additional handler for mpc - this needs to be defined here so macOS entitlements work properly -->
             <bundleUrlType scheme="eclipse+mpc" name="Eclipse Marketplace"/>
          </bundleUrlTypes>
       </macosx>
       <win useIco="false">
-         <bmp/>
+         <bmp/> <!-- Use default branding icon of the eclipse exe for Windows -->
       </win>
    </launcher>
 
+   <aboutInfo>
+      <image path="/org.eclipse.epp.package.rcp/eclipse_lg.png"/>
+      <text>
+         Specified in the plugin.xml of the branding plugin.
+      </text>
+   </aboutInfo>
+
    <intro introId="org.eclipse.ui.intro.universal"/>
 
    <vm>
@@ -64,21 +96,6 @@
       <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21</windows>
    </vm>
 
-   <configurations>
-      <plugin id="org.apache.aries.spifly.dynamic.bundle" autoStart="true" startLevel="2" />
-      <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
-      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="4" />
-      <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
-      <property name="org.eclipse.update.reconcile" value="false" />
-      <property name="eclipse.buildId" value="${unqualifiedVersion}.${buildQualifier}" />
-      <property name="osgi.bundles.defaultStartLevel" value="4" />
-      <property name="osgi.instance.area.default" value="@user.home/workspace" />
-      <property name="osgi.instance.area.default" value="@user.home/Documents/workspace" os="macosx" />
-   </configurations>
-
    <license>
         <url>http://eclipse.org/legal/epl/notice.php</url>
         <text>
@@ -225,9 +242,12 @@ United States, other countries, or both.
          </text>
    </license>
 
-   <features>
-
+   <plugins>
+      <!-- either m2e.logback or slf4j.simple should be provided in each package -->
+      <!-- If you add entries here, change <product type=""> to mixed -->
+   </plugins>
 
+   <features>
       <!-- common features that all products have -->
       <feature id="org.eclipse.epp.package.common.feature" version="4.38.0.qualifier"/>
       <feature id="org.eclipse.platform" installMode="root"/>
@@ -277,6 +297,22 @@ United States, other countries, or both.
       <feature id="org.eclipse.mylyn.pde.feature" installMode="root"/>
    </features>
 
+   <configurations>
+      <plugin id="org.apache.aries.spifly.dynamic.bundle" autoStart="true" startLevel="2" />
+      <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
+      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="4" />
+      <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
+      <!-- no starting slf4j.simple because this package uses m2e logback -->
+      <property name="org.eclipse.update.reconcile" value="false" />
+      <property name="eclipse.buildId" value="${unqualifiedVersion}.${buildQualifier}" />
+      <property name="osgi.bundles.defaultStartLevel" value="4" />
+      <property name="osgi.instance.area.default" value="@user.home/workspace" />
+      <property name="osgi.instance.area.default" value="@user.home/Documents/workspace" os="macosx" />
+   </configurations>
+
    <repositories>
       <repository location="https://download.eclipse.org/eclipse/updates/4.38" name="The Eclipse Project Updates" enabled="true" />
       <repository location="https://download.eclipse.org/releases/2025-12" name="2025-12" enabled="true" />
diff --git a/packages/org.eclipse.epp.package.scout.product/epp.product b/packages/org.eclipse.epp.package.scout.product/epp.product
index 428cc189e..cbfdfdf0a 100644
--- a/packages/org.eclipse.epp.package.scout.product/epp.product
+++ b/packages/org.eclipse.epp.package.scout.product/epp.product
@@ -3,12 +3,18 @@
 
 <product name="Eclipse for Scout Developers" uid="epp.package.scout" id="org.eclipse.epp.package.scout.product" application="org.eclipse.ui.ide.workbench" version="4.38.0.qualifier" type="mixed" includeLaunchers="true" autoIncludeRequirements="true">
 
-   <aboutInfo>
-      <image path="/org.eclipse.epp.package.scout/eclipse_lg.png"/>
-      <text>
-         Specified in the plugin.xml of the branding plugin.
-      </text>
-   </aboutInfo>
+<!--
+
+This product definition is based on Eclipse Platform's platform.product.
+
+We need to redefine all the settings in platform.product to avoid duplicate
+settings, especially about -Dosgi.requiredJavaVersion=21
+(see a6b90b060b8c3684596e691254bf2f74a559b8aa / Bug 580807 for more history as to why)
+
+This file should be easy to compre against platform.product and non-obvious differences
+can and should be documented to keep ongoing maintenance easier.
+This file should also be easy to compare against all the other epp.product files
+-->
 
    <configIni use="default">
    </configIni>
@@ -19,6 +25,22 @@
 --launcher.defaultAction openFile
 --launcher.appendVmargs
       </programArgs>
+      <!--
+             -Dosgi.instance.area.default=@user.home/eclipse-workspace :
+             EPP has traditionally provided a different (more explicitly Eclipse) default
+
+             -Declipse.e4.inject.javax.warning=false :
+             disable javax.warning - this isn't something users can do anything about. Platform leaves them enabled because end
+             users don't typically use platform as a starting point, but ISVs who can help resolve it do
+
+             -Dsun.java.command=Eclipse :
+             When Eclipse is launched using the dll/so as the vm this provides a name
+             name for tools like jps.
+             (see 62b3bb4973a0ae375e56046f0b3ff910bc44f970 / Bug 568052 for more history as to why)
+
+             -XX:+UseG1GC and -XX:+UseStringDeduplication :
+             EPP has traditionally provided a different (more memory efficient) default
+      -->
       <vmArgs>-Dosgi.requiredJavaVersion=21
 -Dosgi.instance.area.default=@user.home/eclipse-workspace
 -Dosgi.dataAreaRequiresExplicitInit=true
@@ -31,32 +53,39 @@
 -XX:+UseStringDeduplication
 --add-modules=ALL-SYSTEM
       </vmArgs>
-      <vmArgsMac>-XstartOnFirstThread
--Dorg.eclipse.swt.internal.carbon.smallFonts
--Xdock:icon=../Resources/Eclipse.icns
+      <vmArgsMac>-Xdock:icon=../Resources/Eclipse.icns -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
       </vmArgsMac>
    </launcherArgs>
 
    <windowImages i16="/org.eclipse.epp.package.scout/eclipse16.png" i32="/org.eclipse.epp.package.scout/eclipse32.png" i48="/org.eclipse.epp.package.scout/eclipse48.png" i256="/org.eclipse.epp.package.scout/eclipse256.png"/>
 
+   <!-- EPP has its own splash screen that includes "IDE" in the graphic -->
    <splash
       location="org.eclipse.epp.package.common"
       startupProgressRect="2,290,448,10"
       startupMessageRect="7,265,320,20"
       startupForegroundColor="ffffff" />
    <launcher name="eclipse">
-      <linux icon="../../icons/icon.xpm"/>
+      <linux icon="../../icons/eclipse.xpm"/>
       <macosx icon="../../icons/Eclipse.icns">
          <bundleUrlTypes>
             <bundleUrlType scheme="eclipse+command" name="Eclipse Command"/>
+            <!-- include the additional handler for mpc - this needs to be defined here so macOS entitlements work properly -->
             <bundleUrlType scheme="eclipse+mpc" name="Eclipse Marketplace"/>
          </bundleUrlTypes>
       </macosx>
       <win useIco="false">
-         <bmp/>
+         <bmp/> <!-- Use default branding icon of the eclipse exe for Windows -->
       </win>
    </launcher>
 
+   <aboutInfo>
+      <image path="/org.eclipse.epp.package.scout/eclipse_lg.png"/>
+      <text>
+         Specified in the plugin.xml of the branding plugin.
+      </text>
+   </aboutInfo>
+
    <intro introId="org.eclipse.ui.intro.universal"/>
 
    <vm>
@@ -65,22 +94,6 @@
       <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21</windows>
    </vm>
 
-   <configurations>
-      <plugin id="org.apache.aries.spifly.dynamic.bundle" autoStart="true" startLevel="2" />
-      <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
-      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="4" />
-      <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
-      <plugin id="slf4j.simple" autoStart="true" startLevel="2" />
-      <property name="org.eclipse.update.reconcile" value="false" />
-      <property name="eclipse.buildId" value="${unqualifiedVersion}.${buildQualifier}" />
-      <property name="osgi.bundles.defaultStartLevel" value="4" />
-      <property name="osgi.instance.area.default" value="@user.home/workspace" />
-      <property name="osgi.instance.area.default" value="@user.home/Documents/workspace" os="macosx" />
-   </configurations>
-
    <license>
         <url>http://eclipse.org/legal/epl/notice.php</url>
         <text>
@@ -227,9 +240,12 @@ United States, other countries, or both.
          </text>
    </license>
 
-   <features>
-
+   <plugins>
+      <!-- either m2e.logback or slf4j.simple should be provided in each package -->
+      <plugin id="slf4j.simple"/>
+   </plugins>
 
+   <features>
       <!-- common features that all products have -->
       <feature id="org.eclipse.epp.package.common.feature" version="4.38.0.qualifier"/>
       <feature id="org.eclipse.platform" installMode="root"/>
@@ -265,10 +281,22 @@ United States, other countries, or both.
       <feature id="org.eclipse.wst.web_ui.feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.jdt.feature" installMode="root"/>
    </features>
-   <plugins>
-      <!-- either m2e.logback or slf4j.simple should be provided in each package -->
-      <plugin id="slf4j.simple"/>
-   </plugins>
+
+   <configurations>
+      <plugin id="org.apache.aries.spifly.dynamic.bundle" autoStart="true" startLevel="2" />
+      <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
+      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="4" />
+      <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
+      <plugin id="slf4j.simple" autoStart="true" startLevel="2" />
+      <property name="org.eclipse.update.reconcile" value="false" />
+      <property name="eclipse.buildId" value="${unqualifiedVersion}.${buildQualifier}" />
+      <property name="osgi.bundles.defaultStartLevel" value="4" />
+      <property name="osgi.instance.area.default" value="@user.home/workspace" />
+      <property name="osgi.instance.area.default" value="@user.home/Documents/workspace" os="macosx" />
+   </configurations>
 
    <repositories>
       <repository location="https://download.eclipse.org/eclipse/updates/4.38" name="The Eclipse Project Updates" enabled="true" />