diff --git a/packages/org.eclipse.epp.package.committers/eclipse32.png b/packages/org.eclipse.epp.package.committers/eclipse32.png
index 55d401d..eae69ee 100644
--- a/packages/org.eclipse.epp.package.committers/eclipse32.png
+++ b/packages/org.eclipse.epp.package.committers/eclipse32.png
Binary files differ
diff --git a/packages/org.eclipse.epp.package.committers/eclipse32.svg b/packages/org.eclipse.epp.package.committers/eclipse32.svg
index 1f63803..ccc3e5e 100644
--- a/packages/org.eclipse.epp.package.committers/eclipse32.svg
+++ b/packages/org.eclipse.epp.package.committers/eclipse32.svg
@@ -7,9 +7,9 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:export-ydpi="384"
-   inkscape:export-xdpi="384"
-   inkscape:export-filename="/Users/d021678/git/org.eclipse.epp.packages/packages/org.eclipse.epp.package.committers/eclipse32_2x.png"
+   inkscape:export-ydpi="96"
+   inkscape:export-xdpi="96"
+   inkscape:export-filename="/Users/d021678/git/org.eclipse.epp.packages/packages/org.eclipse.epp.package.java/eclipse32.png"
    inkscape:version="1.0rc1 (09960d6, 2020-04-09)"
    sodipodi:docname="eclipse32.svg"
    viewBox="0 0 32 32"
@@ -85,13 +85,13 @@
      inkscape:window-maximized="0"
      inkscape:window-y="23"
      inkscape:window-x="0"
-     inkscape:cy="7.0588235"
-     inkscape:cx="-2.1176471"
-     inkscape:zoom="8.5"
-     showgrid="false"
+     inkscape:cy="16"
+     inkscape:cx="16"
+     inkscape:zoom="25.84375"
+     showgrid="true"
      id="namedview2261"
-     inkscape:window-height="954"
-     inkscape:window-width="1305"
+     inkscape:window-height="1035"
+     inkscape:window-width="1486"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0"
      guidetolerance="10"
@@ -99,13 +99,16 @@
      objecttolerance="10"
      borderopacity="1"
      bordercolor="#666666"
-     pagecolor="#ffffff" />
+     pagecolor="#ffffff"
+     inkscape:document-rotation="0"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true" />
   <g
      id="g2267"
      inkscape:label="Image"
      inkscape:groupmode="layer">
     <g
-       transform="matrix(0.69565218,0,0,0.69565218,26.95397,22.85109)"
+       transform="matrix(0.69565218,0,0,0.69565218,26.95397,22.264755)"
        id="g3036">
       <g
          id="g139"
@@ -120,19 +123,17 @@
            style="stroke-width:1.73496"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
            id="g38">
-	<path
-   style="fill:#2c2255;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path34"
-   d="m 213.736,375.576 h -6.361 c -0.233,1.397 -0.391,2.824 -0.463,4.287 h 7.561 3.792 54.741 4.998 c -0.073,-1.463 -0.232,-2.89 -0.467,-4.287" />
-
-	<path
-   style="fill:#2c2255;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path36"
-   d="m 206.912,383.845 c 0.072,1.464 0.23,2.891 0.463,4.288 h 6.613 5.012 53.558 4.979 c 0.234,-1.397 0.395,-2.824 0.467,-4.288" />
-
-</g>
+          <path
+             style="fill:#2c2255;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path34"
+             d="m 213.736,375.576 h -6.361 c -0.233,1.397 -0.391,2.824 -0.463,4.287 h 7.561 3.792 54.741 4.998 c -0.073,-1.463 -0.232,-2.89 -0.467,-4.287" />
+          <path
+             style="fill:#2c2255;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path36"
+             d="m 206.912,383.845 c 0.072,1.464 0.23,2.891 0.463,4.288 h 6.613 5.012 53.558 4.979 c 0.234,-1.397 0.395,-2.824 0.467,-4.288" />
+        </g>
         <path
            style="fill:#2c2255;stroke-width:0.983117"
            inkscape:connector-curvature="0"
@@ -142,116 +143,100 @@
            style="stroke-width:1.73496"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
            id="g44">
-	<path
-   style="fill:#f7941e;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path42"
-   d="m 204.797,381.855 c 0,-18.78 14.104,-34.384 32.453,-37.128 -0.455,-0.017 -0.913,-0.035 -1.372,-0.035 -20.591,0 -37.284,16.639 -37.284,37.163 0,20.524 16.693,37.163 37.284,37.163 0.461,0 0.918,-0.019 1.375,-0.034 -18.351,-2.744 -32.456,-18.348 -32.456,-37.129 z" />
-
-</g>
+          <path
+             style="fill:#f7941e;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path42"
+             d="m 204.797,381.855 c 0,-18.78 14.104,-34.384 32.453,-37.128 -0.455,-0.017 -0.913,-0.035 -1.372,-0.035 -20.591,0 -37.284,16.639 -37.284,37.163 0,20.524 16.693,37.163 37.284,37.163 0.461,0 0.918,-0.019 1.375,-0.034 -18.351,-2.744 -32.456,-18.348 -32.456,-37.129 z" />
+        </g>
         <g
            style="stroke-width:1.73496"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
            id="g67">
-	<linearGradient
-   y2="368.73721"
-   x2="242.4575"
-   y1="422.2832"
-   x1="242.4575"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_1_">
-		<stop
-   id="stop46"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop48"
-   style="stop-color:#2C2255"
-   offset="0.872" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_1_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path51"
-   d="m 266.65,379.863 c -0.119,-1.47 -0.366,-2.903 -0.736,-4.287 h -46.913 c -0.37,1.384 -0.617,2.817 -0.737,4.287 z" />
-
-	<linearGradient
-   y2="368.7338"
-   x2="242.4575"
-   y1="422.29199"
-   x1="242.4575"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_2_">
-		<stop
-   id="stop53"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop55"
-   style="stop-color:#2C2255"
-   offset="0.872" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_2_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path58"
-   d="m 266.65,383.845 h -48.386 c 0.12,1.471 0.366,2.903 0.736,4.288 h 46.914 c 0.371,-1.385 0.617,-2.818 0.736,-4.288 z" />
-
-	<linearGradient
-   y2="368.73639"
-   x2="242.45799"
-   y1="422.2861"
-   x1="242.45799"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_3_">
-		<stop
-   id="stop60"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop62"
-   style="stop-color:#2C2255"
-   offset="0.8631" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_3_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path65"
-   d="m 242.458,406.137 c 9.742,0 18.14,-5.74 22.008,-14.022 H 220.45 c 3.867,8.281 12.265,14.022 22.008,14.022 z" />
-
-</g>
+          <linearGradient
+             y2="368.73721"
+             x2="242.4575"
+             y1="422.2832"
+             x1="242.4575"
+             gradientUnits="userSpaceOnUse"
+             id="SVGID_1_">
+            <stop
+               id="stop46"
+               style="stop-color:#473788"
+               offset="0.3033" />
+            <stop
+               id="stop48"
+               style="stop-color:#2C2255"
+               offset="0.872" />
+          </linearGradient>
+          <path
+             style="fill:url(#SVGID_1_);stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path51"
+             d="m 266.65,379.863 c -0.119,-1.47 -0.366,-2.903 -0.736,-4.287 h -46.913 c -0.37,1.384 -0.617,2.817 -0.737,4.287 z" />
+          <linearGradient
+             y2="368.7338"
+             x2="242.4575"
+             y1="422.29199"
+             x1="242.4575"
+             gradientUnits="userSpaceOnUse"
+             id="SVGID_2_">
+            <stop
+               id="stop53"
+               style="stop-color:#473788"
+               offset="0.3033" />
+            <stop
+               id="stop55"
+               style="stop-color:#2C2255"
+               offset="0.872" />
+          </linearGradient>
+          <path
+             style="fill:url(#SVGID_2_);stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path58"
+             d="m 266.65,383.845 h -48.386 c 0.12,1.471 0.366,2.903 0.736,4.288 h 46.914 c 0.371,-1.385 0.617,-2.818 0.736,-4.288 z" />
+          <linearGradient
+             y2="368.73639"
+             x2="242.45799"
+             y1="422.2861"
+             x1="242.45799"
+             gradientUnits="userSpaceOnUse"
+             id="SVGID_3_">
+            <stop
+               id="stop60"
+               style="stop-color:#473788"
+               offset="0.3033" />
+            <stop
+               id="stop62"
+               style="stop-color:#2C2255"
+               offset="0.8631" />
+          </linearGradient>
+          <path
+             style="fill:url(#SVGID_3_);stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path65"
+             d="m 242.458,406.137 c 9.742,0 18.14,-5.74 22.008,-14.022 H 220.45 c 3.867,8.281 12.265,14.022 22.008,14.022 z" />
+        </g>
         <g
            style="stroke-width:1.73496"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
            id="g75">
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path69"
-   d="m 214.679,383.845 h 3.552 48.51 6.373 4.841 c 0.034,-0.633 0.053,-1.271 0.053,-1.913 0,-0.694 -0.025,-1.383 -0.064,-2.068 h -4.829 -6.373 -48.51 -3.802 -7.517 c -0.039,0.686 -0.064,1.374 -0.064,2.068 0,0.643 0.019,1.28 0.052,1.913 z" />
-
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path71"
-   d="m 220.308,371.594 h -12.037 c -0.396,1.297 -0.65,2.627 -0.896,3.982 h 6.2 5.279 47.035 6.662 4.761 c -0.245,-1.355 -0.562,-2.686 -0.957,-3.982" />
-
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path73"
-   d="m 272.739,388.133 h -6.661 -47.035 -5.027 -6.642 c 0.239,1.354 0.51,2.685 0.899,3.981 h 12.222 44.129 7.244 4.719 c 0.389,-1.297 0.701,-2.627 0.941,-3.981 z" />
-
-</g>
+          <path
+             style="fill:#ffffff;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path69"
+             d="m 214.679,383.845 h 3.552 48.51 6.373 4.841 c 0.034,-0.633 0.053,-1.271 0.053,-1.913 0,-0.694 -0.025,-1.383 -0.064,-2.068 h -4.829 -6.373 -48.51 -3.802 -7.517 c -0.039,0.686 -0.064,1.374 -0.064,2.068 0,0.643 0.019,1.28 0.052,1.913 z" />
+          <path
+             style="fill:#ffffff;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path71"
+             d="m 220.308,371.594 h -12.037 c -0.396,1.297 -0.65,2.627 -0.896,3.982 h 6.2 5.279 47.035 6.662 4.761 c -0.245,-1.355 -0.562,-2.686 -0.957,-3.982" />
+          <path
+             style="fill:#ffffff;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path73"
+             d="m 272.739,388.133 h -6.661 -47.035 -5.027 -6.642 c 0.239,1.354 0.51,2.685 0.899,3.981 h 12.222 44.129 7.244 4.719 c 0.389,-1.297 0.701,-2.627 0.941,-3.981 z" />
+        </g>
       </g>
     </g>
   </g>
diff --git a/packages/org.eclipse.epp.package.committers/eclipse32@2x.png b/packages/org.eclipse.epp.package.committers/eclipse32@2x.png
index d44f785..3307f99 100644
--- a/packages/org.eclipse.epp.package.committers/eclipse32@2x.png
+++ b/packages/org.eclipse.epp.package.committers/eclipse32@2x.png
Binary files differ
diff --git a/packages/org.eclipse.epp.package.committers/eclipse48.png b/packages/org.eclipse.epp.package.committers/eclipse48.png
index bff9aef..de9928f 100644
--- a/packages/org.eclipse.epp.package.committers/eclipse48.png
+++ b/packages/org.eclipse.epp.package.committers/eclipse48.png
Binary files differ
diff --git a/packages/org.eclipse.epp.package.committers/eclipse48.svg b/packages/org.eclipse.epp.package.committers/eclipse48.svg
index 099b7d2..80513d7 100644
--- a/packages/org.eclipse.epp.package.committers/eclipse48.svg
+++ b/packages/org.eclipse.epp.package.committers/eclipse48.svg
@@ -7,13 +7,16 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:version="1.0rc1 (09960d6, 2020-04-09)"
-   sodipodi:docname="eclipse48.svg"
-   viewBox="0 0 48 48"
-   height="48"
-   width="48"
+   inkscape:export-ydpi="192"
+   inkscape:export-xdpi="192"
+   inkscape:export-filename="/Users/d021678/git/org.eclipse.epp.packages/packages/org.eclipse.epp.package.java/eclipse48@2x.png"
+   version="1.1"
    id="svg1412"
-   version="1.1">
+   width="48"
+   height="48"
+   viewBox="0 0 48 48"
+   sodipodi:docname="eclipse48.svg"
+   inkscape:version="1.0rc1 (09960d6, 2020-04-09)">
   <metadata
      id="metadata1418">
     <rdf:RDF>
@@ -28,226 +31,209 @@
   <defs
      id="defs1416">
     <linearGradient
-       y2="368.73721"
-       x2="242.4575"
+       id="linearGradient3462"
+       gradientUnits="userSpaceOnUse"
+       x1="242.4575"
        y1="422.2832"
-       x1="242.4575"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3462">
-      <stop
-         id="stop46-2"
-         style="stop-color:#473788"
-         offset="0.3033" />
-      <stop
-         id="stop48-6"
-         style="stop-color:#2C2255"
-         offset="0.872" />
-    </linearGradient>
-    <linearGradient
-       y2="368.7338"
        x2="242.4575"
-       y1="422.29199"
-       x1="242.4575"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3466">
+       y2="368.73721">
       <stop
-         id="stop53-6"
+         offset="0.3033"
          style="stop-color:#473788"
-         offset="0.3033" />
+         id="stop46-2" />
       <stop
-         id="stop55-8"
+         offset="0.872"
          style="stop-color:#2C2255"
-         offset="0.872" />
+         id="stop48-6" />
     </linearGradient>
     <linearGradient
-       y2="368.73639"
-       x2="242.45799"
-       y1="422.2861"
-       x1="242.45799"
+       id="linearGradient3466"
        gradientUnits="userSpaceOnUse"
-       id="linearGradient3470">
+       x1="242.4575"
+       y1="422.29199"
+       x2="242.4575"
+       y2="368.7338">
       <stop
-         id="stop60-3"
+         offset="0.3033"
          style="stop-color:#473788"
-         offset="0.3033" />
+         id="stop53-6" />
       <stop
-         id="stop62-4"
+         offset="0.872"
          style="stop-color:#2C2255"
-         offset="0.8631" />
+         id="stop55-8" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3470"
+       gradientUnits="userSpaceOnUse"
+       x1="242.45799"
+       y1="422.2861"
+       x2="242.45799"
+       y2="368.73639">
+      <stop
+         offset="0.3033"
+         style="stop-color:#473788"
+         id="stop60-3" />
+      <stop
+         offset="0.8631"
+         style="stop-color:#2C2255"
+         id="stop62-4" />
     </linearGradient>
   </defs>
   <sodipodi:namedview
-     inkscape:current-layer="g1420"
-     inkscape:window-maximized="0"
-     inkscape:window-y="23"
-     inkscape:window-x="0"
-     inkscape:cy="24"
-     inkscape:cx="-3.1764706"
-     inkscape:zoom="5.6666667"
-     showgrid="false"
-     id="namedview1414"
-     inkscape:window-height="910"
-     inkscape:window-width="1310"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     guidetolerance="10"
-     gridtolerance="10"
-     objecttolerance="10"
-     borderopacity="1"
+     inkscape:document-rotation="0"
+     pagecolor="#ffffff"
      bordercolor="#666666"
-     pagecolor="#ffffff" />
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1416"
+     inkscape:window-height="1035"
+     id="namedview1414"
+     showgrid="false"
+     inkscape:zoom="5.6666667"
+     inkscape:cx="-3.1764706"
+     inkscape:cy="24"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g1420" />
   <g
-     id="g1420"
+     inkscape:groupmode="layer"
      inkscape:label="Image"
-     inkscape:groupmode="layer">
+     id="g1420">
     <g
-       transform="matrix(0.99893516,0,0,0.99893516,47.95795,3.4517308)"
-       id="g2207">
+       id="g2207"
+       transform="matrix(0.99893516,0,0,0.99893516,47.95795,3.4517308)">
       <g
-         id="g139"
+         style="stroke-width:0.983117"
          transform="matrix(1.0678037,0,0,1.0572816,-79.316579,-1.6972965)"
-         style="stroke-width:0.983117">
+         id="g139">
         <path
-           style="fill:#2c2255;stroke-width:0.983117"
-           inkscape:connector-curvature="0"
+           d="m 41.680839,26.851877 h -6.90011 c 0.91344,3.13415 2.60886,5.94303 5.09022,8.42496 3.95636,3.95636 8.71509,5.93397 14.27903,5.93397 1.11234,0 2.18954,-0.0827 3.23671,-0.24083 4.19039,-0.63295 7.86002,-2.52726 11.00323,-5.69314 2.49836,-2.48193 4.20568,-5.29081 5.12649,-8.42496 h -2.79982 -4.09462 z"
            id="path32"
-           d="m 41.680839,26.851877 h -6.90011 c 0.91344,3.13415 2.60886,5.94303 5.09022,8.42496 3.95636,3.95636 8.71509,5.93397 14.27903,5.93397 1.11234,0 2.18954,-0.0827 3.23671,-0.24083 4.19039,-0.63295 7.86002,-2.52726 11.00323,-5.69314 2.49836,-2.48193 4.20568,-5.29081 5.12649,-8.42496 h -2.79982 -4.09462 z" />
-        <g
-           style="stroke-width:1.73496"
-           transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
-           id="g38">
-	<path
-   style="fill:#2c2255;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path34"
-   d="m 213.736,375.576 h -6.361 c -0.233,1.397 -0.391,2.824 -0.463,4.287 h 7.561 3.792 54.741 4.998 c -0.073,-1.463 -0.232,-2.89 -0.467,-4.287" />
-
-	<path
-   style="fill:#2c2255;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path36"
-   d="m 206.912,383.845 c 0.072,1.464 0.23,2.891 0.463,4.288 h 6.613 5.012 53.558 4.979 c 0.234,-1.397 0.395,-2.824 0.467,-4.288" />
-
-</g>
-        <path
-           style="fill:#2c2255;stroke-width:0.983117"
            inkscape:connector-curvature="0"
+           style="fill:#2c2255;stroke-width:0.983117" />
+        <g
+           id="g38"
+           transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
+           style="stroke-width:1.73496">
+          <path
+             d="m 213.736,375.576 h -6.361 c -0.233,1.397 -0.391,2.824 -0.463,4.287 h 7.561 3.792 54.741 4.998 c -0.073,-1.463 -0.232,-2.89 -0.467,-4.287"
+             id="path34"
+             inkscape:connector-curvature="0"
+             style="fill:#2c2255;stroke-width:3.06178" />
+          <path
+             d="m 206.912,383.845 c 0.072,1.464 0.23,2.891 0.463,4.288 h 6.613 5.012 53.558 4.979 c 0.234,-1.397 0.395,-2.824 0.467,-4.288"
+             id="path36"
+             inkscape:connector-curvature="0"
+             style="fill:#2c2255;stroke-width:3.06178" />
+        </g>
+        <path
+           d="m 73.517539,15.224207 c -0.92024,-3.14265 -2.62813,-5.9639998 -5.12762,-8.4640598 -3.13528,-3.13585 -6.79414,-5.01713 -10.97093,-5.65008 -1.0568,-0.16035995 -2.14477,-0.24421995 -3.26901,-0.24421995 -5.56394,0 -10.3221,1.96513995 -14.27903,5.89429995 -2.48306,2.49949 -4.17905,5.3214098 -5.09192,8.4640598 z"
            id="path40"
-           d="m 73.517539,15.224207 c -0.92024,-3.14265 -2.62813,-5.9639998 -5.12762,-8.4640598 -3.13528,-3.13585 -6.79414,-5.01713 -10.97093,-5.65008 -1.0568,-0.16035995 -2.14477,-0.24421995 -3.26901,-0.24421995 -5.56394,0 -10.3221,1.96513995 -14.27903,5.89429995 -2.48306,2.49949 -4.17905,5.3214098 -5.09192,8.4640598 z" />
+           inkscape:connector-curvature="0"
+           style="fill:#2c2255;stroke-width:0.983117" />
         <g
-           style="stroke-width:1.73496"
+           id="g44"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
-           id="g44">
-	<path
-   style="fill:#f7941e;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path42"
-   d="m 204.797,381.855 c 0,-18.78 14.104,-34.384 32.453,-37.128 -0.455,-0.017 -0.913,-0.035 -1.372,-0.035 -20.591,0 -37.284,16.639 -37.284,37.163 0,20.524 16.693,37.163 37.284,37.163 0.461,0 0.918,-0.019 1.375,-0.034 -18.351,-2.744 -32.456,-18.348 -32.456,-37.129 z" />
-
-</g>
+           style="stroke-width:1.73496">
+          <path
+             d="m 204.797,381.855 c 0,-18.78 14.104,-34.384 32.453,-37.128 -0.455,-0.017 -0.913,-0.035 -1.372,-0.035 -20.591,0 -37.284,16.639 -37.284,37.163 0,20.524 16.693,37.163 37.284,37.163 0.461,0 0.918,-0.019 1.375,-0.034 -18.351,-2.744 -32.456,-18.348 -32.456,-37.129 z"
+             id="path42"
+             inkscape:connector-curvature="0"
+             style="fill:#f7941e;stroke-width:3.06178" />
+        </g>
         <g
-           style="stroke-width:1.73496"
+           id="g67"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
-           id="g67">
-	<linearGradient
-   y2="368.73721"
-   x2="242.4575"
-   y1="422.2832"
-   x1="242.4575"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_1_">
-		<stop
-   id="stop46"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop48"
-   style="stop-color:#2C2255"
-   offset="0.872" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_1_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path51"
-   d="m 266.65,379.863 c -0.119,-1.47 -0.366,-2.903 -0.736,-4.287 h -46.913 c -0.37,1.384 -0.617,2.817 -0.737,4.287 z" />
-
-	<linearGradient
-   y2="368.7338"
-   x2="242.4575"
-   y1="422.29199"
-   x1="242.4575"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_2_">
-		<stop
-   id="stop53"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop55"
-   style="stop-color:#2C2255"
-   offset="0.872" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_2_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path58"
-   d="m 266.65,383.845 h -48.386 c 0.12,1.471 0.366,2.903 0.736,4.288 h 46.914 c 0.371,-1.385 0.617,-2.818 0.736,-4.288 z" />
-
-	<linearGradient
-   y2="368.73639"
-   x2="242.45799"
-   y1="422.2861"
-   x1="242.45799"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_3_">
-		<stop
-   id="stop60"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop62"
-   style="stop-color:#2C2255"
-   offset="0.8631" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_3_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path65"
-   d="m 242.458,406.137 c 9.742,0 18.14,-5.74 22.008,-14.022 H 220.45 c 3.867,8.281 12.265,14.022 22.008,14.022 z" />
-
-</g>
+           style="stroke-width:1.73496">
+          <linearGradient
+             id="SVGID_1_"
+             gradientUnits="userSpaceOnUse"
+             x1="242.4575"
+             y1="422.2832"
+             x2="242.4575"
+             y2="368.73721">
+            <stop
+               offset="0.3033"
+               style="stop-color:#473788"
+               id="stop46" />
+            <stop
+               offset="0.872"
+               style="stop-color:#2C2255"
+               id="stop48" />
+          </linearGradient>
+          <path
+             d="m 266.65,379.863 c -0.119,-1.47 -0.366,-2.903 -0.736,-4.287 h -46.913 c -0.37,1.384 -0.617,2.817 -0.737,4.287 z"
+             id="path51"
+             inkscape:connector-curvature="0"
+             style="fill:url(#SVGID_1_);stroke-width:3.06178" />
+          <linearGradient
+             id="SVGID_2_"
+             gradientUnits="userSpaceOnUse"
+             x1="242.4575"
+             y1="422.29199"
+             x2="242.4575"
+             y2="368.7338">
+            <stop
+               offset="0.3033"
+               style="stop-color:#473788"
+               id="stop53" />
+            <stop
+               offset="0.872"
+               style="stop-color:#2C2255"
+               id="stop55" />
+          </linearGradient>
+          <path
+             d="m 266.65,383.845 h -48.386 c 0.12,1.471 0.366,2.903 0.736,4.288 h 46.914 c 0.371,-1.385 0.617,-2.818 0.736,-4.288 z"
+             id="path58"
+             inkscape:connector-curvature="0"
+             style="fill:url(#SVGID_2_);stroke-width:3.06178" />
+          <linearGradient
+             id="SVGID_3_"
+             gradientUnits="userSpaceOnUse"
+             x1="242.45799"
+             y1="422.2861"
+             x2="242.45799"
+             y2="368.73639">
+            <stop
+               offset="0.3033"
+               style="stop-color:#473788"
+               id="stop60" />
+            <stop
+               offset="0.8631"
+               style="stop-color:#2C2255"
+               id="stop62" />
+          </linearGradient>
+          <path
+             d="m 242.458,406.137 c 9.742,0 18.14,-5.74 22.008,-14.022 H 220.45 c 3.867,8.281 12.265,14.022 22.008,14.022 z"
+             id="path65"
+             inkscape:connector-curvature="0"
+             style="fill:url(#SVGID_3_);stroke-width:3.06178" />
+        </g>
         <g
-           style="stroke-width:1.73496"
+           id="g75"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
-           id="g75">
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path69"
-   d="m 214.679,383.845 h 3.552 48.51 6.373 4.841 c 0.034,-0.633 0.053,-1.271 0.053,-1.913 0,-0.694 -0.025,-1.383 -0.064,-2.068 h -4.829 -6.373 -48.51 -3.802 -7.517 c -0.039,0.686 -0.064,1.374 -0.064,2.068 0,0.643 0.019,1.28 0.052,1.913 z" />
-
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path71"
-   d="m 220.308,371.594 h -12.037 c -0.396,1.297 -0.65,2.627 -0.896,3.982 h 6.2 5.279 47.035 6.662 4.761 c -0.245,-1.355 -0.562,-2.686 -0.957,-3.982" />
-
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path73"
-   d="m 272.739,388.133 h -6.661 -47.035 -5.027 -6.642 c 0.239,1.354 0.51,2.685 0.899,3.981 h 12.222 44.129 7.244 4.719 c 0.389,-1.297 0.701,-2.627 0.941,-3.981 z" />
-
-</g>
+           style="stroke-width:1.73496">
+          <path
+             d="m 214.679,383.845 h 3.552 48.51 6.373 4.841 c 0.034,-0.633 0.053,-1.271 0.053,-1.913 0,-0.694 -0.025,-1.383 -0.064,-2.068 h -4.829 -6.373 -48.51 -3.802 -7.517 c -0.039,0.686 -0.064,1.374 -0.064,2.068 0,0.643 0.019,1.28 0.052,1.913 z"
+             id="path69"
+             inkscape:connector-curvature="0"
+             style="fill:#ffffff;stroke-width:3.06178" />
+          <path
+             d="m 220.308,371.594 h -12.037 c -0.396,1.297 -0.65,2.627 -0.896,3.982 h 6.2 5.279 47.035 6.662 4.761 c -0.245,-1.355 -0.562,-2.686 -0.957,-3.982"
+             id="path71"
+             inkscape:connector-curvature="0"
+             style="fill:#ffffff;stroke-width:3.06178" />
+          <path
+             d="m 272.739,388.133 h -6.661 -47.035 -5.027 -6.642 c 0.239,1.354 0.51,2.685 0.899,3.981 h 12.222 44.129 7.244 4.719 c 0.389,-1.297 0.701,-2.627 0.941,-3.981 z"
+             id="path73"
+             inkscape:connector-curvature="0"
+             style="fill:#ffffff;stroke-width:3.06178" />
+        </g>
       </g>
     </g>
   </g>
diff --git a/packages/org.eclipse.epp.package.committers/eclipse48@2x.png b/packages/org.eclipse.epp.package.committers/eclipse48@2x.png
index 3b8d1cc..bff9aef 100644
--- a/packages/org.eclipse.epp.package.committers/eclipse48@2x.png
+++ b/packages/org.eclipse.epp.package.committers/eclipse48@2x.png
Binary files differ
diff --git a/packages/org.eclipse.epp.package.cpp/eclipse32.png b/packages/org.eclipse.epp.package.cpp/eclipse32.png
index 55d401d..eae69ee 100644
--- a/packages/org.eclipse.epp.package.cpp/eclipse32.png
+++ b/packages/org.eclipse.epp.package.cpp/eclipse32.png
Binary files differ
diff --git a/packages/org.eclipse.epp.package.cpp/eclipse32.svg b/packages/org.eclipse.epp.package.cpp/eclipse32.svg
index 4630b46..ccc3e5e 100644
--- a/packages/org.eclipse.epp.package.cpp/eclipse32.svg
+++ b/packages/org.eclipse.epp.package.cpp/eclipse32.svg
@@ -7,9 +7,9 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:export-ydpi="384"
-   inkscape:export-xdpi="384"
-   inkscape:export-filename="/Users/d021678/git/org.eclipse.epp.packages/packages/org.eclipse.epp.package.cpp/eclipse32_2x.png"
+   inkscape:export-ydpi="96"
+   inkscape:export-xdpi="96"
+   inkscape:export-filename="/Users/d021678/git/org.eclipse.epp.packages/packages/org.eclipse.epp.package.java/eclipse32.png"
    inkscape:version="1.0rc1 (09960d6, 2020-04-09)"
    sodipodi:docname="eclipse32.svg"
    viewBox="0 0 32 32"
@@ -85,13 +85,13 @@
      inkscape:window-maximized="0"
      inkscape:window-y="23"
      inkscape:window-x="0"
-     inkscape:cy="7.0588235"
-     inkscape:cx="-2.1176471"
-     inkscape:zoom="8.5"
-     showgrid="false"
+     inkscape:cy="16"
+     inkscape:cx="16"
+     inkscape:zoom="25.84375"
+     showgrid="true"
      id="namedview2261"
-     inkscape:window-height="954"
-     inkscape:window-width="1305"
+     inkscape:window-height="1035"
+     inkscape:window-width="1486"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0"
      guidetolerance="10"
@@ -99,13 +99,16 @@
      objecttolerance="10"
      borderopacity="1"
      bordercolor="#666666"
-     pagecolor="#ffffff" />
+     pagecolor="#ffffff"
+     inkscape:document-rotation="0"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true" />
   <g
      id="g2267"
      inkscape:label="Image"
      inkscape:groupmode="layer">
     <g
-       transform="matrix(0.69565218,0,0,0.69565218,26.95397,22.85109)"
+       transform="matrix(0.69565218,0,0,0.69565218,26.95397,22.264755)"
        id="g3036">
       <g
          id="g139"
@@ -120,19 +123,17 @@
            style="stroke-width:1.73496"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
            id="g38">
-	<path
-   style="fill:#2c2255;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path34"
-   d="m 213.736,375.576 h -6.361 c -0.233,1.397 -0.391,2.824 -0.463,4.287 h 7.561 3.792 54.741 4.998 c -0.073,-1.463 -0.232,-2.89 -0.467,-4.287" />
-
-	<path
-   style="fill:#2c2255;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path36"
-   d="m 206.912,383.845 c 0.072,1.464 0.23,2.891 0.463,4.288 h 6.613 5.012 53.558 4.979 c 0.234,-1.397 0.395,-2.824 0.467,-4.288" />
-
-</g>
+          <path
+             style="fill:#2c2255;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path34"
+             d="m 213.736,375.576 h -6.361 c -0.233,1.397 -0.391,2.824 -0.463,4.287 h 7.561 3.792 54.741 4.998 c -0.073,-1.463 -0.232,-2.89 -0.467,-4.287" />
+          <path
+             style="fill:#2c2255;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path36"
+             d="m 206.912,383.845 c 0.072,1.464 0.23,2.891 0.463,4.288 h 6.613 5.012 53.558 4.979 c 0.234,-1.397 0.395,-2.824 0.467,-4.288" />
+        </g>
         <path
            style="fill:#2c2255;stroke-width:0.983117"
            inkscape:connector-curvature="0"
@@ -142,116 +143,100 @@
            style="stroke-width:1.73496"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
            id="g44">
-	<path
-   style="fill:#f7941e;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path42"
-   d="m 204.797,381.855 c 0,-18.78 14.104,-34.384 32.453,-37.128 -0.455,-0.017 -0.913,-0.035 -1.372,-0.035 -20.591,0 -37.284,16.639 -37.284,37.163 0,20.524 16.693,37.163 37.284,37.163 0.461,0 0.918,-0.019 1.375,-0.034 -18.351,-2.744 -32.456,-18.348 -32.456,-37.129 z" />
-
-</g>
+          <path
+             style="fill:#f7941e;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path42"
+             d="m 204.797,381.855 c 0,-18.78 14.104,-34.384 32.453,-37.128 -0.455,-0.017 -0.913,-0.035 -1.372,-0.035 -20.591,0 -37.284,16.639 -37.284,37.163 0,20.524 16.693,37.163 37.284,37.163 0.461,0 0.918,-0.019 1.375,-0.034 -18.351,-2.744 -32.456,-18.348 -32.456,-37.129 z" />
+        </g>
         <g
            style="stroke-width:1.73496"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
            id="g67">
-	<linearGradient
-   y2="368.73721"
-   x2="242.4575"
-   y1="422.2832"
-   x1="242.4575"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_1_">
-		<stop
-   id="stop46"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop48"
-   style="stop-color:#2C2255"
-   offset="0.872" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_1_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path51"
-   d="m 266.65,379.863 c -0.119,-1.47 -0.366,-2.903 -0.736,-4.287 h -46.913 c -0.37,1.384 -0.617,2.817 -0.737,4.287 z" />
-
-	<linearGradient
-   y2="368.7338"
-   x2="242.4575"
-   y1="422.29199"
-   x1="242.4575"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_2_">
-		<stop
-   id="stop53"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop55"
-   style="stop-color:#2C2255"
-   offset="0.872" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_2_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path58"
-   d="m 266.65,383.845 h -48.386 c 0.12,1.471 0.366,2.903 0.736,4.288 h 46.914 c 0.371,-1.385 0.617,-2.818 0.736,-4.288 z" />
-
-	<linearGradient
-   y2="368.73639"
-   x2="242.45799"
-   y1="422.2861"
-   x1="242.45799"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_3_">
-		<stop
-   id="stop60"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop62"
-   style="stop-color:#2C2255"
-   offset="0.8631" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_3_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path65"
-   d="m 242.458,406.137 c 9.742,0 18.14,-5.74 22.008,-14.022 H 220.45 c 3.867,8.281 12.265,14.022 22.008,14.022 z" />
-
-</g>
+          <linearGradient
+             y2="368.73721"
+             x2="242.4575"
+             y1="422.2832"
+             x1="242.4575"
+             gradientUnits="userSpaceOnUse"
+             id="SVGID_1_">
+            <stop
+               id="stop46"
+               style="stop-color:#473788"
+               offset="0.3033" />
+            <stop
+               id="stop48"
+               style="stop-color:#2C2255"
+               offset="0.872" />
+          </linearGradient>
+          <path
+             style="fill:url(#SVGID_1_);stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path51"
+             d="m 266.65,379.863 c -0.119,-1.47 -0.366,-2.903 -0.736,-4.287 h -46.913 c -0.37,1.384 -0.617,2.817 -0.737,4.287 z" />
+          <linearGradient
+             y2="368.7338"
+             x2="242.4575"
+             y1="422.29199"
+             x1="242.4575"
+             gradientUnits="userSpaceOnUse"
+             id="SVGID_2_">
+            <stop
+               id="stop53"
+               style="stop-color:#473788"
+               offset="0.3033" />
+            <stop
+               id="stop55"
+               style="stop-color:#2C2255"
+               offset="0.872" />
+          </linearGradient>
+          <path
+             style="fill:url(#SVGID_2_);stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path58"
+             d="m 266.65,383.845 h -48.386 c 0.12,1.471 0.366,2.903 0.736,4.288 h 46.914 c 0.371,-1.385 0.617,-2.818 0.736,-4.288 z" />
+          <linearGradient
+             y2="368.73639"
+             x2="242.45799"
+             y1="422.2861"
+             x1="242.45799"
+             gradientUnits="userSpaceOnUse"
+             id="SVGID_3_">
+            <stop
+               id="stop60"
+               style="stop-color:#473788"
+               offset="0.3033" />
+            <stop
+               id="stop62"
+               style="stop-color:#2C2255"
+               offset="0.8631" />
+          </linearGradient>
+          <path
+             style="fill:url(#SVGID_3_);stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path65"
+             d="m 242.458,406.137 c 9.742,0 18.14,-5.74 22.008,-14.022 H 220.45 c 3.867,8.281 12.265,14.022 22.008,14.022 z" />
+        </g>
         <g
            style="stroke-width:1.73496"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
            id="g75">
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path69"
-   d="m 214.679,383.845 h 3.552 48.51 6.373 4.841 c 0.034,-0.633 0.053,-1.271 0.053,-1.913 0,-0.694 -0.025,-1.383 -0.064,-2.068 h -4.829 -6.373 -48.51 -3.802 -7.517 c -0.039,0.686 -0.064,1.374 -0.064,2.068 0,0.643 0.019,1.28 0.052,1.913 z" />
-
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path71"
-   d="m 220.308,371.594 h -12.037 c -0.396,1.297 -0.65,2.627 -0.896,3.982 h 6.2 5.279 47.035 6.662 4.761 c -0.245,-1.355 -0.562,-2.686 -0.957,-3.982" />
-
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path73"
-   d="m 272.739,388.133 h -6.661 -47.035 -5.027 -6.642 c 0.239,1.354 0.51,2.685 0.899,3.981 h 12.222 44.129 7.244 4.719 c 0.389,-1.297 0.701,-2.627 0.941,-3.981 z" />
-
-</g>
+          <path
+             style="fill:#ffffff;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path69"
+             d="m 214.679,383.845 h 3.552 48.51 6.373 4.841 c 0.034,-0.633 0.053,-1.271 0.053,-1.913 0,-0.694 -0.025,-1.383 -0.064,-2.068 h -4.829 -6.373 -48.51 -3.802 -7.517 c -0.039,0.686 -0.064,1.374 -0.064,2.068 0,0.643 0.019,1.28 0.052,1.913 z" />
+          <path
+             style="fill:#ffffff;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path71"
+             d="m 220.308,371.594 h -12.037 c -0.396,1.297 -0.65,2.627 -0.896,3.982 h 6.2 5.279 47.035 6.662 4.761 c -0.245,-1.355 -0.562,-2.686 -0.957,-3.982" />
+          <path
+             style="fill:#ffffff;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path73"
+             d="m 272.739,388.133 h -6.661 -47.035 -5.027 -6.642 c 0.239,1.354 0.51,2.685 0.899,3.981 h 12.222 44.129 7.244 4.719 c 0.389,-1.297 0.701,-2.627 0.941,-3.981 z" />
+        </g>
       </g>
     </g>
   </g>
diff --git a/packages/org.eclipse.epp.package.cpp/eclipse32@2x.png b/packages/org.eclipse.epp.package.cpp/eclipse32@2x.png
index d44f785..3307f99 100644
--- a/packages/org.eclipse.epp.package.cpp/eclipse32@2x.png
+++ b/packages/org.eclipse.epp.package.cpp/eclipse32@2x.png
Binary files differ
diff --git a/packages/org.eclipse.epp.package.cpp/eclipse48.png b/packages/org.eclipse.epp.package.cpp/eclipse48.png
index bff9aef..de9928f 100644
--- a/packages/org.eclipse.epp.package.cpp/eclipse48.png
+++ b/packages/org.eclipse.epp.package.cpp/eclipse48.png
Binary files differ
diff --git a/packages/org.eclipse.epp.package.cpp/eclipse48.svg b/packages/org.eclipse.epp.package.cpp/eclipse48.svg
index 099b7d2..80513d7 100644
--- a/packages/org.eclipse.epp.package.cpp/eclipse48.svg
+++ b/packages/org.eclipse.epp.package.cpp/eclipse48.svg
@@ -7,13 +7,16 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:version="1.0rc1 (09960d6, 2020-04-09)"
-   sodipodi:docname="eclipse48.svg"
-   viewBox="0 0 48 48"
-   height="48"
-   width="48"
+   inkscape:export-ydpi="192"
+   inkscape:export-xdpi="192"
+   inkscape:export-filename="/Users/d021678/git/org.eclipse.epp.packages/packages/org.eclipse.epp.package.java/eclipse48@2x.png"
+   version="1.1"
    id="svg1412"
-   version="1.1">
+   width="48"
+   height="48"
+   viewBox="0 0 48 48"
+   sodipodi:docname="eclipse48.svg"
+   inkscape:version="1.0rc1 (09960d6, 2020-04-09)">
   <metadata
      id="metadata1418">
     <rdf:RDF>
@@ -28,226 +31,209 @@
   <defs
      id="defs1416">
     <linearGradient
-       y2="368.73721"
-       x2="242.4575"
+       id="linearGradient3462"
+       gradientUnits="userSpaceOnUse"
+       x1="242.4575"
        y1="422.2832"
-       x1="242.4575"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3462">
-      <stop
-         id="stop46-2"
-         style="stop-color:#473788"
-         offset="0.3033" />
-      <stop
-         id="stop48-6"
-         style="stop-color:#2C2255"
-         offset="0.872" />
-    </linearGradient>
-    <linearGradient
-       y2="368.7338"
        x2="242.4575"
-       y1="422.29199"
-       x1="242.4575"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3466">
+       y2="368.73721">
       <stop
-         id="stop53-6"
+         offset="0.3033"
          style="stop-color:#473788"
-         offset="0.3033" />
+         id="stop46-2" />
       <stop
-         id="stop55-8"
+         offset="0.872"
          style="stop-color:#2C2255"
-         offset="0.872" />
+         id="stop48-6" />
     </linearGradient>
     <linearGradient
-       y2="368.73639"
-       x2="242.45799"
-       y1="422.2861"
-       x1="242.45799"
+       id="linearGradient3466"
        gradientUnits="userSpaceOnUse"
-       id="linearGradient3470">
+       x1="242.4575"
+       y1="422.29199"
+       x2="242.4575"
+       y2="368.7338">
       <stop
-         id="stop60-3"
+         offset="0.3033"
          style="stop-color:#473788"
-         offset="0.3033" />
+         id="stop53-6" />
       <stop
-         id="stop62-4"
+         offset="0.872"
          style="stop-color:#2C2255"
-         offset="0.8631" />
+         id="stop55-8" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3470"
+       gradientUnits="userSpaceOnUse"
+       x1="242.45799"
+       y1="422.2861"
+       x2="242.45799"
+       y2="368.73639">
+      <stop
+         offset="0.3033"
+         style="stop-color:#473788"
+         id="stop60-3" />
+      <stop
+         offset="0.8631"
+         style="stop-color:#2C2255"
+         id="stop62-4" />
     </linearGradient>
   </defs>
   <sodipodi:namedview
-     inkscape:current-layer="g1420"
-     inkscape:window-maximized="0"
-     inkscape:window-y="23"
-     inkscape:window-x="0"
-     inkscape:cy="24"
-     inkscape:cx="-3.1764706"
-     inkscape:zoom="5.6666667"
-     showgrid="false"
-     id="namedview1414"
-     inkscape:window-height="910"
-     inkscape:window-width="1310"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     guidetolerance="10"
-     gridtolerance="10"
-     objecttolerance="10"
-     borderopacity="1"
+     inkscape:document-rotation="0"
+     pagecolor="#ffffff"
      bordercolor="#666666"
-     pagecolor="#ffffff" />
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1416"
+     inkscape:window-height="1035"
+     id="namedview1414"
+     showgrid="false"
+     inkscape:zoom="5.6666667"
+     inkscape:cx="-3.1764706"
+     inkscape:cy="24"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g1420" />
   <g
-     id="g1420"
+     inkscape:groupmode="layer"
      inkscape:label="Image"
-     inkscape:groupmode="layer">
+     id="g1420">
     <g
-       transform="matrix(0.99893516,0,0,0.99893516,47.95795,3.4517308)"
-       id="g2207">
+       id="g2207"
+       transform="matrix(0.99893516,0,0,0.99893516,47.95795,3.4517308)">
       <g
-         id="g139"
+         style="stroke-width:0.983117"
          transform="matrix(1.0678037,0,0,1.0572816,-79.316579,-1.6972965)"
-         style="stroke-width:0.983117">
+         id="g139">
         <path
-           style="fill:#2c2255;stroke-width:0.983117"
-           inkscape:connector-curvature="0"
+           d="m 41.680839,26.851877 h -6.90011 c 0.91344,3.13415 2.60886,5.94303 5.09022,8.42496 3.95636,3.95636 8.71509,5.93397 14.27903,5.93397 1.11234,0 2.18954,-0.0827 3.23671,-0.24083 4.19039,-0.63295 7.86002,-2.52726 11.00323,-5.69314 2.49836,-2.48193 4.20568,-5.29081 5.12649,-8.42496 h -2.79982 -4.09462 z"
            id="path32"
-           d="m 41.680839,26.851877 h -6.90011 c 0.91344,3.13415 2.60886,5.94303 5.09022,8.42496 3.95636,3.95636 8.71509,5.93397 14.27903,5.93397 1.11234,0 2.18954,-0.0827 3.23671,-0.24083 4.19039,-0.63295 7.86002,-2.52726 11.00323,-5.69314 2.49836,-2.48193 4.20568,-5.29081 5.12649,-8.42496 h -2.79982 -4.09462 z" />
-        <g
-           style="stroke-width:1.73496"
-           transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
-           id="g38">
-	<path
-   style="fill:#2c2255;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path34"
-   d="m 213.736,375.576 h -6.361 c -0.233,1.397 -0.391,2.824 -0.463,4.287 h 7.561 3.792 54.741 4.998 c -0.073,-1.463 -0.232,-2.89 -0.467,-4.287" />
-
-	<path
-   style="fill:#2c2255;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path36"
-   d="m 206.912,383.845 c 0.072,1.464 0.23,2.891 0.463,4.288 h 6.613 5.012 53.558 4.979 c 0.234,-1.397 0.395,-2.824 0.467,-4.288" />
-
-</g>
-        <path
-           style="fill:#2c2255;stroke-width:0.983117"
            inkscape:connector-curvature="0"
+           style="fill:#2c2255;stroke-width:0.983117" />
+        <g
+           id="g38"
+           transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
+           style="stroke-width:1.73496">
+          <path
+             d="m 213.736,375.576 h -6.361 c -0.233,1.397 -0.391,2.824 -0.463,4.287 h 7.561 3.792 54.741 4.998 c -0.073,-1.463 -0.232,-2.89 -0.467,-4.287"
+             id="path34"
+             inkscape:connector-curvature="0"
+             style="fill:#2c2255;stroke-width:3.06178" />
+          <path
+             d="m 206.912,383.845 c 0.072,1.464 0.23,2.891 0.463,4.288 h 6.613 5.012 53.558 4.979 c 0.234,-1.397 0.395,-2.824 0.467,-4.288"
+             id="path36"
+             inkscape:connector-curvature="0"
+             style="fill:#2c2255;stroke-width:3.06178" />
+        </g>
+        <path
+           d="m 73.517539,15.224207 c -0.92024,-3.14265 -2.62813,-5.9639998 -5.12762,-8.4640598 -3.13528,-3.13585 -6.79414,-5.01713 -10.97093,-5.65008 -1.0568,-0.16035995 -2.14477,-0.24421995 -3.26901,-0.24421995 -5.56394,0 -10.3221,1.96513995 -14.27903,5.89429995 -2.48306,2.49949 -4.17905,5.3214098 -5.09192,8.4640598 z"
            id="path40"
-           d="m 73.517539,15.224207 c -0.92024,-3.14265 -2.62813,-5.9639998 -5.12762,-8.4640598 -3.13528,-3.13585 -6.79414,-5.01713 -10.97093,-5.65008 -1.0568,-0.16035995 -2.14477,-0.24421995 -3.26901,-0.24421995 -5.56394,0 -10.3221,1.96513995 -14.27903,5.89429995 -2.48306,2.49949 -4.17905,5.3214098 -5.09192,8.4640598 z" />
+           inkscape:connector-curvature="0"
+           style="fill:#2c2255;stroke-width:0.983117" />
         <g
-           style="stroke-width:1.73496"
+           id="g44"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
-           id="g44">
-	<path
-   style="fill:#f7941e;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path42"
-   d="m 204.797,381.855 c 0,-18.78 14.104,-34.384 32.453,-37.128 -0.455,-0.017 -0.913,-0.035 -1.372,-0.035 -20.591,0 -37.284,16.639 -37.284,37.163 0,20.524 16.693,37.163 37.284,37.163 0.461,0 0.918,-0.019 1.375,-0.034 -18.351,-2.744 -32.456,-18.348 -32.456,-37.129 z" />
-
-</g>
+           style="stroke-width:1.73496">
+          <path
+             d="m 204.797,381.855 c 0,-18.78 14.104,-34.384 32.453,-37.128 -0.455,-0.017 -0.913,-0.035 -1.372,-0.035 -20.591,0 -37.284,16.639 -37.284,37.163 0,20.524 16.693,37.163 37.284,37.163 0.461,0 0.918,-0.019 1.375,-0.034 -18.351,-2.744 -32.456,-18.348 -32.456,-37.129 z"
+             id="path42"
+             inkscape:connector-curvature="0"
+             style="fill:#f7941e;stroke-width:3.06178" />
+        </g>
         <g
-           style="stroke-width:1.73496"
+           id="g67"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
-           id="g67">
-	<linearGradient
-   y2="368.73721"
-   x2="242.4575"
-   y1="422.2832"
-   x1="242.4575"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_1_">
-		<stop
-   id="stop46"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop48"
-   style="stop-color:#2C2255"
-   offset="0.872" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_1_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path51"
-   d="m 266.65,379.863 c -0.119,-1.47 -0.366,-2.903 -0.736,-4.287 h -46.913 c -0.37,1.384 -0.617,2.817 -0.737,4.287 z" />
-
-	<linearGradient
-   y2="368.7338"
-   x2="242.4575"
-   y1="422.29199"
-   x1="242.4575"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_2_">
-		<stop
-   id="stop53"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop55"
-   style="stop-color:#2C2255"
-   offset="0.872" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_2_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path58"
-   d="m 266.65,383.845 h -48.386 c 0.12,1.471 0.366,2.903 0.736,4.288 h 46.914 c 0.371,-1.385 0.617,-2.818 0.736,-4.288 z" />
-
-	<linearGradient
-   y2="368.73639"
-   x2="242.45799"
-   y1="422.2861"
-   x1="242.45799"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_3_">
-		<stop
-   id="stop60"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop62"
-   style="stop-color:#2C2255"
-   offset="0.8631" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_3_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path65"
-   d="m 242.458,406.137 c 9.742,0 18.14,-5.74 22.008,-14.022 H 220.45 c 3.867,8.281 12.265,14.022 22.008,14.022 z" />
-
-</g>
+           style="stroke-width:1.73496">
+          <linearGradient
+             id="SVGID_1_"
+             gradientUnits="userSpaceOnUse"
+             x1="242.4575"
+             y1="422.2832"
+             x2="242.4575"
+             y2="368.73721">
+            <stop
+               offset="0.3033"
+               style="stop-color:#473788"
+               id="stop46" />
+            <stop
+               offset="0.872"
+               style="stop-color:#2C2255"
+               id="stop48" />
+          </linearGradient>
+          <path
+             d="m 266.65,379.863 c -0.119,-1.47 -0.366,-2.903 -0.736,-4.287 h -46.913 c -0.37,1.384 -0.617,2.817 -0.737,4.287 z"
+             id="path51"
+             inkscape:connector-curvature="0"
+             style="fill:url(#SVGID_1_);stroke-width:3.06178" />
+          <linearGradient
+             id="SVGID_2_"
+             gradientUnits="userSpaceOnUse"
+             x1="242.4575"
+             y1="422.29199"
+             x2="242.4575"
+             y2="368.7338">
+            <stop
+               offset="0.3033"
+               style="stop-color:#473788"
+               id="stop53" />
+            <stop
+               offset="0.872"
+               style="stop-color:#2C2255"
+               id="stop55" />
+          </linearGradient>
+          <path
+             d="m 266.65,383.845 h -48.386 c 0.12,1.471 0.366,2.903 0.736,4.288 h 46.914 c 0.371,-1.385 0.617,-2.818 0.736,-4.288 z"
+             id="path58"
+             inkscape:connector-curvature="0"
+             style="fill:url(#SVGID_2_);stroke-width:3.06178" />
+          <linearGradient
+             id="SVGID_3_"
+             gradientUnits="userSpaceOnUse"
+             x1="242.45799"
+             y1="422.2861"
+             x2="242.45799"
+             y2="368.73639">
+            <stop
+               offset="0.3033"
+               style="stop-color:#473788"
+               id="stop60" />
+            <stop
+               offset="0.8631"
+               style="stop-color:#2C2255"
+               id="stop62" />
+          </linearGradient>
+          <path
+             d="m 242.458,406.137 c 9.742,0 18.14,-5.74 22.008,-14.022 H 220.45 c 3.867,8.281 12.265,14.022 22.008,14.022 z"
+             id="path65"
+             inkscape:connector-curvature="0"
+             style="fill:url(#SVGID_3_);stroke-width:3.06178" />
+        </g>
         <g
-           style="stroke-width:1.73496"
+           id="g75"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
-           id="g75">
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path69"
-   d="m 214.679,383.845 h 3.552 48.51 6.373 4.841 c 0.034,-0.633 0.053,-1.271 0.053,-1.913 0,-0.694 -0.025,-1.383 -0.064,-2.068 h -4.829 -6.373 -48.51 -3.802 -7.517 c -0.039,0.686 -0.064,1.374 -0.064,2.068 0,0.643 0.019,1.28 0.052,1.913 z" />
-
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path71"
-   d="m 220.308,371.594 h -12.037 c -0.396,1.297 -0.65,2.627 -0.896,3.982 h 6.2 5.279 47.035 6.662 4.761 c -0.245,-1.355 -0.562,-2.686 -0.957,-3.982" />
-
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path73"
-   d="m 272.739,388.133 h -6.661 -47.035 -5.027 -6.642 c 0.239,1.354 0.51,2.685 0.899,3.981 h 12.222 44.129 7.244 4.719 c 0.389,-1.297 0.701,-2.627 0.941,-3.981 z" />
-
-</g>
+           style="stroke-width:1.73496">
+          <path
+             d="m 214.679,383.845 h 3.552 48.51 6.373 4.841 c 0.034,-0.633 0.053,-1.271 0.053,-1.913 0,-0.694 -0.025,-1.383 -0.064,-2.068 h -4.829 -6.373 -48.51 -3.802 -7.517 c -0.039,0.686 -0.064,1.374 -0.064,2.068 0,0.643 0.019,1.28 0.052,1.913 z"
+             id="path69"
+             inkscape:connector-curvature="0"
+             style="fill:#ffffff;stroke-width:3.06178" />
+          <path
+             d="m 220.308,371.594 h -12.037 c -0.396,1.297 -0.65,2.627 -0.896,3.982 h 6.2 5.279 47.035 6.662 4.761 c -0.245,-1.355 -0.562,-2.686 -0.957,-3.982"
+             id="path71"
+             inkscape:connector-curvature="0"
+             style="fill:#ffffff;stroke-width:3.06178" />
+          <path
+             d="m 272.739,388.133 h -6.661 -47.035 -5.027 -6.642 c 0.239,1.354 0.51,2.685 0.899,3.981 h 12.222 44.129 7.244 4.719 c 0.389,-1.297 0.701,-2.627 0.941,-3.981 z"
+             id="path73"
+             inkscape:connector-curvature="0"
+             style="fill:#ffffff;stroke-width:3.06178" />
+        </g>
       </g>
     </g>
   </g>
diff --git a/packages/org.eclipse.epp.package.cpp/eclipse48@2x.png b/packages/org.eclipse.epp.package.cpp/eclipse48@2x.png
index 3b8d1cc..bff9aef 100644
--- a/packages/org.eclipse.epp.package.cpp/eclipse48@2x.png
+++ b/packages/org.eclipse.epp.package.cpp/eclipse48@2x.png
Binary files differ
diff --git a/packages/org.eclipse.epp.package.dsl/eclipse32.png b/packages/org.eclipse.epp.package.dsl/eclipse32.png
index 55d401d..eae69ee 100644
--- a/packages/org.eclipse.epp.package.dsl/eclipse32.png
+++ b/packages/org.eclipse.epp.package.dsl/eclipse32.png
Binary files differ
diff --git a/packages/org.eclipse.epp.package.dsl/eclipse32.svg b/packages/org.eclipse.epp.package.dsl/eclipse32.svg
index 96aebaa..ccc3e5e 100644
--- a/packages/org.eclipse.epp.package.dsl/eclipse32.svg
+++ b/packages/org.eclipse.epp.package.dsl/eclipse32.svg
@@ -7,9 +7,9 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:export-ydpi="384"
-   inkscape:export-xdpi="384"
-   inkscape:export-filename="/Users/d021678/git/org.eclipse.epp.packages/packages/org.eclipse.epp.package.dsl/eclipse32_2x.png"
+   inkscape:export-ydpi="96"
+   inkscape:export-xdpi="96"
+   inkscape:export-filename="/Users/d021678/git/org.eclipse.epp.packages/packages/org.eclipse.epp.package.java/eclipse32.png"
    inkscape:version="1.0rc1 (09960d6, 2020-04-09)"
    sodipodi:docname="eclipse32.svg"
    viewBox="0 0 32 32"
@@ -85,13 +85,13 @@
      inkscape:window-maximized="0"
      inkscape:window-y="23"
      inkscape:window-x="0"
-     inkscape:cy="7.0588235"
-     inkscape:cx="-2.1176471"
-     inkscape:zoom="8.5"
-     showgrid="false"
+     inkscape:cy="16"
+     inkscape:cx="16"
+     inkscape:zoom="25.84375"
+     showgrid="true"
      id="namedview2261"
-     inkscape:window-height="954"
-     inkscape:window-width="1305"
+     inkscape:window-height="1035"
+     inkscape:window-width="1486"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0"
      guidetolerance="10"
@@ -99,13 +99,16 @@
      objecttolerance="10"
      borderopacity="1"
      bordercolor="#666666"
-     pagecolor="#ffffff" />
+     pagecolor="#ffffff"
+     inkscape:document-rotation="0"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true" />
   <g
      id="g2267"
      inkscape:label="Image"
      inkscape:groupmode="layer">
     <g
-       transform="matrix(0.69565218,0,0,0.69565218,26.95397,22.85109)"
+       transform="matrix(0.69565218,0,0,0.69565218,26.95397,22.264755)"
        id="g3036">
       <g
          id="g139"
@@ -120,19 +123,17 @@
            style="stroke-width:1.73496"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
            id="g38">
-	<path
-   style="fill:#2c2255;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path34"
-   d="m 213.736,375.576 h -6.361 c -0.233,1.397 -0.391,2.824 -0.463,4.287 h 7.561 3.792 54.741 4.998 c -0.073,-1.463 -0.232,-2.89 -0.467,-4.287" />
-
-	<path
-   style="fill:#2c2255;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path36"
-   d="m 206.912,383.845 c 0.072,1.464 0.23,2.891 0.463,4.288 h 6.613 5.012 53.558 4.979 c 0.234,-1.397 0.395,-2.824 0.467,-4.288" />
-
-</g>
+          <path
+             style="fill:#2c2255;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path34"
+             d="m 213.736,375.576 h -6.361 c -0.233,1.397 -0.391,2.824 -0.463,4.287 h 7.561 3.792 54.741 4.998 c -0.073,-1.463 -0.232,-2.89 -0.467,-4.287" />
+          <path
+             style="fill:#2c2255;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path36"
+             d="m 206.912,383.845 c 0.072,1.464 0.23,2.891 0.463,4.288 h 6.613 5.012 53.558 4.979 c 0.234,-1.397 0.395,-2.824 0.467,-4.288" />
+        </g>
         <path
            style="fill:#2c2255;stroke-width:0.983117"
            inkscape:connector-curvature="0"
@@ -142,116 +143,100 @@
            style="stroke-width:1.73496"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
            id="g44">
-	<path
-   style="fill:#f7941e;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path42"
-   d="m 204.797,381.855 c 0,-18.78 14.104,-34.384 32.453,-37.128 -0.455,-0.017 -0.913,-0.035 -1.372,-0.035 -20.591,0 -37.284,16.639 -37.284,37.163 0,20.524 16.693,37.163 37.284,37.163 0.461,0 0.918,-0.019 1.375,-0.034 -18.351,-2.744 -32.456,-18.348 -32.456,-37.129 z" />
-
-</g>
+          <path
+             style="fill:#f7941e;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path42"
+             d="m 204.797,381.855 c 0,-18.78 14.104,-34.384 32.453,-37.128 -0.455,-0.017 -0.913,-0.035 -1.372,-0.035 -20.591,0 -37.284,16.639 -37.284,37.163 0,20.524 16.693,37.163 37.284,37.163 0.461,0 0.918,-0.019 1.375,-0.034 -18.351,-2.744 -32.456,-18.348 -32.456,-37.129 z" />
+        </g>
         <g
            style="stroke-width:1.73496"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
            id="g67">
-	<linearGradient
-   y2="368.73721"
-   x2="242.4575"
-   y1="422.2832"
-   x1="242.4575"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_1_">
-		<stop
-   id="stop46"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop48"
-   style="stop-color:#2C2255"
-   offset="0.872" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_1_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path51"
-   d="m 266.65,379.863 c -0.119,-1.47 -0.366,-2.903 -0.736,-4.287 h -46.913 c -0.37,1.384 -0.617,2.817 -0.737,4.287 z" />
-
-	<linearGradient
-   y2="368.7338"
-   x2="242.4575"
-   y1="422.29199"
-   x1="242.4575"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_2_">
-		<stop
-   id="stop53"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop55"
-   style="stop-color:#2C2255"
-   offset="0.872" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_2_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path58"
-   d="m 266.65,383.845 h -48.386 c 0.12,1.471 0.366,2.903 0.736,4.288 h 46.914 c 0.371,-1.385 0.617,-2.818 0.736,-4.288 z" />
-
-	<linearGradient
-   y2="368.73639"
-   x2="242.45799"
-   y1="422.2861"
-   x1="242.45799"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_3_">
-		<stop
-   id="stop60"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop62"
-   style="stop-color:#2C2255"
-   offset="0.8631" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_3_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path65"
-   d="m 242.458,406.137 c 9.742,0 18.14,-5.74 22.008,-14.022 H 220.45 c 3.867,8.281 12.265,14.022 22.008,14.022 z" />
-
-</g>
+          <linearGradient
+             y2="368.73721"
+             x2="242.4575"
+             y1="422.2832"
+             x1="242.4575"
+             gradientUnits="userSpaceOnUse"
+             id="SVGID_1_">
+            <stop
+               id="stop46"
+               style="stop-color:#473788"
+               offset="0.3033" />
+            <stop
+               id="stop48"
+               style="stop-color:#2C2255"
+               offset="0.872" />
+          </linearGradient>
+          <path
+             style="fill:url(#SVGID_1_);stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path51"
+             d="m 266.65,379.863 c -0.119,-1.47 -0.366,-2.903 -0.736,-4.287 h -46.913 c -0.37,1.384 -0.617,2.817 -0.737,4.287 z" />
+          <linearGradient
+             y2="368.7338"
+             x2="242.4575"
+             y1="422.29199"
+             x1="242.4575"
+             gradientUnits="userSpaceOnUse"
+             id="SVGID_2_">
+            <stop
+               id="stop53"
+               style="stop-color:#473788"
+               offset="0.3033" />
+            <stop
+               id="stop55"
+               style="stop-color:#2C2255"
+               offset="0.872" />
+          </linearGradient>
+          <path
+             style="fill:url(#SVGID_2_);stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path58"
+             d="m 266.65,383.845 h -48.386 c 0.12,1.471 0.366,2.903 0.736,4.288 h 46.914 c 0.371,-1.385 0.617,-2.818 0.736,-4.288 z" />
+          <linearGradient
+             y2="368.73639"
+             x2="242.45799"
+             y1="422.2861"
+             x1="242.45799"
+             gradientUnits="userSpaceOnUse"
+             id="SVGID_3_">
+            <stop
+               id="stop60"
+               style="stop-color:#473788"
+               offset="0.3033" />
+            <stop
+               id="stop62"
+               style="stop-color:#2C2255"
+               offset="0.8631" />
+          </linearGradient>
+          <path
+             style="fill:url(#SVGID_3_);stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path65"
+             d="m 242.458,406.137 c 9.742,0 18.14,-5.74 22.008,-14.022 H 220.45 c 3.867,8.281 12.265,14.022 22.008,14.022 z" />
+        </g>
         <g
            style="stroke-width:1.73496"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
            id="g75">
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path69"
-   d="m 214.679,383.845 h 3.552 48.51 6.373 4.841 c 0.034,-0.633 0.053,-1.271 0.053,-1.913 0,-0.694 -0.025,-1.383 -0.064,-2.068 h -4.829 -6.373 -48.51 -3.802 -7.517 c -0.039,0.686 -0.064,1.374 -0.064,2.068 0,0.643 0.019,1.28 0.052,1.913 z" />
-
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path71"
-   d="m 220.308,371.594 h -12.037 c -0.396,1.297 -0.65,2.627 -0.896,3.982 h 6.2 5.279 47.035 6.662 4.761 c -0.245,-1.355 -0.562,-2.686 -0.957,-3.982" />
-
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path73"
-   d="m 272.739,388.133 h -6.661 -47.035 -5.027 -6.642 c 0.239,1.354 0.51,2.685 0.899,3.981 h 12.222 44.129 7.244 4.719 c 0.389,-1.297 0.701,-2.627 0.941,-3.981 z" />
-
-</g>
+          <path
+             style="fill:#ffffff;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path69"
+             d="m 214.679,383.845 h 3.552 48.51 6.373 4.841 c 0.034,-0.633 0.053,-1.271 0.053,-1.913 0,-0.694 -0.025,-1.383 -0.064,-2.068 h -4.829 -6.373 -48.51 -3.802 -7.517 c -0.039,0.686 -0.064,1.374 -0.064,2.068 0,0.643 0.019,1.28 0.052,1.913 z" />
+          <path
+             style="fill:#ffffff;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path71"
+             d="m 220.308,371.594 h -12.037 c -0.396,1.297 -0.65,2.627 -0.896,3.982 h 6.2 5.279 47.035 6.662 4.761 c -0.245,-1.355 -0.562,-2.686 -0.957,-3.982" />
+          <path
+             style="fill:#ffffff;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path73"
+             d="m 272.739,388.133 h -6.661 -47.035 -5.027 -6.642 c 0.239,1.354 0.51,2.685 0.899,3.981 h 12.222 44.129 7.244 4.719 c 0.389,-1.297 0.701,-2.627 0.941,-3.981 z" />
+        </g>
       </g>
     </g>
   </g>
diff --git a/packages/org.eclipse.epp.package.dsl/eclipse32@2x.png b/packages/org.eclipse.epp.package.dsl/eclipse32@2x.png
index d44f785..3307f99 100644
--- a/packages/org.eclipse.epp.package.dsl/eclipse32@2x.png
+++ b/packages/org.eclipse.epp.package.dsl/eclipse32@2x.png
Binary files differ
diff --git a/packages/org.eclipse.epp.package.dsl/eclipse48.png b/packages/org.eclipse.epp.package.dsl/eclipse48.png
index bff9aef..de9928f 100644
--- a/packages/org.eclipse.epp.package.dsl/eclipse48.png
+++ b/packages/org.eclipse.epp.package.dsl/eclipse48.png
Binary files differ
diff --git a/packages/org.eclipse.epp.package.dsl/eclipse48.svg b/packages/org.eclipse.epp.package.dsl/eclipse48.svg
index 099b7d2..80513d7 100644
--- a/packages/org.eclipse.epp.package.dsl/eclipse48.svg
+++ b/packages/org.eclipse.epp.package.dsl/eclipse48.svg
@@ -7,13 +7,16 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:version="1.0rc1 (09960d6, 2020-04-09)"
-   sodipodi:docname="eclipse48.svg"
-   viewBox="0 0 48 48"
-   height="48"
-   width="48"
+   inkscape:export-ydpi="192"
+   inkscape:export-xdpi="192"
+   inkscape:export-filename="/Users/d021678/git/org.eclipse.epp.packages/packages/org.eclipse.epp.package.java/eclipse48@2x.png"
+   version="1.1"
    id="svg1412"
-   version="1.1">
+   width="48"
+   height="48"
+   viewBox="0 0 48 48"
+   sodipodi:docname="eclipse48.svg"
+   inkscape:version="1.0rc1 (09960d6, 2020-04-09)">
   <metadata
      id="metadata1418">
     <rdf:RDF>
@@ -28,226 +31,209 @@
   <defs
      id="defs1416">
     <linearGradient
-       y2="368.73721"
-       x2="242.4575"
+       id="linearGradient3462"
+       gradientUnits="userSpaceOnUse"
+       x1="242.4575"
        y1="422.2832"
-       x1="242.4575"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3462">
-      <stop
-         id="stop46-2"
-         style="stop-color:#473788"
-         offset="0.3033" />
-      <stop
-         id="stop48-6"
-         style="stop-color:#2C2255"
-         offset="0.872" />
-    </linearGradient>
-    <linearGradient
-       y2="368.7338"
        x2="242.4575"
-       y1="422.29199"
-       x1="242.4575"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3466">
+       y2="368.73721">
       <stop
-         id="stop53-6"
+         offset="0.3033"
          style="stop-color:#473788"
-         offset="0.3033" />
+         id="stop46-2" />
       <stop
-         id="stop55-8"
+         offset="0.872"
          style="stop-color:#2C2255"
-         offset="0.872" />
+         id="stop48-6" />
     </linearGradient>
     <linearGradient
-       y2="368.73639"
-       x2="242.45799"
-       y1="422.2861"
-       x1="242.45799"
+       id="linearGradient3466"
        gradientUnits="userSpaceOnUse"
-       id="linearGradient3470">
+       x1="242.4575"
+       y1="422.29199"
+       x2="242.4575"
+       y2="368.7338">
       <stop
-         id="stop60-3"
+         offset="0.3033"
          style="stop-color:#473788"
-         offset="0.3033" />
+         id="stop53-6" />
       <stop
-         id="stop62-4"
+         offset="0.872"
          style="stop-color:#2C2255"
-         offset="0.8631" />
+         id="stop55-8" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3470"
+       gradientUnits="userSpaceOnUse"
+       x1="242.45799"
+       y1="422.2861"
+       x2="242.45799"
+       y2="368.73639">
+      <stop
+         offset="0.3033"
+         style="stop-color:#473788"
+         id="stop60-3" />
+      <stop
+         offset="0.8631"
+         style="stop-color:#2C2255"
+         id="stop62-4" />
     </linearGradient>
   </defs>
   <sodipodi:namedview
-     inkscape:current-layer="g1420"
-     inkscape:window-maximized="0"
-     inkscape:window-y="23"
-     inkscape:window-x="0"
-     inkscape:cy="24"
-     inkscape:cx="-3.1764706"
-     inkscape:zoom="5.6666667"
-     showgrid="false"
-     id="namedview1414"
-     inkscape:window-height="910"
-     inkscape:window-width="1310"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     guidetolerance="10"
-     gridtolerance="10"
-     objecttolerance="10"
-     borderopacity="1"
+     inkscape:document-rotation="0"
+     pagecolor="#ffffff"
      bordercolor="#666666"
-     pagecolor="#ffffff" />
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1416"
+     inkscape:window-height="1035"
+     id="namedview1414"
+     showgrid="false"
+     inkscape:zoom="5.6666667"
+     inkscape:cx="-3.1764706"
+     inkscape:cy="24"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g1420" />
   <g
-     id="g1420"
+     inkscape:groupmode="layer"
      inkscape:label="Image"
-     inkscape:groupmode="layer">
+     id="g1420">
     <g
-       transform="matrix(0.99893516,0,0,0.99893516,47.95795,3.4517308)"
-       id="g2207">
+       id="g2207"
+       transform="matrix(0.99893516,0,0,0.99893516,47.95795,3.4517308)">
       <g
-         id="g139"
+         style="stroke-width:0.983117"
          transform="matrix(1.0678037,0,0,1.0572816,-79.316579,-1.6972965)"
-         style="stroke-width:0.983117">
+         id="g139">
         <path
-           style="fill:#2c2255;stroke-width:0.983117"
-           inkscape:connector-curvature="0"
+           d="m 41.680839,26.851877 h -6.90011 c 0.91344,3.13415 2.60886,5.94303 5.09022,8.42496 3.95636,3.95636 8.71509,5.93397 14.27903,5.93397 1.11234,0 2.18954,-0.0827 3.23671,-0.24083 4.19039,-0.63295 7.86002,-2.52726 11.00323,-5.69314 2.49836,-2.48193 4.20568,-5.29081 5.12649,-8.42496 h -2.79982 -4.09462 z"
            id="path32"
-           d="m 41.680839,26.851877 h -6.90011 c 0.91344,3.13415 2.60886,5.94303 5.09022,8.42496 3.95636,3.95636 8.71509,5.93397 14.27903,5.93397 1.11234,0 2.18954,-0.0827 3.23671,-0.24083 4.19039,-0.63295 7.86002,-2.52726 11.00323,-5.69314 2.49836,-2.48193 4.20568,-5.29081 5.12649,-8.42496 h -2.79982 -4.09462 z" />
-        <g
-           style="stroke-width:1.73496"
-           transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
-           id="g38">
-	<path
-   style="fill:#2c2255;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path34"
-   d="m 213.736,375.576 h -6.361 c -0.233,1.397 -0.391,2.824 -0.463,4.287 h 7.561 3.792 54.741 4.998 c -0.073,-1.463 -0.232,-2.89 -0.467,-4.287" />
-
-	<path
-   style="fill:#2c2255;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path36"
-   d="m 206.912,383.845 c 0.072,1.464 0.23,2.891 0.463,4.288 h 6.613 5.012 53.558 4.979 c 0.234,-1.397 0.395,-2.824 0.467,-4.288" />
-
-</g>
-        <path
-           style="fill:#2c2255;stroke-width:0.983117"
            inkscape:connector-curvature="0"
+           style="fill:#2c2255;stroke-width:0.983117" />
+        <g
+           id="g38"
+           transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
+           style="stroke-width:1.73496">
+          <path
+             d="m 213.736,375.576 h -6.361 c -0.233,1.397 -0.391,2.824 -0.463,4.287 h 7.561 3.792 54.741 4.998 c -0.073,-1.463 -0.232,-2.89 -0.467,-4.287"
+             id="path34"
+             inkscape:connector-curvature="0"
+             style="fill:#2c2255;stroke-width:3.06178" />
+          <path
+             d="m 206.912,383.845 c 0.072,1.464 0.23,2.891 0.463,4.288 h 6.613 5.012 53.558 4.979 c 0.234,-1.397 0.395,-2.824 0.467,-4.288"
+             id="path36"
+             inkscape:connector-curvature="0"
+             style="fill:#2c2255;stroke-width:3.06178" />
+        </g>
+        <path
+           d="m 73.517539,15.224207 c -0.92024,-3.14265 -2.62813,-5.9639998 -5.12762,-8.4640598 -3.13528,-3.13585 -6.79414,-5.01713 -10.97093,-5.65008 -1.0568,-0.16035995 -2.14477,-0.24421995 -3.26901,-0.24421995 -5.56394,0 -10.3221,1.96513995 -14.27903,5.89429995 -2.48306,2.49949 -4.17905,5.3214098 -5.09192,8.4640598 z"
            id="path40"
-           d="m 73.517539,15.224207 c -0.92024,-3.14265 -2.62813,-5.9639998 -5.12762,-8.4640598 -3.13528,-3.13585 -6.79414,-5.01713 -10.97093,-5.65008 -1.0568,-0.16035995 -2.14477,-0.24421995 -3.26901,-0.24421995 -5.56394,0 -10.3221,1.96513995 -14.27903,5.89429995 -2.48306,2.49949 -4.17905,5.3214098 -5.09192,8.4640598 z" />
+           inkscape:connector-curvature="0"
+           style="fill:#2c2255;stroke-width:0.983117" />
         <g
-           style="stroke-width:1.73496"
+           id="g44"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
-           id="g44">
-	<path
-   style="fill:#f7941e;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path42"
-   d="m 204.797,381.855 c 0,-18.78 14.104,-34.384 32.453,-37.128 -0.455,-0.017 -0.913,-0.035 -1.372,-0.035 -20.591,0 -37.284,16.639 -37.284,37.163 0,20.524 16.693,37.163 37.284,37.163 0.461,0 0.918,-0.019 1.375,-0.034 -18.351,-2.744 -32.456,-18.348 -32.456,-37.129 z" />
-
-</g>
+           style="stroke-width:1.73496">
+          <path
+             d="m 204.797,381.855 c 0,-18.78 14.104,-34.384 32.453,-37.128 -0.455,-0.017 -0.913,-0.035 -1.372,-0.035 -20.591,0 -37.284,16.639 -37.284,37.163 0,20.524 16.693,37.163 37.284,37.163 0.461,0 0.918,-0.019 1.375,-0.034 -18.351,-2.744 -32.456,-18.348 -32.456,-37.129 z"
+             id="path42"
+             inkscape:connector-curvature="0"
+             style="fill:#f7941e;stroke-width:3.06178" />
+        </g>
         <g
-           style="stroke-width:1.73496"
+           id="g67"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
-           id="g67">
-	<linearGradient
-   y2="368.73721"
-   x2="242.4575"
-   y1="422.2832"
-   x1="242.4575"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_1_">
-		<stop
-   id="stop46"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop48"
-   style="stop-color:#2C2255"
-   offset="0.872" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_1_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path51"
-   d="m 266.65,379.863 c -0.119,-1.47 -0.366,-2.903 -0.736,-4.287 h -46.913 c -0.37,1.384 -0.617,2.817 -0.737,4.287 z" />
-
-	<linearGradient
-   y2="368.7338"
-   x2="242.4575"
-   y1="422.29199"
-   x1="242.4575"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_2_">
-		<stop
-   id="stop53"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop55"
-   style="stop-color:#2C2255"
-   offset="0.872" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_2_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path58"
-   d="m 266.65,383.845 h -48.386 c 0.12,1.471 0.366,2.903 0.736,4.288 h 46.914 c 0.371,-1.385 0.617,-2.818 0.736,-4.288 z" />
-
-	<linearGradient
-   y2="368.73639"
-   x2="242.45799"
-   y1="422.2861"
-   x1="242.45799"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_3_">
-		<stop
-   id="stop60"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop62"
-   style="stop-color:#2C2255"
-   offset="0.8631" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_3_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path65"
-   d="m 242.458,406.137 c 9.742,0 18.14,-5.74 22.008,-14.022 H 220.45 c 3.867,8.281 12.265,14.022 22.008,14.022 z" />
-
-</g>
+           style="stroke-width:1.73496">
+          <linearGradient
+             id="SVGID_1_"
+             gradientUnits="userSpaceOnUse"
+             x1="242.4575"
+             y1="422.2832"
+             x2="242.4575"
+             y2="368.73721">
+            <stop
+               offset="0.3033"
+               style="stop-color:#473788"
+               id="stop46" />
+            <stop
+               offset="0.872"
+               style="stop-color:#2C2255"
+               id="stop48" />
+          </linearGradient>
+          <path
+             d="m 266.65,379.863 c -0.119,-1.47 -0.366,-2.903 -0.736,-4.287 h -46.913 c -0.37,1.384 -0.617,2.817 -0.737,4.287 z"
+             id="path51"
+             inkscape:connector-curvature="0"
+             style="fill:url(#SVGID_1_);stroke-width:3.06178" />
+          <linearGradient
+             id="SVGID_2_"
+             gradientUnits="userSpaceOnUse"
+             x1="242.4575"
+             y1="422.29199"
+             x2="242.4575"
+             y2="368.7338">
+            <stop
+               offset="0.3033"
+               style="stop-color:#473788"
+               id="stop53" />
+            <stop
+               offset="0.872"
+               style="stop-color:#2C2255"
+               id="stop55" />
+          </linearGradient>
+          <path
+             d="m 266.65,383.845 h -48.386 c 0.12,1.471 0.366,2.903 0.736,4.288 h 46.914 c 0.371,-1.385 0.617,-2.818 0.736,-4.288 z"
+             id="path58"
+             inkscape:connector-curvature="0"
+             style="fill:url(#SVGID_2_);stroke-width:3.06178" />
+          <linearGradient
+             id="SVGID_3_"
+             gradientUnits="userSpaceOnUse"
+             x1="242.45799"
+             y1="422.2861"
+             x2="242.45799"
+             y2="368.73639">
+            <stop
+               offset="0.3033"
+               style="stop-color:#473788"
+               id="stop60" />
+            <stop
+               offset="0.8631"
+               style="stop-color:#2C2255"
+               id="stop62" />
+          </linearGradient>
+          <path
+             d="m 242.458,406.137 c 9.742,0 18.14,-5.74 22.008,-14.022 H 220.45 c 3.867,8.281 12.265,14.022 22.008,14.022 z"
+             id="path65"
+             inkscape:connector-curvature="0"
+             style="fill:url(#SVGID_3_);stroke-width:3.06178" />
+        </g>
         <g
-           style="stroke-width:1.73496"
+           id="g75"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
-           id="g75">
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path69"
-   d="m 214.679,383.845 h 3.552 48.51 6.373 4.841 c 0.034,-0.633 0.053,-1.271 0.053,-1.913 0,-0.694 -0.025,-1.383 -0.064,-2.068 h -4.829 -6.373 -48.51 -3.802 -7.517 c -0.039,0.686 -0.064,1.374 -0.064,2.068 0,0.643 0.019,1.28 0.052,1.913 z" />
-
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path71"
-   d="m 220.308,371.594 h -12.037 c -0.396,1.297 -0.65,2.627 -0.896,3.982 h 6.2 5.279 47.035 6.662 4.761 c -0.245,-1.355 -0.562,-2.686 -0.957,-3.982" />
-
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path73"
-   d="m 272.739,388.133 h -6.661 -47.035 -5.027 -6.642 c 0.239,1.354 0.51,2.685 0.899,3.981 h 12.222 44.129 7.244 4.719 c 0.389,-1.297 0.701,-2.627 0.941,-3.981 z" />
-
-</g>
+           style="stroke-width:1.73496">
+          <path
+             d="m 214.679,383.845 h 3.552 48.51 6.373 4.841 c 0.034,-0.633 0.053,-1.271 0.053,-1.913 0,-0.694 -0.025,-1.383 -0.064,-2.068 h -4.829 -6.373 -48.51 -3.802 -7.517 c -0.039,0.686 -0.064,1.374 -0.064,2.068 0,0.643 0.019,1.28 0.052,1.913 z"
+             id="path69"
+             inkscape:connector-curvature="0"
+             style="fill:#ffffff;stroke-width:3.06178" />
+          <path
+             d="m 220.308,371.594 h -12.037 c -0.396,1.297 -0.65,2.627 -0.896,3.982 h 6.2 5.279 47.035 6.662 4.761 c -0.245,-1.355 -0.562,-2.686 -0.957,-3.982"
+             id="path71"
+             inkscape:connector-curvature="0"
+             style="fill:#ffffff;stroke-width:3.06178" />
+          <path
+             d="m 272.739,388.133 h -6.661 -47.035 -5.027 -6.642 c 0.239,1.354 0.51,2.685 0.899,3.981 h 12.222 44.129 7.244 4.719 c 0.389,-1.297 0.701,-2.627 0.941,-3.981 z"
+             id="path73"
+             inkscape:connector-curvature="0"
+             style="fill:#ffffff;stroke-width:3.06178" />
+        </g>
       </g>
     </g>
   </g>
diff --git a/packages/org.eclipse.epp.package.dsl/eclipse48@2x.png b/packages/org.eclipse.epp.package.dsl/eclipse48@2x.png
index 3b8d1cc..bff9aef 100644
--- a/packages/org.eclipse.epp.package.dsl/eclipse48@2x.png
+++ b/packages/org.eclipse.epp.package.dsl/eclipse48@2x.png
Binary files differ
diff --git a/packages/org.eclipse.epp.package.javascript/eclipse32.png b/packages/org.eclipse.epp.package.javascript/eclipse32.png
index 55d401d..eae69ee 100644
--- a/packages/org.eclipse.epp.package.javascript/eclipse32.png
+++ b/packages/org.eclipse.epp.package.javascript/eclipse32.png
Binary files differ
diff --git a/packages/org.eclipse.epp.package.javascript/eclipse32.svg b/packages/org.eclipse.epp.package.javascript/eclipse32.svg
index d7a66f4..ccc3e5e 100644
--- a/packages/org.eclipse.epp.package.javascript/eclipse32.svg
+++ b/packages/org.eclipse.epp.package.javascript/eclipse32.svg
@@ -7,9 +7,9 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:export-ydpi="384"
-   inkscape:export-xdpi="384"
-   inkscape:export-filename="/Users/d021678/git/org.eclipse.epp.packages/packages/org.eclipse.epp.package.javascript/eclipse32_2x.png"
+   inkscape:export-ydpi="96"
+   inkscape:export-xdpi="96"
+   inkscape:export-filename="/Users/d021678/git/org.eclipse.epp.packages/packages/org.eclipse.epp.package.java/eclipse32.png"
    inkscape:version="1.0rc1 (09960d6, 2020-04-09)"
    sodipodi:docname="eclipse32.svg"
    viewBox="0 0 32 32"
@@ -85,13 +85,13 @@
      inkscape:window-maximized="0"
      inkscape:window-y="23"
      inkscape:window-x="0"
-     inkscape:cy="7.0588235"
-     inkscape:cx="-2.1176471"
-     inkscape:zoom="8.5"
-     showgrid="false"
+     inkscape:cy="16"
+     inkscape:cx="16"
+     inkscape:zoom="25.84375"
+     showgrid="true"
      id="namedview2261"
-     inkscape:window-height="954"
-     inkscape:window-width="1305"
+     inkscape:window-height="1035"
+     inkscape:window-width="1486"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0"
      guidetolerance="10"
@@ -99,13 +99,16 @@
      objecttolerance="10"
      borderopacity="1"
      bordercolor="#666666"
-     pagecolor="#ffffff" />
+     pagecolor="#ffffff"
+     inkscape:document-rotation="0"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true" />
   <g
      id="g2267"
      inkscape:label="Image"
      inkscape:groupmode="layer">
     <g
-       transform="matrix(0.69565218,0,0,0.69565218,26.95397,22.85109)"
+       transform="matrix(0.69565218,0,0,0.69565218,26.95397,22.264755)"
        id="g3036">
       <g
          id="g139"
@@ -120,19 +123,17 @@
            style="stroke-width:1.73496"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
            id="g38">
-	<path
-   style="fill:#2c2255;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path34"
-   d="m 213.736,375.576 h -6.361 c -0.233,1.397 -0.391,2.824 -0.463,4.287 h 7.561 3.792 54.741 4.998 c -0.073,-1.463 -0.232,-2.89 -0.467,-4.287" />
-
-	<path
-   style="fill:#2c2255;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path36"
-   d="m 206.912,383.845 c 0.072,1.464 0.23,2.891 0.463,4.288 h 6.613 5.012 53.558 4.979 c 0.234,-1.397 0.395,-2.824 0.467,-4.288" />
-
-</g>
+          <path
+             style="fill:#2c2255;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path34"
+             d="m 213.736,375.576 h -6.361 c -0.233,1.397 -0.391,2.824 -0.463,4.287 h 7.561 3.792 54.741 4.998 c -0.073,-1.463 -0.232,-2.89 -0.467,-4.287" />
+          <path
+             style="fill:#2c2255;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path36"
+             d="m 206.912,383.845 c 0.072,1.464 0.23,2.891 0.463,4.288 h 6.613 5.012 53.558 4.979 c 0.234,-1.397 0.395,-2.824 0.467,-4.288" />
+        </g>
         <path
            style="fill:#2c2255;stroke-width:0.983117"
            inkscape:connector-curvature="0"
@@ -142,116 +143,100 @@
            style="stroke-width:1.73496"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
            id="g44">
-	<path
-   style="fill:#f7941e;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path42"
-   d="m 204.797,381.855 c 0,-18.78 14.104,-34.384 32.453,-37.128 -0.455,-0.017 -0.913,-0.035 -1.372,-0.035 -20.591,0 -37.284,16.639 -37.284,37.163 0,20.524 16.693,37.163 37.284,37.163 0.461,0 0.918,-0.019 1.375,-0.034 -18.351,-2.744 -32.456,-18.348 -32.456,-37.129 z" />
-
-</g>
+          <path
+             style="fill:#f7941e;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path42"
+             d="m 204.797,381.855 c 0,-18.78 14.104,-34.384 32.453,-37.128 -0.455,-0.017 -0.913,-0.035 -1.372,-0.035 -20.591,0 -37.284,16.639 -37.284,37.163 0,20.524 16.693,37.163 37.284,37.163 0.461,0 0.918,-0.019 1.375,-0.034 -18.351,-2.744 -32.456,-18.348 -32.456,-37.129 z" />
+        </g>
         <g
            style="stroke-width:1.73496"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
            id="g67">
-	<linearGradient
-   y2="368.73721"
-   x2="242.4575"
-   y1="422.2832"
-   x1="242.4575"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_1_">
-		<stop
-   id="stop46"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop48"
-   style="stop-color:#2C2255"
-   offset="0.872" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_1_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path51"
-   d="m 266.65,379.863 c -0.119,-1.47 -0.366,-2.903 -0.736,-4.287 h -46.913 c -0.37,1.384 -0.617,2.817 -0.737,4.287 z" />
-
-	<linearGradient
-   y2="368.7338"
-   x2="242.4575"
-   y1="422.29199"
-   x1="242.4575"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_2_">
-		<stop
-   id="stop53"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop55"
-   style="stop-color:#2C2255"
-   offset="0.872" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_2_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path58"
-   d="m 266.65,383.845 h -48.386 c 0.12,1.471 0.366,2.903 0.736,4.288 h 46.914 c 0.371,-1.385 0.617,-2.818 0.736,-4.288 z" />
-
-	<linearGradient
-   y2="368.73639"
-   x2="242.45799"
-   y1="422.2861"
-   x1="242.45799"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_3_">
-		<stop
-   id="stop60"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop62"
-   style="stop-color:#2C2255"
-   offset="0.8631" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_3_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path65"
-   d="m 242.458,406.137 c 9.742,0 18.14,-5.74 22.008,-14.022 H 220.45 c 3.867,8.281 12.265,14.022 22.008,14.022 z" />
-
-</g>
+          <linearGradient
+             y2="368.73721"
+             x2="242.4575"
+             y1="422.2832"
+             x1="242.4575"
+             gradientUnits="userSpaceOnUse"
+             id="SVGID_1_">
+            <stop
+               id="stop46"
+               style="stop-color:#473788"
+               offset="0.3033" />
+            <stop
+               id="stop48"
+               style="stop-color:#2C2255"
+               offset="0.872" />
+          </linearGradient>
+          <path
+             style="fill:url(#SVGID_1_);stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path51"
+             d="m 266.65,379.863 c -0.119,-1.47 -0.366,-2.903 -0.736,-4.287 h -46.913 c -0.37,1.384 -0.617,2.817 -0.737,4.287 z" />
+          <linearGradient
+             y2="368.7338"
+             x2="242.4575"
+             y1="422.29199"
+             x1="242.4575"
+             gradientUnits="userSpaceOnUse"
+             id="SVGID_2_">
+            <stop
+               id="stop53"
+               style="stop-color:#473788"
+               offset="0.3033" />
+            <stop
+               id="stop55"
+               style="stop-color:#2C2255"
+               offset="0.872" />
+          </linearGradient>
+          <path
+             style="fill:url(#SVGID_2_);stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path58"
+             d="m 266.65,383.845 h -48.386 c 0.12,1.471 0.366,2.903 0.736,4.288 h 46.914 c 0.371,-1.385 0.617,-2.818 0.736,-4.288 z" />
+          <linearGradient
+             y2="368.73639"
+             x2="242.45799"
+             y1="422.2861"
+             x1="242.45799"
+             gradientUnits="userSpaceOnUse"
+             id="SVGID_3_">
+            <stop
+               id="stop60"
+               style="stop-color:#473788"
+               offset="0.3033" />
+            <stop
+               id="stop62"
+               style="stop-color:#2C2255"
+               offset="0.8631" />
+          </linearGradient>
+          <path
+             style="fill:url(#SVGID_3_);stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path65"
+             d="m 242.458,406.137 c 9.742,0 18.14,-5.74 22.008,-14.022 H 220.45 c 3.867,8.281 12.265,14.022 22.008,14.022 z" />
+        </g>
         <g
            style="stroke-width:1.73496"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
            id="g75">
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path69"
-   d="m 214.679,383.845 h 3.552 48.51 6.373 4.841 c 0.034,-0.633 0.053,-1.271 0.053,-1.913 0,-0.694 -0.025,-1.383 -0.064,-2.068 h -4.829 -6.373 -48.51 -3.802 -7.517 c -0.039,0.686 -0.064,1.374 -0.064,2.068 0,0.643 0.019,1.28 0.052,1.913 z" />
-
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path71"
-   d="m 220.308,371.594 h -12.037 c -0.396,1.297 -0.65,2.627 -0.896,3.982 h 6.2 5.279 47.035 6.662 4.761 c -0.245,-1.355 -0.562,-2.686 -0.957,-3.982" />
-
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path73"
-   d="m 272.739,388.133 h -6.661 -47.035 -5.027 -6.642 c 0.239,1.354 0.51,2.685 0.899,3.981 h 12.222 44.129 7.244 4.719 c 0.389,-1.297 0.701,-2.627 0.941,-3.981 z" />
-
-</g>
+          <path
+             style="fill:#ffffff;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path69"
+             d="m 214.679,383.845 h 3.552 48.51 6.373 4.841 c 0.034,-0.633 0.053,-1.271 0.053,-1.913 0,-0.694 -0.025,-1.383 -0.064,-2.068 h -4.829 -6.373 -48.51 -3.802 -7.517 c -0.039,0.686 -0.064,1.374 -0.064,2.068 0,0.643 0.019,1.28 0.052,1.913 z" />
+          <path
+             style="fill:#ffffff;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path71"
+             d="m 220.308,371.594 h -12.037 c -0.396,1.297 -0.65,2.627 -0.896,3.982 h 6.2 5.279 47.035 6.662 4.761 c -0.245,-1.355 -0.562,-2.686 -0.957,-3.982" />
+          <path
+             style="fill:#ffffff;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path73"
+             d="m 272.739,388.133 h -6.661 -47.035 -5.027 -6.642 c 0.239,1.354 0.51,2.685 0.899,3.981 h 12.222 44.129 7.244 4.719 c 0.389,-1.297 0.701,-2.627 0.941,-3.981 z" />
+        </g>
       </g>
     </g>
   </g>
diff --git a/packages/org.eclipse.epp.package.javascript/eclipse32@2x.png b/packages/org.eclipse.epp.package.javascript/eclipse32@2x.png
index d44f785..3307f99 100644
--- a/packages/org.eclipse.epp.package.javascript/eclipse32@2x.png
+++ b/packages/org.eclipse.epp.package.javascript/eclipse32@2x.png
Binary files differ
diff --git a/packages/org.eclipse.epp.package.javascript/eclipse48.png b/packages/org.eclipse.epp.package.javascript/eclipse48.png
index bff9aef..de9928f 100644
--- a/packages/org.eclipse.epp.package.javascript/eclipse48.png
+++ b/packages/org.eclipse.epp.package.javascript/eclipse48.png
Binary files differ
diff --git a/packages/org.eclipse.epp.package.javascript/eclipse48.svg b/packages/org.eclipse.epp.package.javascript/eclipse48.svg
index 099b7d2..80513d7 100644
--- a/packages/org.eclipse.epp.package.javascript/eclipse48.svg
+++ b/packages/org.eclipse.epp.package.javascript/eclipse48.svg
@@ -7,13 +7,16 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:version="1.0rc1 (09960d6, 2020-04-09)"
-   sodipodi:docname="eclipse48.svg"
-   viewBox="0 0 48 48"
-   height="48"
-   width="48"
+   inkscape:export-ydpi="192"
+   inkscape:export-xdpi="192"
+   inkscape:export-filename="/Users/d021678/git/org.eclipse.epp.packages/packages/org.eclipse.epp.package.java/eclipse48@2x.png"
+   version="1.1"
    id="svg1412"
-   version="1.1">
+   width="48"
+   height="48"
+   viewBox="0 0 48 48"
+   sodipodi:docname="eclipse48.svg"
+   inkscape:version="1.0rc1 (09960d6, 2020-04-09)">
   <metadata
      id="metadata1418">
     <rdf:RDF>
@@ -28,226 +31,209 @@
   <defs
      id="defs1416">
     <linearGradient
-       y2="368.73721"
-       x2="242.4575"
+       id="linearGradient3462"
+       gradientUnits="userSpaceOnUse"
+       x1="242.4575"
        y1="422.2832"
-       x1="242.4575"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3462">
-      <stop
-         id="stop46-2"
-         style="stop-color:#473788"
-         offset="0.3033" />
-      <stop
-         id="stop48-6"
-         style="stop-color:#2C2255"
-         offset="0.872" />
-    </linearGradient>
-    <linearGradient
-       y2="368.7338"
        x2="242.4575"
-       y1="422.29199"
-       x1="242.4575"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3466">
+       y2="368.73721">
       <stop
-         id="stop53-6"
+         offset="0.3033"
          style="stop-color:#473788"
-         offset="0.3033" />
+         id="stop46-2" />
       <stop
-         id="stop55-8"
+         offset="0.872"
          style="stop-color:#2C2255"
-         offset="0.872" />
+         id="stop48-6" />
     </linearGradient>
     <linearGradient
-       y2="368.73639"
-       x2="242.45799"
-       y1="422.2861"
-       x1="242.45799"
+       id="linearGradient3466"
        gradientUnits="userSpaceOnUse"
-       id="linearGradient3470">
+       x1="242.4575"
+       y1="422.29199"
+       x2="242.4575"
+       y2="368.7338">
       <stop
-         id="stop60-3"
+         offset="0.3033"
          style="stop-color:#473788"
-         offset="0.3033" />
+         id="stop53-6" />
       <stop
-         id="stop62-4"
+         offset="0.872"
          style="stop-color:#2C2255"
-         offset="0.8631" />
+         id="stop55-8" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3470"
+       gradientUnits="userSpaceOnUse"
+       x1="242.45799"
+       y1="422.2861"
+       x2="242.45799"
+       y2="368.73639">
+      <stop
+         offset="0.3033"
+         style="stop-color:#473788"
+         id="stop60-3" />
+      <stop
+         offset="0.8631"
+         style="stop-color:#2C2255"
+         id="stop62-4" />
     </linearGradient>
   </defs>
   <sodipodi:namedview
-     inkscape:current-layer="g1420"
-     inkscape:window-maximized="0"
-     inkscape:window-y="23"
-     inkscape:window-x="0"
-     inkscape:cy="24"
-     inkscape:cx="-3.1764706"
-     inkscape:zoom="5.6666667"
-     showgrid="false"
-     id="namedview1414"
-     inkscape:window-height="910"
-     inkscape:window-width="1310"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     guidetolerance="10"
-     gridtolerance="10"
-     objecttolerance="10"
-     borderopacity="1"
+     inkscape:document-rotation="0"
+     pagecolor="#ffffff"
      bordercolor="#666666"
-     pagecolor="#ffffff" />
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1416"
+     inkscape:window-height="1035"
+     id="namedview1414"
+     showgrid="false"
+     inkscape:zoom="5.6666667"
+     inkscape:cx="-3.1764706"
+     inkscape:cy="24"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g1420" />
   <g
-     id="g1420"
+     inkscape:groupmode="layer"
      inkscape:label="Image"
-     inkscape:groupmode="layer">
+     id="g1420">
     <g
-       transform="matrix(0.99893516,0,0,0.99893516,47.95795,3.4517308)"
-       id="g2207">
+       id="g2207"
+       transform="matrix(0.99893516,0,0,0.99893516,47.95795,3.4517308)">
       <g
-         id="g139"
+         style="stroke-width:0.983117"
          transform="matrix(1.0678037,0,0,1.0572816,-79.316579,-1.6972965)"
-         style="stroke-width:0.983117">
+         id="g139">
         <path
-           style="fill:#2c2255;stroke-width:0.983117"
-           inkscape:connector-curvature="0"
+           d="m 41.680839,26.851877 h -6.90011 c 0.91344,3.13415 2.60886,5.94303 5.09022,8.42496 3.95636,3.95636 8.71509,5.93397 14.27903,5.93397 1.11234,0 2.18954,-0.0827 3.23671,-0.24083 4.19039,-0.63295 7.86002,-2.52726 11.00323,-5.69314 2.49836,-2.48193 4.20568,-5.29081 5.12649,-8.42496 h -2.79982 -4.09462 z"
            id="path32"
-           d="m 41.680839,26.851877 h -6.90011 c 0.91344,3.13415 2.60886,5.94303 5.09022,8.42496 3.95636,3.95636 8.71509,5.93397 14.27903,5.93397 1.11234,0 2.18954,-0.0827 3.23671,-0.24083 4.19039,-0.63295 7.86002,-2.52726 11.00323,-5.69314 2.49836,-2.48193 4.20568,-5.29081 5.12649,-8.42496 h -2.79982 -4.09462 z" />
-        <g
-           style="stroke-width:1.73496"
-           transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
-           id="g38">
-	<path
-   style="fill:#2c2255;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path34"
-   d="m 213.736,375.576 h -6.361 c -0.233,1.397 -0.391,2.824 -0.463,4.287 h 7.561 3.792 54.741 4.998 c -0.073,-1.463 -0.232,-2.89 -0.467,-4.287" />
-
-	<path
-   style="fill:#2c2255;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path36"
-   d="m 206.912,383.845 c 0.072,1.464 0.23,2.891 0.463,4.288 h 6.613 5.012 53.558 4.979 c 0.234,-1.397 0.395,-2.824 0.467,-4.288" />
-
-</g>
-        <path
-           style="fill:#2c2255;stroke-width:0.983117"
            inkscape:connector-curvature="0"
+           style="fill:#2c2255;stroke-width:0.983117" />
+        <g
+           id="g38"
+           transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
+           style="stroke-width:1.73496">
+          <path
+             d="m 213.736,375.576 h -6.361 c -0.233,1.397 -0.391,2.824 -0.463,4.287 h 7.561 3.792 54.741 4.998 c -0.073,-1.463 -0.232,-2.89 -0.467,-4.287"
+             id="path34"
+             inkscape:connector-curvature="0"
+             style="fill:#2c2255;stroke-width:3.06178" />
+          <path
+             d="m 206.912,383.845 c 0.072,1.464 0.23,2.891 0.463,4.288 h 6.613 5.012 53.558 4.979 c 0.234,-1.397 0.395,-2.824 0.467,-4.288"
+             id="path36"
+             inkscape:connector-curvature="0"
+             style="fill:#2c2255;stroke-width:3.06178" />
+        </g>
+        <path
+           d="m 73.517539,15.224207 c -0.92024,-3.14265 -2.62813,-5.9639998 -5.12762,-8.4640598 -3.13528,-3.13585 -6.79414,-5.01713 -10.97093,-5.65008 -1.0568,-0.16035995 -2.14477,-0.24421995 -3.26901,-0.24421995 -5.56394,0 -10.3221,1.96513995 -14.27903,5.89429995 -2.48306,2.49949 -4.17905,5.3214098 -5.09192,8.4640598 z"
            id="path40"
-           d="m 73.517539,15.224207 c -0.92024,-3.14265 -2.62813,-5.9639998 -5.12762,-8.4640598 -3.13528,-3.13585 -6.79414,-5.01713 -10.97093,-5.65008 -1.0568,-0.16035995 -2.14477,-0.24421995 -3.26901,-0.24421995 -5.56394,0 -10.3221,1.96513995 -14.27903,5.89429995 -2.48306,2.49949 -4.17905,5.3214098 -5.09192,8.4640598 z" />
+           inkscape:connector-curvature="0"
+           style="fill:#2c2255;stroke-width:0.983117" />
         <g
-           style="stroke-width:1.73496"
+           id="g44"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
-           id="g44">
-	<path
-   style="fill:#f7941e;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path42"
-   d="m 204.797,381.855 c 0,-18.78 14.104,-34.384 32.453,-37.128 -0.455,-0.017 -0.913,-0.035 -1.372,-0.035 -20.591,0 -37.284,16.639 -37.284,37.163 0,20.524 16.693,37.163 37.284,37.163 0.461,0 0.918,-0.019 1.375,-0.034 -18.351,-2.744 -32.456,-18.348 -32.456,-37.129 z" />
-
-</g>
+           style="stroke-width:1.73496">
+          <path
+             d="m 204.797,381.855 c 0,-18.78 14.104,-34.384 32.453,-37.128 -0.455,-0.017 -0.913,-0.035 -1.372,-0.035 -20.591,0 -37.284,16.639 -37.284,37.163 0,20.524 16.693,37.163 37.284,37.163 0.461,0 0.918,-0.019 1.375,-0.034 -18.351,-2.744 -32.456,-18.348 -32.456,-37.129 z"
+             id="path42"
+             inkscape:connector-curvature="0"
+             style="fill:#f7941e;stroke-width:3.06178" />
+        </g>
         <g
-           style="stroke-width:1.73496"
+           id="g67"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
-           id="g67">
-	<linearGradient
-   y2="368.73721"
-   x2="242.4575"
-   y1="422.2832"
-   x1="242.4575"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_1_">
-		<stop
-   id="stop46"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop48"
-   style="stop-color:#2C2255"
-   offset="0.872" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_1_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path51"
-   d="m 266.65,379.863 c -0.119,-1.47 -0.366,-2.903 -0.736,-4.287 h -46.913 c -0.37,1.384 -0.617,2.817 -0.737,4.287 z" />
-
-	<linearGradient
-   y2="368.7338"
-   x2="242.4575"
-   y1="422.29199"
-   x1="242.4575"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_2_">
-		<stop
-   id="stop53"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop55"
-   style="stop-color:#2C2255"
-   offset="0.872" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_2_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path58"
-   d="m 266.65,383.845 h -48.386 c 0.12,1.471 0.366,2.903 0.736,4.288 h 46.914 c 0.371,-1.385 0.617,-2.818 0.736,-4.288 z" />
-
-	<linearGradient
-   y2="368.73639"
-   x2="242.45799"
-   y1="422.2861"
-   x1="242.45799"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_3_">
-		<stop
-   id="stop60"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop62"
-   style="stop-color:#2C2255"
-   offset="0.8631" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_3_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path65"
-   d="m 242.458,406.137 c 9.742,0 18.14,-5.74 22.008,-14.022 H 220.45 c 3.867,8.281 12.265,14.022 22.008,14.022 z" />
-
-</g>
+           style="stroke-width:1.73496">
+          <linearGradient
+             id="SVGID_1_"
+             gradientUnits="userSpaceOnUse"
+             x1="242.4575"
+             y1="422.2832"
+             x2="242.4575"
+             y2="368.73721">
+            <stop
+               offset="0.3033"
+               style="stop-color:#473788"
+               id="stop46" />
+            <stop
+               offset="0.872"
+               style="stop-color:#2C2255"
+               id="stop48" />
+          </linearGradient>
+          <path
+             d="m 266.65,379.863 c -0.119,-1.47 -0.366,-2.903 -0.736,-4.287 h -46.913 c -0.37,1.384 -0.617,2.817 -0.737,4.287 z"
+             id="path51"
+             inkscape:connector-curvature="0"
+             style="fill:url(#SVGID_1_);stroke-width:3.06178" />
+          <linearGradient
+             id="SVGID_2_"
+             gradientUnits="userSpaceOnUse"
+             x1="242.4575"
+             y1="422.29199"
+             x2="242.4575"
+             y2="368.7338">
+            <stop
+               offset="0.3033"
+               style="stop-color:#473788"
+               id="stop53" />
+            <stop
+               offset="0.872"
+               style="stop-color:#2C2255"
+               id="stop55" />
+          </linearGradient>
+          <path
+             d="m 266.65,383.845 h -48.386 c 0.12,1.471 0.366,2.903 0.736,4.288 h 46.914 c 0.371,-1.385 0.617,-2.818 0.736,-4.288 z"
+             id="path58"
+             inkscape:connector-curvature="0"
+             style="fill:url(#SVGID_2_);stroke-width:3.06178" />
+          <linearGradient
+             id="SVGID_3_"
+             gradientUnits="userSpaceOnUse"
+             x1="242.45799"
+             y1="422.2861"
+             x2="242.45799"
+             y2="368.73639">
+            <stop
+               offset="0.3033"
+               style="stop-color:#473788"
+               id="stop60" />
+            <stop
+               offset="0.8631"
+               style="stop-color:#2C2255"
+               id="stop62" />
+          </linearGradient>
+          <path
+             d="m 242.458,406.137 c 9.742,0 18.14,-5.74 22.008,-14.022 H 220.45 c 3.867,8.281 12.265,14.022 22.008,14.022 z"
+             id="path65"
+             inkscape:connector-curvature="0"
+             style="fill:url(#SVGID_3_);stroke-width:3.06178" />
+        </g>
         <g
-           style="stroke-width:1.73496"
+           id="g75"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
-           id="g75">
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path69"
-   d="m 214.679,383.845 h 3.552 48.51 6.373 4.841 c 0.034,-0.633 0.053,-1.271 0.053,-1.913 0,-0.694 -0.025,-1.383 -0.064,-2.068 h -4.829 -6.373 -48.51 -3.802 -7.517 c -0.039,0.686 -0.064,1.374 -0.064,2.068 0,0.643 0.019,1.28 0.052,1.913 z" />
-
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path71"
-   d="m 220.308,371.594 h -12.037 c -0.396,1.297 -0.65,2.627 -0.896,3.982 h 6.2 5.279 47.035 6.662 4.761 c -0.245,-1.355 -0.562,-2.686 -0.957,-3.982" />
-
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path73"
-   d="m 272.739,388.133 h -6.661 -47.035 -5.027 -6.642 c 0.239,1.354 0.51,2.685 0.899,3.981 h 12.222 44.129 7.244 4.719 c 0.389,-1.297 0.701,-2.627 0.941,-3.981 z" />
-
-</g>
+           style="stroke-width:1.73496">
+          <path
+             d="m 214.679,383.845 h 3.552 48.51 6.373 4.841 c 0.034,-0.633 0.053,-1.271 0.053,-1.913 0,-0.694 -0.025,-1.383 -0.064,-2.068 h -4.829 -6.373 -48.51 -3.802 -7.517 c -0.039,0.686 -0.064,1.374 -0.064,2.068 0,0.643 0.019,1.28 0.052,1.913 z"
+             id="path69"
+             inkscape:connector-curvature="0"
+             style="fill:#ffffff;stroke-width:3.06178" />
+          <path
+             d="m 220.308,371.594 h -12.037 c -0.396,1.297 -0.65,2.627 -0.896,3.982 h 6.2 5.279 47.035 6.662 4.761 c -0.245,-1.355 -0.562,-2.686 -0.957,-3.982"
+             id="path71"
+             inkscape:connector-curvature="0"
+             style="fill:#ffffff;stroke-width:3.06178" />
+          <path
+             d="m 272.739,388.133 h -6.661 -47.035 -5.027 -6.642 c 0.239,1.354 0.51,2.685 0.899,3.981 h 12.222 44.129 7.244 4.719 c 0.389,-1.297 0.701,-2.627 0.941,-3.981 z"
+             id="path73"
+             inkscape:connector-curvature="0"
+             style="fill:#ffffff;stroke-width:3.06178" />
+        </g>
       </g>
     </g>
   </g>
diff --git a/packages/org.eclipse.epp.package.javascript/eclipse48@2x.png b/packages/org.eclipse.epp.package.javascript/eclipse48@2x.png
index 3b8d1cc..bff9aef 100644
--- a/packages/org.eclipse.epp.package.javascript/eclipse48@2x.png
+++ b/packages/org.eclipse.epp.package.javascript/eclipse48@2x.png
Binary files differ
diff --git a/packages/org.eclipse.epp.package.modeling/eclipse32.png b/packages/org.eclipse.epp.package.modeling/eclipse32.png
index 55d401d..eae69ee 100644
--- a/packages/org.eclipse.epp.package.modeling/eclipse32.png
+++ b/packages/org.eclipse.epp.package.modeling/eclipse32.png
Binary files differ
diff --git a/packages/org.eclipse.epp.package.modeling/eclipse32.svg b/packages/org.eclipse.epp.package.modeling/eclipse32.svg
index e412ab4..ccc3e5e 100644
--- a/packages/org.eclipse.epp.package.modeling/eclipse32.svg
+++ b/packages/org.eclipse.epp.package.modeling/eclipse32.svg
@@ -7,9 +7,9 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:export-ydpi="384"
-   inkscape:export-xdpi="384"
-   inkscape:export-filename="/Users/d021678/git/org.eclipse.epp.packages/packages/org.eclipse.epp.package.modeling/eclipse32_2x.png"
+   inkscape:export-ydpi="96"
+   inkscape:export-xdpi="96"
+   inkscape:export-filename="/Users/d021678/git/org.eclipse.epp.packages/packages/org.eclipse.epp.package.java/eclipse32.png"
    inkscape:version="1.0rc1 (09960d6, 2020-04-09)"
    sodipodi:docname="eclipse32.svg"
    viewBox="0 0 32 32"
@@ -85,13 +85,13 @@
      inkscape:window-maximized="0"
      inkscape:window-y="23"
      inkscape:window-x="0"
-     inkscape:cy="7.0588235"
-     inkscape:cx="-2.1176471"
-     inkscape:zoom="8.5"
-     showgrid="false"
+     inkscape:cy="16"
+     inkscape:cx="16"
+     inkscape:zoom="25.84375"
+     showgrid="true"
      id="namedview2261"
-     inkscape:window-height="954"
-     inkscape:window-width="1305"
+     inkscape:window-height="1035"
+     inkscape:window-width="1486"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0"
      guidetolerance="10"
@@ -99,13 +99,16 @@
      objecttolerance="10"
      borderopacity="1"
      bordercolor="#666666"
-     pagecolor="#ffffff" />
+     pagecolor="#ffffff"
+     inkscape:document-rotation="0"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true" />
   <g
      id="g2267"
      inkscape:label="Image"
      inkscape:groupmode="layer">
     <g
-       transform="matrix(0.69565218,0,0,0.69565218,26.95397,22.85109)"
+       transform="matrix(0.69565218,0,0,0.69565218,26.95397,22.264755)"
        id="g3036">
       <g
          id="g139"
@@ -120,19 +123,17 @@
            style="stroke-width:1.73496"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
            id="g38">
-	<path
-   style="fill:#2c2255;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path34"
-   d="m 213.736,375.576 h -6.361 c -0.233,1.397 -0.391,2.824 -0.463,4.287 h 7.561 3.792 54.741 4.998 c -0.073,-1.463 -0.232,-2.89 -0.467,-4.287" />
-
-	<path
-   style="fill:#2c2255;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path36"
-   d="m 206.912,383.845 c 0.072,1.464 0.23,2.891 0.463,4.288 h 6.613 5.012 53.558 4.979 c 0.234,-1.397 0.395,-2.824 0.467,-4.288" />
-
-</g>
+          <path
+             style="fill:#2c2255;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path34"
+             d="m 213.736,375.576 h -6.361 c -0.233,1.397 -0.391,2.824 -0.463,4.287 h 7.561 3.792 54.741 4.998 c -0.073,-1.463 -0.232,-2.89 -0.467,-4.287" />
+          <path
+             style="fill:#2c2255;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path36"
+             d="m 206.912,383.845 c 0.072,1.464 0.23,2.891 0.463,4.288 h 6.613 5.012 53.558 4.979 c 0.234,-1.397 0.395,-2.824 0.467,-4.288" />
+        </g>
         <path
            style="fill:#2c2255;stroke-width:0.983117"
            inkscape:connector-curvature="0"
@@ -142,116 +143,100 @@
            style="stroke-width:1.73496"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
            id="g44">
-	<path
-   style="fill:#f7941e;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path42"
-   d="m 204.797,381.855 c 0,-18.78 14.104,-34.384 32.453,-37.128 -0.455,-0.017 -0.913,-0.035 -1.372,-0.035 -20.591,0 -37.284,16.639 -37.284,37.163 0,20.524 16.693,37.163 37.284,37.163 0.461,0 0.918,-0.019 1.375,-0.034 -18.351,-2.744 -32.456,-18.348 -32.456,-37.129 z" />
-
-</g>
+          <path
+             style="fill:#f7941e;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path42"
+             d="m 204.797,381.855 c 0,-18.78 14.104,-34.384 32.453,-37.128 -0.455,-0.017 -0.913,-0.035 -1.372,-0.035 -20.591,0 -37.284,16.639 -37.284,37.163 0,20.524 16.693,37.163 37.284,37.163 0.461,0 0.918,-0.019 1.375,-0.034 -18.351,-2.744 -32.456,-18.348 -32.456,-37.129 z" />
+        </g>
         <g
            style="stroke-width:1.73496"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
            id="g67">
-	<linearGradient
-   y2="368.73721"
-   x2="242.4575"
-   y1="422.2832"
-   x1="242.4575"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_1_">
-		<stop
-   id="stop46"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop48"
-   style="stop-color:#2C2255"
-   offset="0.872" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_1_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path51"
-   d="m 266.65,379.863 c -0.119,-1.47 -0.366,-2.903 -0.736,-4.287 h -46.913 c -0.37,1.384 -0.617,2.817 -0.737,4.287 z" />
-
-	<linearGradient
-   y2="368.7338"
-   x2="242.4575"
-   y1="422.29199"
-   x1="242.4575"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_2_">
-		<stop
-   id="stop53"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop55"
-   style="stop-color:#2C2255"
-   offset="0.872" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_2_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path58"
-   d="m 266.65,383.845 h -48.386 c 0.12,1.471 0.366,2.903 0.736,4.288 h 46.914 c 0.371,-1.385 0.617,-2.818 0.736,-4.288 z" />
-
-	<linearGradient
-   y2="368.73639"
-   x2="242.45799"
-   y1="422.2861"
-   x1="242.45799"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_3_">
-		<stop
-   id="stop60"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop62"
-   style="stop-color:#2C2255"
-   offset="0.8631" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_3_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path65"
-   d="m 242.458,406.137 c 9.742,0 18.14,-5.74 22.008,-14.022 H 220.45 c 3.867,8.281 12.265,14.022 22.008,14.022 z" />
-
-</g>
+          <linearGradient
+             y2="368.73721"
+             x2="242.4575"
+             y1="422.2832"
+             x1="242.4575"
+             gradientUnits="userSpaceOnUse"
+             id="SVGID_1_">
+            <stop
+               id="stop46"
+               style="stop-color:#473788"
+               offset="0.3033" />
+            <stop
+               id="stop48"
+               style="stop-color:#2C2255"
+               offset="0.872" />
+          </linearGradient>
+          <path
+             style="fill:url(#SVGID_1_);stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path51"
+             d="m 266.65,379.863 c -0.119,-1.47 -0.366,-2.903 -0.736,-4.287 h -46.913 c -0.37,1.384 -0.617,2.817 -0.737,4.287 z" />
+          <linearGradient
+             y2="368.7338"
+             x2="242.4575"
+             y1="422.29199"
+             x1="242.4575"
+             gradientUnits="userSpaceOnUse"
+             id="SVGID_2_">
+            <stop
+               id="stop53"
+               style="stop-color:#473788"
+               offset="0.3033" />
+            <stop
+               id="stop55"
+               style="stop-color:#2C2255"
+               offset="0.872" />
+          </linearGradient>
+          <path
+             style="fill:url(#SVGID_2_);stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path58"
+             d="m 266.65,383.845 h -48.386 c 0.12,1.471 0.366,2.903 0.736,4.288 h 46.914 c 0.371,-1.385 0.617,-2.818 0.736,-4.288 z" />
+          <linearGradient
+             y2="368.73639"
+             x2="242.45799"
+             y1="422.2861"
+             x1="242.45799"
+             gradientUnits="userSpaceOnUse"
+             id="SVGID_3_">
+            <stop
+               id="stop60"
+               style="stop-color:#473788"
+               offset="0.3033" />
+            <stop
+               id="stop62"
+               style="stop-color:#2C2255"
+               offset="0.8631" />
+          </linearGradient>
+          <path
+             style="fill:url(#SVGID_3_);stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path65"
+             d="m 242.458,406.137 c 9.742,0 18.14,-5.74 22.008,-14.022 H 220.45 c 3.867,8.281 12.265,14.022 22.008,14.022 z" />
+        </g>
         <g
            style="stroke-width:1.73496"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
            id="g75">
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path69"
-   d="m 214.679,383.845 h 3.552 48.51 6.373 4.841 c 0.034,-0.633 0.053,-1.271 0.053,-1.913 0,-0.694 -0.025,-1.383 -0.064,-2.068 h -4.829 -6.373 -48.51 -3.802 -7.517 c -0.039,0.686 -0.064,1.374 -0.064,2.068 0,0.643 0.019,1.28 0.052,1.913 z" />
-
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path71"
-   d="m 220.308,371.594 h -12.037 c -0.396,1.297 -0.65,2.627 -0.896,3.982 h 6.2 5.279 47.035 6.662 4.761 c -0.245,-1.355 -0.562,-2.686 -0.957,-3.982" />
-
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path73"
-   d="m 272.739,388.133 h -6.661 -47.035 -5.027 -6.642 c 0.239,1.354 0.51,2.685 0.899,3.981 h 12.222 44.129 7.244 4.719 c 0.389,-1.297 0.701,-2.627 0.941,-3.981 z" />
-
-</g>
+          <path
+             style="fill:#ffffff;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path69"
+             d="m 214.679,383.845 h 3.552 48.51 6.373 4.841 c 0.034,-0.633 0.053,-1.271 0.053,-1.913 0,-0.694 -0.025,-1.383 -0.064,-2.068 h -4.829 -6.373 -48.51 -3.802 -7.517 c -0.039,0.686 -0.064,1.374 -0.064,2.068 0,0.643 0.019,1.28 0.052,1.913 z" />
+          <path
+             style="fill:#ffffff;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path71"
+             d="m 220.308,371.594 h -12.037 c -0.396,1.297 -0.65,2.627 -0.896,3.982 h 6.2 5.279 47.035 6.662 4.761 c -0.245,-1.355 -0.562,-2.686 -0.957,-3.982" />
+          <path
+             style="fill:#ffffff;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path73"
+             d="m 272.739,388.133 h -6.661 -47.035 -5.027 -6.642 c 0.239,1.354 0.51,2.685 0.899,3.981 h 12.222 44.129 7.244 4.719 c 0.389,-1.297 0.701,-2.627 0.941,-3.981 z" />
+        </g>
       </g>
     </g>
   </g>
diff --git a/packages/org.eclipse.epp.package.modeling/eclipse32@2x.png b/packages/org.eclipse.epp.package.modeling/eclipse32@2x.png
index d44f785..3307f99 100644
--- a/packages/org.eclipse.epp.package.modeling/eclipse32@2x.png
+++ b/packages/org.eclipse.epp.package.modeling/eclipse32@2x.png
Binary files differ
diff --git a/packages/org.eclipse.epp.package.modeling/eclipse48.png b/packages/org.eclipse.epp.package.modeling/eclipse48.png
index bff9aef..de9928f 100644
--- a/packages/org.eclipse.epp.package.modeling/eclipse48.png
+++ b/packages/org.eclipse.epp.package.modeling/eclipse48.png
Binary files differ
diff --git a/packages/org.eclipse.epp.package.modeling/eclipse48.svg b/packages/org.eclipse.epp.package.modeling/eclipse48.svg
index 099b7d2..80513d7 100644
--- a/packages/org.eclipse.epp.package.modeling/eclipse48.svg
+++ b/packages/org.eclipse.epp.package.modeling/eclipse48.svg
@@ -7,13 +7,16 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:version="1.0rc1 (09960d6, 2020-04-09)"
-   sodipodi:docname="eclipse48.svg"
-   viewBox="0 0 48 48"
-   height="48"
-   width="48"
+   inkscape:export-ydpi="192"
+   inkscape:export-xdpi="192"
+   inkscape:export-filename="/Users/d021678/git/org.eclipse.epp.packages/packages/org.eclipse.epp.package.java/eclipse48@2x.png"
+   version="1.1"
    id="svg1412"
-   version="1.1">
+   width="48"
+   height="48"
+   viewBox="0 0 48 48"
+   sodipodi:docname="eclipse48.svg"
+   inkscape:version="1.0rc1 (09960d6, 2020-04-09)">
   <metadata
      id="metadata1418">
     <rdf:RDF>
@@ -28,226 +31,209 @@
   <defs
      id="defs1416">
     <linearGradient
-       y2="368.73721"
-       x2="242.4575"
+       id="linearGradient3462"
+       gradientUnits="userSpaceOnUse"
+       x1="242.4575"
        y1="422.2832"
-       x1="242.4575"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3462">
-      <stop
-         id="stop46-2"
-         style="stop-color:#473788"
-         offset="0.3033" />
-      <stop
-         id="stop48-6"
-         style="stop-color:#2C2255"
-         offset="0.872" />
-    </linearGradient>
-    <linearGradient
-       y2="368.7338"
        x2="242.4575"
-       y1="422.29199"
-       x1="242.4575"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3466">
+       y2="368.73721">
       <stop
-         id="stop53-6"
+         offset="0.3033"
          style="stop-color:#473788"
-         offset="0.3033" />
+         id="stop46-2" />
       <stop
-         id="stop55-8"
+         offset="0.872"
          style="stop-color:#2C2255"
-         offset="0.872" />
+         id="stop48-6" />
     </linearGradient>
     <linearGradient
-       y2="368.73639"
-       x2="242.45799"
-       y1="422.2861"
-       x1="242.45799"
+       id="linearGradient3466"
        gradientUnits="userSpaceOnUse"
-       id="linearGradient3470">
+       x1="242.4575"
+       y1="422.29199"
+       x2="242.4575"
+       y2="368.7338">
       <stop
-         id="stop60-3"
+         offset="0.3033"
          style="stop-color:#473788"
-         offset="0.3033" />
+         id="stop53-6" />
       <stop
-         id="stop62-4"
+         offset="0.872"
          style="stop-color:#2C2255"
-         offset="0.8631" />
+         id="stop55-8" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3470"
+       gradientUnits="userSpaceOnUse"
+       x1="242.45799"
+       y1="422.2861"
+       x2="242.45799"
+       y2="368.73639">
+      <stop
+         offset="0.3033"
+         style="stop-color:#473788"
+         id="stop60-3" />
+      <stop
+         offset="0.8631"
+         style="stop-color:#2C2255"
+         id="stop62-4" />
     </linearGradient>
   </defs>
   <sodipodi:namedview
-     inkscape:current-layer="g1420"
-     inkscape:window-maximized="0"
-     inkscape:window-y="23"
-     inkscape:window-x="0"
-     inkscape:cy="24"
-     inkscape:cx="-3.1764706"
-     inkscape:zoom="5.6666667"
-     showgrid="false"
-     id="namedview1414"
-     inkscape:window-height="910"
-     inkscape:window-width="1310"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     guidetolerance="10"
-     gridtolerance="10"
-     objecttolerance="10"
-     borderopacity="1"
+     inkscape:document-rotation="0"
+     pagecolor="#ffffff"
      bordercolor="#666666"
-     pagecolor="#ffffff" />
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1416"
+     inkscape:window-height="1035"
+     id="namedview1414"
+     showgrid="false"
+     inkscape:zoom="5.6666667"
+     inkscape:cx="-3.1764706"
+     inkscape:cy="24"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g1420" />
   <g
-     id="g1420"
+     inkscape:groupmode="layer"
      inkscape:label="Image"
-     inkscape:groupmode="layer">
+     id="g1420">
     <g
-       transform="matrix(0.99893516,0,0,0.99893516,47.95795,3.4517308)"
-       id="g2207">
+       id="g2207"
+       transform="matrix(0.99893516,0,0,0.99893516,47.95795,3.4517308)">
       <g
-         id="g139"
+         style="stroke-width:0.983117"
          transform="matrix(1.0678037,0,0,1.0572816,-79.316579,-1.6972965)"
-         style="stroke-width:0.983117">
+         id="g139">
         <path
-           style="fill:#2c2255;stroke-width:0.983117"
-           inkscape:connector-curvature="0"
+           d="m 41.680839,26.851877 h -6.90011 c 0.91344,3.13415 2.60886,5.94303 5.09022,8.42496 3.95636,3.95636 8.71509,5.93397 14.27903,5.93397 1.11234,0 2.18954,-0.0827 3.23671,-0.24083 4.19039,-0.63295 7.86002,-2.52726 11.00323,-5.69314 2.49836,-2.48193 4.20568,-5.29081 5.12649,-8.42496 h -2.79982 -4.09462 z"
            id="path32"
-           d="m 41.680839,26.851877 h -6.90011 c 0.91344,3.13415 2.60886,5.94303 5.09022,8.42496 3.95636,3.95636 8.71509,5.93397 14.27903,5.93397 1.11234,0 2.18954,-0.0827 3.23671,-0.24083 4.19039,-0.63295 7.86002,-2.52726 11.00323,-5.69314 2.49836,-2.48193 4.20568,-5.29081 5.12649,-8.42496 h -2.79982 -4.09462 z" />
-        <g
-           style="stroke-width:1.73496"
-           transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
-           id="g38">
-	<path
-   style="fill:#2c2255;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path34"
-   d="m 213.736,375.576 h -6.361 c -0.233,1.397 -0.391,2.824 -0.463,4.287 h 7.561 3.792 54.741 4.998 c -0.073,-1.463 -0.232,-2.89 -0.467,-4.287" />
-
-	<path
-   style="fill:#2c2255;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path36"
-   d="m 206.912,383.845 c 0.072,1.464 0.23,2.891 0.463,4.288 h 6.613 5.012 53.558 4.979 c 0.234,-1.397 0.395,-2.824 0.467,-4.288" />
-
-</g>
-        <path
-           style="fill:#2c2255;stroke-width:0.983117"
            inkscape:connector-curvature="0"
+           style="fill:#2c2255;stroke-width:0.983117" />
+        <g
+           id="g38"
+           transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
+           style="stroke-width:1.73496">
+          <path
+             d="m 213.736,375.576 h -6.361 c -0.233,1.397 -0.391,2.824 -0.463,4.287 h 7.561 3.792 54.741 4.998 c -0.073,-1.463 -0.232,-2.89 -0.467,-4.287"
+             id="path34"
+             inkscape:connector-curvature="0"
+             style="fill:#2c2255;stroke-width:3.06178" />
+          <path
+             d="m 206.912,383.845 c 0.072,1.464 0.23,2.891 0.463,4.288 h 6.613 5.012 53.558 4.979 c 0.234,-1.397 0.395,-2.824 0.467,-4.288"
+             id="path36"
+             inkscape:connector-curvature="0"
+             style="fill:#2c2255;stroke-width:3.06178" />
+        </g>
+        <path
+           d="m 73.517539,15.224207 c -0.92024,-3.14265 -2.62813,-5.9639998 -5.12762,-8.4640598 -3.13528,-3.13585 -6.79414,-5.01713 -10.97093,-5.65008 -1.0568,-0.16035995 -2.14477,-0.24421995 -3.26901,-0.24421995 -5.56394,0 -10.3221,1.96513995 -14.27903,5.89429995 -2.48306,2.49949 -4.17905,5.3214098 -5.09192,8.4640598 z"
            id="path40"
-           d="m 73.517539,15.224207 c -0.92024,-3.14265 -2.62813,-5.9639998 -5.12762,-8.4640598 -3.13528,-3.13585 -6.79414,-5.01713 -10.97093,-5.65008 -1.0568,-0.16035995 -2.14477,-0.24421995 -3.26901,-0.24421995 -5.56394,0 -10.3221,1.96513995 -14.27903,5.89429995 -2.48306,2.49949 -4.17905,5.3214098 -5.09192,8.4640598 z" />
+           inkscape:connector-curvature="0"
+           style="fill:#2c2255;stroke-width:0.983117" />
         <g
-           style="stroke-width:1.73496"
+           id="g44"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
-           id="g44">
-	<path
-   style="fill:#f7941e;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path42"
-   d="m 204.797,381.855 c 0,-18.78 14.104,-34.384 32.453,-37.128 -0.455,-0.017 -0.913,-0.035 -1.372,-0.035 -20.591,0 -37.284,16.639 -37.284,37.163 0,20.524 16.693,37.163 37.284,37.163 0.461,0 0.918,-0.019 1.375,-0.034 -18.351,-2.744 -32.456,-18.348 -32.456,-37.129 z" />
-
-</g>
+           style="stroke-width:1.73496">
+          <path
+             d="m 204.797,381.855 c 0,-18.78 14.104,-34.384 32.453,-37.128 -0.455,-0.017 -0.913,-0.035 -1.372,-0.035 -20.591,0 -37.284,16.639 -37.284,37.163 0,20.524 16.693,37.163 37.284,37.163 0.461,0 0.918,-0.019 1.375,-0.034 -18.351,-2.744 -32.456,-18.348 -32.456,-37.129 z"
+             id="path42"
+             inkscape:connector-curvature="0"
+             style="fill:#f7941e;stroke-width:3.06178" />
+        </g>
         <g
-           style="stroke-width:1.73496"
+           id="g67"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
-           id="g67">
-	<linearGradient
-   y2="368.73721"
-   x2="242.4575"
-   y1="422.2832"
-   x1="242.4575"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_1_">
-		<stop
-   id="stop46"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop48"
-   style="stop-color:#2C2255"
-   offset="0.872" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_1_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path51"
-   d="m 266.65,379.863 c -0.119,-1.47 -0.366,-2.903 -0.736,-4.287 h -46.913 c -0.37,1.384 -0.617,2.817 -0.737,4.287 z" />
-
-	<linearGradient
-   y2="368.7338"
-   x2="242.4575"
-   y1="422.29199"
-   x1="242.4575"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_2_">
-		<stop
-   id="stop53"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop55"
-   style="stop-color:#2C2255"
-   offset="0.872" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_2_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path58"
-   d="m 266.65,383.845 h -48.386 c 0.12,1.471 0.366,2.903 0.736,4.288 h 46.914 c 0.371,-1.385 0.617,-2.818 0.736,-4.288 z" />
-
-	<linearGradient
-   y2="368.73639"
-   x2="242.45799"
-   y1="422.2861"
-   x1="242.45799"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_3_">
-		<stop
-   id="stop60"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop62"
-   style="stop-color:#2C2255"
-   offset="0.8631" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_3_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path65"
-   d="m 242.458,406.137 c 9.742,0 18.14,-5.74 22.008,-14.022 H 220.45 c 3.867,8.281 12.265,14.022 22.008,14.022 z" />
-
-</g>
+           style="stroke-width:1.73496">
+          <linearGradient
+             id="SVGID_1_"
+             gradientUnits="userSpaceOnUse"
+             x1="242.4575"
+             y1="422.2832"
+             x2="242.4575"
+             y2="368.73721">
+            <stop
+               offset="0.3033"
+               style="stop-color:#473788"
+               id="stop46" />
+            <stop
+               offset="0.872"
+               style="stop-color:#2C2255"
+               id="stop48" />
+          </linearGradient>
+          <path
+             d="m 266.65,379.863 c -0.119,-1.47 -0.366,-2.903 -0.736,-4.287 h -46.913 c -0.37,1.384 -0.617,2.817 -0.737,4.287 z"
+             id="path51"
+             inkscape:connector-curvature="0"
+             style="fill:url(#SVGID_1_);stroke-width:3.06178" />
+          <linearGradient
+             id="SVGID_2_"
+             gradientUnits="userSpaceOnUse"
+             x1="242.4575"
+             y1="422.29199"
+             x2="242.4575"
+             y2="368.7338">
+            <stop
+               offset="0.3033"
+               style="stop-color:#473788"
+               id="stop53" />
+            <stop
+               offset="0.872"
+               style="stop-color:#2C2255"
+               id="stop55" />
+          </linearGradient>
+          <path
+             d="m 266.65,383.845 h -48.386 c 0.12,1.471 0.366,2.903 0.736,4.288 h 46.914 c 0.371,-1.385 0.617,-2.818 0.736,-4.288 z"
+             id="path58"
+             inkscape:connector-curvature="0"
+             style="fill:url(#SVGID_2_);stroke-width:3.06178" />
+          <linearGradient
+             id="SVGID_3_"
+             gradientUnits="userSpaceOnUse"
+             x1="242.45799"
+             y1="422.2861"
+             x2="242.45799"
+             y2="368.73639">
+            <stop
+               offset="0.3033"
+               style="stop-color:#473788"
+               id="stop60" />
+            <stop
+               offset="0.8631"
+               style="stop-color:#2C2255"
+               id="stop62" />
+          </linearGradient>
+          <path
+             d="m 242.458,406.137 c 9.742,0 18.14,-5.74 22.008,-14.022 H 220.45 c 3.867,8.281 12.265,14.022 22.008,14.022 z"
+             id="path65"
+             inkscape:connector-curvature="0"
+             style="fill:url(#SVGID_3_);stroke-width:3.06178" />
+        </g>
         <g
-           style="stroke-width:1.73496"
+           id="g75"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
-           id="g75">
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path69"
-   d="m 214.679,383.845 h 3.552 48.51 6.373 4.841 c 0.034,-0.633 0.053,-1.271 0.053,-1.913 0,-0.694 -0.025,-1.383 -0.064,-2.068 h -4.829 -6.373 -48.51 -3.802 -7.517 c -0.039,0.686 -0.064,1.374 -0.064,2.068 0,0.643 0.019,1.28 0.052,1.913 z" />
-
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path71"
-   d="m 220.308,371.594 h -12.037 c -0.396,1.297 -0.65,2.627 -0.896,3.982 h 6.2 5.279 47.035 6.662 4.761 c -0.245,-1.355 -0.562,-2.686 -0.957,-3.982" />
-
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path73"
-   d="m 272.739,388.133 h -6.661 -47.035 -5.027 -6.642 c 0.239,1.354 0.51,2.685 0.899,3.981 h 12.222 44.129 7.244 4.719 c 0.389,-1.297 0.701,-2.627 0.941,-3.981 z" />
-
-</g>
+           style="stroke-width:1.73496">
+          <path
+             d="m 214.679,383.845 h 3.552 48.51 6.373 4.841 c 0.034,-0.633 0.053,-1.271 0.053,-1.913 0,-0.694 -0.025,-1.383 -0.064,-2.068 h -4.829 -6.373 -48.51 -3.802 -7.517 c -0.039,0.686 -0.064,1.374 -0.064,2.068 0,0.643 0.019,1.28 0.052,1.913 z"
+             id="path69"
+             inkscape:connector-curvature="0"
+             style="fill:#ffffff;stroke-width:3.06178" />
+          <path
+             d="m 220.308,371.594 h -12.037 c -0.396,1.297 -0.65,2.627 -0.896,3.982 h 6.2 5.279 47.035 6.662 4.761 c -0.245,-1.355 -0.562,-2.686 -0.957,-3.982"
+             id="path71"
+             inkscape:connector-curvature="0"
+             style="fill:#ffffff;stroke-width:3.06178" />
+          <path
+             d="m 272.739,388.133 h -6.661 -47.035 -5.027 -6.642 c 0.239,1.354 0.51,2.685 0.899,3.981 h 12.222 44.129 7.244 4.719 c 0.389,-1.297 0.701,-2.627 0.941,-3.981 z"
+             id="path73"
+             inkscape:connector-curvature="0"
+             style="fill:#ffffff;stroke-width:3.06178" />
+        </g>
       </g>
     </g>
   </g>
diff --git a/packages/org.eclipse.epp.package.modeling/eclipse48@2x.png b/packages/org.eclipse.epp.package.modeling/eclipse48@2x.png
index 3b8d1cc..bff9aef 100644
--- a/packages/org.eclipse.epp.package.modeling/eclipse48@2x.png
+++ b/packages/org.eclipse.epp.package.modeling/eclipse48@2x.png
Binary files differ
diff --git a/packages/org.eclipse.epp.package.parallel/eclipse32.png b/packages/org.eclipse.epp.package.parallel/eclipse32.png
index 55d401d..eae69ee 100644
--- a/packages/org.eclipse.epp.package.parallel/eclipse32.png
+++ b/packages/org.eclipse.epp.package.parallel/eclipse32.png
Binary files differ
diff --git a/packages/org.eclipse.epp.package.parallel/eclipse32.svg b/packages/org.eclipse.epp.package.parallel/eclipse32.svg
index 51962c6..ccc3e5e 100644
--- a/packages/org.eclipse.epp.package.parallel/eclipse32.svg
+++ b/packages/org.eclipse.epp.package.parallel/eclipse32.svg
@@ -7,9 +7,9 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:export-ydpi="384"
-   inkscape:export-xdpi="384"
-   inkscape:export-filename="/Users/d021678/git/org.eclipse.epp.packages/packages/org.eclipse.epp.package.parallel/eclipse32_2x.png"
+   inkscape:export-ydpi="96"
+   inkscape:export-xdpi="96"
+   inkscape:export-filename="/Users/d021678/git/org.eclipse.epp.packages/packages/org.eclipse.epp.package.java/eclipse32.png"
    inkscape:version="1.0rc1 (09960d6, 2020-04-09)"
    sodipodi:docname="eclipse32.svg"
    viewBox="0 0 32 32"
@@ -85,13 +85,13 @@
      inkscape:window-maximized="0"
      inkscape:window-y="23"
      inkscape:window-x="0"
-     inkscape:cy="7.0588235"
-     inkscape:cx="-2.1176471"
-     inkscape:zoom="8.5"
-     showgrid="false"
+     inkscape:cy="16"
+     inkscape:cx="16"
+     inkscape:zoom="25.84375"
+     showgrid="true"
      id="namedview2261"
-     inkscape:window-height="954"
-     inkscape:window-width="1305"
+     inkscape:window-height="1035"
+     inkscape:window-width="1486"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0"
      guidetolerance="10"
@@ -99,13 +99,16 @@
      objecttolerance="10"
      borderopacity="1"
      bordercolor="#666666"
-     pagecolor="#ffffff" />
+     pagecolor="#ffffff"
+     inkscape:document-rotation="0"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true" />
   <g
      id="g2267"
      inkscape:label="Image"
      inkscape:groupmode="layer">
     <g
-       transform="matrix(0.69565218,0,0,0.69565218,26.95397,22.85109)"
+       transform="matrix(0.69565218,0,0,0.69565218,26.95397,22.264755)"
        id="g3036">
       <g
          id="g139"
@@ -120,19 +123,17 @@
            style="stroke-width:1.73496"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
            id="g38">
-	<path
-   style="fill:#2c2255;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path34"
-   d="m 213.736,375.576 h -6.361 c -0.233,1.397 -0.391,2.824 -0.463,4.287 h 7.561 3.792 54.741 4.998 c -0.073,-1.463 -0.232,-2.89 -0.467,-4.287" />
-
-	<path
-   style="fill:#2c2255;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path36"
-   d="m 206.912,383.845 c 0.072,1.464 0.23,2.891 0.463,4.288 h 6.613 5.012 53.558 4.979 c 0.234,-1.397 0.395,-2.824 0.467,-4.288" />
-
-</g>
+          <path
+             style="fill:#2c2255;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path34"
+             d="m 213.736,375.576 h -6.361 c -0.233,1.397 -0.391,2.824 -0.463,4.287 h 7.561 3.792 54.741 4.998 c -0.073,-1.463 -0.232,-2.89 -0.467,-4.287" />
+          <path
+             style="fill:#2c2255;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path36"
+             d="m 206.912,383.845 c 0.072,1.464 0.23,2.891 0.463,4.288 h 6.613 5.012 53.558 4.979 c 0.234,-1.397 0.395,-2.824 0.467,-4.288" />
+        </g>
         <path
            style="fill:#2c2255;stroke-width:0.983117"
            inkscape:connector-curvature="0"
@@ -142,116 +143,100 @@
            style="stroke-width:1.73496"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
            id="g44">
-	<path
-   style="fill:#f7941e;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path42"
-   d="m 204.797,381.855 c 0,-18.78 14.104,-34.384 32.453,-37.128 -0.455,-0.017 -0.913,-0.035 -1.372,-0.035 -20.591,0 -37.284,16.639 -37.284,37.163 0,20.524 16.693,37.163 37.284,37.163 0.461,0 0.918,-0.019 1.375,-0.034 -18.351,-2.744 -32.456,-18.348 -32.456,-37.129 z" />
-
-</g>
+          <path
+             style="fill:#f7941e;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path42"
+             d="m 204.797,381.855 c 0,-18.78 14.104,-34.384 32.453,-37.128 -0.455,-0.017 -0.913,-0.035 -1.372,-0.035 -20.591,0 -37.284,16.639 -37.284,37.163 0,20.524 16.693,37.163 37.284,37.163 0.461,0 0.918,-0.019 1.375,-0.034 -18.351,-2.744 -32.456,-18.348 -32.456,-37.129 z" />
+        </g>
         <g
            style="stroke-width:1.73496"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
            id="g67">
-	<linearGradient
-   y2="368.73721"
-   x2="242.4575"
-   y1="422.2832"
-   x1="242.4575"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_1_">
-		<stop
-   id="stop46"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop48"
-   style="stop-color:#2C2255"
-   offset="0.872" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_1_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path51"
-   d="m 266.65,379.863 c -0.119,-1.47 -0.366,-2.903 -0.736,-4.287 h -46.913 c -0.37,1.384 -0.617,2.817 -0.737,4.287 z" />
-
-	<linearGradient
-   y2="368.7338"
-   x2="242.4575"
-   y1="422.29199"
-   x1="242.4575"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_2_">
-		<stop
-   id="stop53"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop55"
-   style="stop-color:#2C2255"
-   offset="0.872" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_2_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path58"
-   d="m 266.65,383.845 h -48.386 c 0.12,1.471 0.366,2.903 0.736,4.288 h 46.914 c 0.371,-1.385 0.617,-2.818 0.736,-4.288 z" />
-
-	<linearGradient
-   y2="368.73639"
-   x2="242.45799"
-   y1="422.2861"
-   x1="242.45799"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_3_">
-		<stop
-   id="stop60"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop62"
-   style="stop-color:#2C2255"
-   offset="0.8631" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_3_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path65"
-   d="m 242.458,406.137 c 9.742,0 18.14,-5.74 22.008,-14.022 H 220.45 c 3.867,8.281 12.265,14.022 22.008,14.022 z" />
-
-</g>
+          <linearGradient
+             y2="368.73721"
+             x2="242.4575"
+             y1="422.2832"
+             x1="242.4575"
+             gradientUnits="userSpaceOnUse"
+             id="SVGID_1_">
+            <stop
+               id="stop46"
+               style="stop-color:#473788"
+               offset="0.3033" />
+            <stop
+               id="stop48"
+               style="stop-color:#2C2255"
+               offset="0.872" />
+          </linearGradient>
+          <path
+             style="fill:url(#SVGID_1_);stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path51"
+             d="m 266.65,379.863 c -0.119,-1.47 -0.366,-2.903 -0.736,-4.287 h -46.913 c -0.37,1.384 -0.617,2.817 -0.737,4.287 z" />
+          <linearGradient
+             y2="368.7338"
+             x2="242.4575"
+             y1="422.29199"
+             x1="242.4575"
+             gradientUnits="userSpaceOnUse"
+             id="SVGID_2_">
+            <stop
+               id="stop53"
+               style="stop-color:#473788"
+               offset="0.3033" />
+            <stop
+               id="stop55"
+               style="stop-color:#2C2255"
+               offset="0.872" />
+          </linearGradient>
+          <path
+             style="fill:url(#SVGID_2_);stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path58"
+             d="m 266.65,383.845 h -48.386 c 0.12,1.471 0.366,2.903 0.736,4.288 h 46.914 c 0.371,-1.385 0.617,-2.818 0.736,-4.288 z" />
+          <linearGradient
+             y2="368.73639"
+             x2="242.45799"
+             y1="422.2861"
+             x1="242.45799"
+             gradientUnits="userSpaceOnUse"
+             id="SVGID_3_">
+            <stop
+               id="stop60"
+               style="stop-color:#473788"
+               offset="0.3033" />
+            <stop
+               id="stop62"
+               style="stop-color:#2C2255"
+               offset="0.8631" />
+          </linearGradient>
+          <path
+             style="fill:url(#SVGID_3_);stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path65"
+             d="m 242.458,406.137 c 9.742,0 18.14,-5.74 22.008,-14.022 H 220.45 c 3.867,8.281 12.265,14.022 22.008,14.022 z" />
+        </g>
         <g
            style="stroke-width:1.73496"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
            id="g75">
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path69"
-   d="m 214.679,383.845 h 3.552 48.51 6.373 4.841 c 0.034,-0.633 0.053,-1.271 0.053,-1.913 0,-0.694 -0.025,-1.383 -0.064,-2.068 h -4.829 -6.373 -48.51 -3.802 -7.517 c -0.039,0.686 -0.064,1.374 -0.064,2.068 0,0.643 0.019,1.28 0.052,1.913 z" />
-
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path71"
-   d="m 220.308,371.594 h -12.037 c -0.396,1.297 -0.65,2.627 -0.896,3.982 h 6.2 5.279 47.035 6.662 4.761 c -0.245,-1.355 -0.562,-2.686 -0.957,-3.982" />
-
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path73"
-   d="m 272.739,388.133 h -6.661 -47.035 -5.027 -6.642 c 0.239,1.354 0.51,2.685 0.899,3.981 h 12.222 44.129 7.244 4.719 c 0.389,-1.297 0.701,-2.627 0.941,-3.981 z" />
-
-</g>
+          <path
+             style="fill:#ffffff;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path69"
+             d="m 214.679,383.845 h 3.552 48.51 6.373 4.841 c 0.034,-0.633 0.053,-1.271 0.053,-1.913 0,-0.694 -0.025,-1.383 -0.064,-2.068 h -4.829 -6.373 -48.51 -3.802 -7.517 c -0.039,0.686 -0.064,1.374 -0.064,2.068 0,0.643 0.019,1.28 0.052,1.913 z" />
+          <path
+             style="fill:#ffffff;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path71"
+             d="m 220.308,371.594 h -12.037 c -0.396,1.297 -0.65,2.627 -0.896,3.982 h 6.2 5.279 47.035 6.662 4.761 c -0.245,-1.355 -0.562,-2.686 -0.957,-3.982" />
+          <path
+             style="fill:#ffffff;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path73"
+             d="m 272.739,388.133 h -6.661 -47.035 -5.027 -6.642 c 0.239,1.354 0.51,2.685 0.899,3.981 h 12.222 44.129 7.244 4.719 c 0.389,-1.297 0.701,-2.627 0.941,-3.981 z" />
+        </g>
       </g>
     </g>
   </g>
diff --git a/packages/org.eclipse.epp.package.parallel/eclipse32@2x.png b/packages/org.eclipse.epp.package.parallel/eclipse32@2x.png
index d44f785..3307f99 100644
--- a/packages/org.eclipse.epp.package.parallel/eclipse32@2x.png
+++ b/packages/org.eclipse.epp.package.parallel/eclipse32@2x.png
Binary files differ
diff --git a/packages/org.eclipse.epp.package.parallel/eclipse48.png b/packages/org.eclipse.epp.package.parallel/eclipse48.png
index bff9aef..de9928f 100644
--- a/packages/org.eclipse.epp.package.parallel/eclipse48.png
+++ b/packages/org.eclipse.epp.package.parallel/eclipse48.png
Binary files differ
diff --git a/packages/org.eclipse.epp.package.parallel/eclipse48.svg b/packages/org.eclipse.epp.package.parallel/eclipse48.svg
index 099b7d2..80513d7 100644
--- a/packages/org.eclipse.epp.package.parallel/eclipse48.svg
+++ b/packages/org.eclipse.epp.package.parallel/eclipse48.svg
@@ -7,13 +7,16 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:version="1.0rc1 (09960d6, 2020-04-09)"
-   sodipodi:docname="eclipse48.svg"
-   viewBox="0 0 48 48"
-   height="48"
-   width="48"
+   inkscape:export-ydpi="192"
+   inkscape:export-xdpi="192"
+   inkscape:export-filename="/Users/d021678/git/org.eclipse.epp.packages/packages/org.eclipse.epp.package.java/eclipse48@2x.png"
+   version="1.1"
    id="svg1412"
-   version="1.1">
+   width="48"
+   height="48"
+   viewBox="0 0 48 48"
+   sodipodi:docname="eclipse48.svg"
+   inkscape:version="1.0rc1 (09960d6, 2020-04-09)">
   <metadata
      id="metadata1418">
     <rdf:RDF>
@@ -28,226 +31,209 @@
   <defs
      id="defs1416">
     <linearGradient
-       y2="368.73721"
-       x2="242.4575"
+       id="linearGradient3462"
+       gradientUnits="userSpaceOnUse"
+       x1="242.4575"
        y1="422.2832"
-       x1="242.4575"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3462">
-      <stop
-         id="stop46-2"
-         style="stop-color:#473788"
-         offset="0.3033" />
-      <stop
-         id="stop48-6"
-         style="stop-color:#2C2255"
-         offset="0.872" />
-    </linearGradient>
-    <linearGradient
-       y2="368.7338"
        x2="242.4575"
-       y1="422.29199"
-       x1="242.4575"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3466">
+       y2="368.73721">
       <stop
-         id="stop53-6"
+         offset="0.3033"
          style="stop-color:#473788"
-         offset="0.3033" />
+         id="stop46-2" />
       <stop
-         id="stop55-8"
+         offset="0.872"
          style="stop-color:#2C2255"
-         offset="0.872" />
+         id="stop48-6" />
     </linearGradient>
     <linearGradient
-       y2="368.73639"
-       x2="242.45799"
-       y1="422.2861"
-       x1="242.45799"
+       id="linearGradient3466"
        gradientUnits="userSpaceOnUse"
-       id="linearGradient3470">
+       x1="242.4575"
+       y1="422.29199"
+       x2="242.4575"
+       y2="368.7338">
       <stop
-         id="stop60-3"
+         offset="0.3033"
          style="stop-color:#473788"
-         offset="0.3033" />
+         id="stop53-6" />
       <stop
-         id="stop62-4"
+         offset="0.872"
          style="stop-color:#2C2255"
-         offset="0.8631" />
+         id="stop55-8" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3470"
+       gradientUnits="userSpaceOnUse"
+       x1="242.45799"
+       y1="422.2861"
+       x2="242.45799"
+       y2="368.73639">
+      <stop
+         offset="0.3033"
+         style="stop-color:#473788"
+         id="stop60-3" />
+      <stop
+         offset="0.8631"
+         style="stop-color:#2C2255"
+         id="stop62-4" />
     </linearGradient>
   </defs>
   <sodipodi:namedview
-     inkscape:current-layer="g1420"
-     inkscape:window-maximized="0"
-     inkscape:window-y="23"
-     inkscape:window-x="0"
-     inkscape:cy="24"
-     inkscape:cx="-3.1764706"
-     inkscape:zoom="5.6666667"
-     showgrid="false"
-     id="namedview1414"
-     inkscape:window-height="910"
-     inkscape:window-width="1310"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     guidetolerance="10"
-     gridtolerance="10"
-     objecttolerance="10"
-     borderopacity="1"
+     inkscape:document-rotation="0"
+     pagecolor="#ffffff"
      bordercolor="#666666"
-     pagecolor="#ffffff" />
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1416"
+     inkscape:window-height="1035"
+     id="namedview1414"
+     showgrid="false"
+     inkscape:zoom="5.6666667"
+     inkscape:cx="-3.1764706"
+     inkscape:cy="24"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g1420" />
   <g
-     id="g1420"
+     inkscape:groupmode="layer"
      inkscape:label="Image"
-     inkscape:groupmode="layer">
+     id="g1420">
     <g
-       transform="matrix(0.99893516,0,0,0.99893516,47.95795,3.4517308)"
-       id="g2207">
+       id="g2207"
+       transform="matrix(0.99893516,0,0,0.99893516,47.95795,3.4517308)">
       <g
-         id="g139"
+         style="stroke-width:0.983117"
          transform="matrix(1.0678037,0,0,1.0572816,-79.316579,-1.6972965)"
-         style="stroke-width:0.983117">
+         id="g139">
         <path
-           style="fill:#2c2255;stroke-width:0.983117"
-           inkscape:connector-curvature="0"
+           d="m 41.680839,26.851877 h -6.90011 c 0.91344,3.13415 2.60886,5.94303 5.09022,8.42496 3.95636,3.95636 8.71509,5.93397 14.27903,5.93397 1.11234,0 2.18954,-0.0827 3.23671,-0.24083 4.19039,-0.63295 7.86002,-2.52726 11.00323,-5.69314 2.49836,-2.48193 4.20568,-5.29081 5.12649,-8.42496 h -2.79982 -4.09462 z"
            id="path32"
-           d="m 41.680839,26.851877 h -6.90011 c 0.91344,3.13415 2.60886,5.94303 5.09022,8.42496 3.95636,3.95636 8.71509,5.93397 14.27903,5.93397 1.11234,0 2.18954,-0.0827 3.23671,-0.24083 4.19039,-0.63295 7.86002,-2.52726 11.00323,-5.69314 2.49836,-2.48193 4.20568,-5.29081 5.12649,-8.42496 h -2.79982 -4.09462 z" />
-        <g
-           style="stroke-width:1.73496"
-           transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
-           id="g38">
-	<path
-   style="fill:#2c2255;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path34"
-   d="m 213.736,375.576 h -6.361 c -0.233,1.397 -0.391,2.824 -0.463,4.287 h 7.561 3.792 54.741 4.998 c -0.073,-1.463 -0.232,-2.89 -0.467,-4.287" />
-
-	<path
-   style="fill:#2c2255;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path36"
-   d="m 206.912,383.845 c 0.072,1.464 0.23,2.891 0.463,4.288 h 6.613 5.012 53.558 4.979 c 0.234,-1.397 0.395,-2.824 0.467,-4.288" />
-
-</g>
-        <path
-           style="fill:#2c2255;stroke-width:0.983117"
            inkscape:connector-curvature="0"
+           style="fill:#2c2255;stroke-width:0.983117" />
+        <g
+           id="g38"
+           transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
+           style="stroke-width:1.73496">
+          <path
+             d="m 213.736,375.576 h -6.361 c -0.233,1.397 -0.391,2.824 -0.463,4.287 h 7.561 3.792 54.741 4.998 c -0.073,-1.463 -0.232,-2.89 -0.467,-4.287"
+             id="path34"
+             inkscape:connector-curvature="0"
+             style="fill:#2c2255;stroke-width:3.06178" />
+          <path
+             d="m 206.912,383.845 c 0.072,1.464 0.23,2.891 0.463,4.288 h 6.613 5.012 53.558 4.979 c 0.234,-1.397 0.395,-2.824 0.467,-4.288"
+             id="path36"
+             inkscape:connector-curvature="0"
+             style="fill:#2c2255;stroke-width:3.06178" />
+        </g>
+        <path
+           d="m 73.517539,15.224207 c -0.92024,-3.14265 -2.62813,-5.9639998 -5.12762,-8.4640598 -3.13528,-3.13585 -6.79414,-5.01713 -10.97093,-5.65008 -1.0568,-0.16035995 -2.14477,-0.24421995 -3.26901,-0.24421995 -5.56394,0 -10.3221,1.96513995 -14.27903,5.89429995 -2.48306,2.49949 -4.17905,5.3214098 -5.09192,8.4640598 z"
            id="path40"
-           d="m 73.517539,15.224207 c -0.92024,-3.14265 -2.62813,-5.9639998 -5.12762,-8.4640598 -3.13528,-3.13585 -6.79414,-5.01713 -10.97093,-5.65008 -1.0568,-0.16035995 -2.14477,-0.24421995 -3.26901,-0.24421995 -5.56394,0 -10.3221,1.96513995 -14.27903,5.89429995 -2.48306,2.49949 -4.17905,5.3214098 -5.09192,8.4640598 z" />
+           inkscape:connector-curvature="0"
+           style="fill:#2c2255;stroke-width:0.983117" />
         <g
-           style="stroke-width:1.73496"
+           id="g44"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
-           id="g44">
-	<path
-   style="fill:#f7941e;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path42"
-   d="m 204.797,381.855 c 0,-18.78 14.104,-34.384 32.453,-37.128 -0.455,-0.017 -0.913,-0.035 -1.372,-0.035 -20.591,0 -37.284,16.639 -37.284,37.163 0,20.524 16.693,37.163 37.284,37.163 0.461,0 0.918,-0.019 1.375,-0.034 -18.351,-2.744 -32.456,-18.348 -32.456,-37.129 z" />
-
-</g>
+           style="stroke-width:1.73496">
+          <path
+             d="m 204.797,381.855 c 0,-18.78 14.104,-34.384 32.453,-37.128 -0.455,-0.017 -0.913,-0.035 -1.372,-0.035 -20.591,0 -37.284,16.639 -37.284,37.163 0,20.524 16.693,37.163 37.284,37.163 0.461,0 0.918,-0.019 1.375,-0.034 -18.351,-2.744 -32.456,-18.348 -32.456,-37.129 z"
+             id="path42"
+             inkscape:connector-curvature="0"
+             style="fill:#f7941e;stroke-width:3.06178" />
+        </g>
         <g
-           style="stroke-width:1.73496"
+           id="g67"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
-           id="g67">
-	<linearGradient
-   y2="368.73721"
-   x2="242.4575"
-   y1="422.2832"
-   x1="242.4575"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_1_">
-		<stop
-   id="stop46"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop48"
-   style="stop-color:#2C2255"
-   offset="0.872" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_1_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path51"
-   d="m 266.65,379.863 c -0.119,-1.47 -0.366,-2.903 -0.736,-4.287 h -46.913 c -0.37,1.384 -0.617,2.817 -0.737,4.287 z" />
-
-	<linearGradient
-   y2="368.7338"
-   x2="242.4575"
-   y1="422.29199"
-   x1="242.4575"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_2_">
-		<stop
-   id="stop53"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop55"
-   style="stop-color:#2C2255"
-   offset="0.872" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_2_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path58"
-   d="m 266.65,383.845 h -48.386 c 0.12,1.471 0.366,2.903 0.736,4.288 h 46.914 c 0.371,-1.385 0.617,-2.818 0.736,-4.288 z" />
-
-	<linearGradient
-   y2="368.73639"
-   x2="242.45799"
-   y1="422.2861"
-   x1="242.45799"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_3_">
-		<stop
-   id="stop60"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop62"
-   style="stop-color:#2C2255"
-   offset="0.8631" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_3_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path65"
-   d="m 242.458,406.137 c 9.742,0 18.14,-5.74 22.008,-14.022 H 220.45 c 3.867,8.281 12.265,14.022 22.008,14.022 z" />
-
-</g>
+           style="stroke-width:1.73496">
+          <linearGradient
+             id="SVGID_1_"
+             gradientUnits="userSpaceOnUse"
+             x1="242.4575"
+             y1="422.2832"
+             x2="242.4575"
+             y2="368.73721">
+            <stop
+               offset="0.3033"
+               style="stop-color:#473788"
+               id="stop46" />
+            <stop
+               offset="0.872"
+               style="stop-color:#2C2255"
+               id="stop48" />
+          </linearGradient>
+          <path
+             d="m 266.65,379.863 c -0.119,-1.47 -0.366,-2.903 -0.736,-4.287 h -46.913 c -0.37,1.384 -0.617,2.817 -0.737,4.287 z"
+             id="path51"
+             inkscape:connector-curvature="0"
+             style="fill:url(#SVGID_1_);stroke-width:3.06178" />
+          <linearGradient
+             id="SVGID_2_"
+             gradientUnits="userSpaceOnUse"
+             x1="242.4575"
+             y1="422.29199"
+             x2="242.4575"
+             y2="368.7338">
+            <stop
+               offset="0.3033"
+               style="stop-color:#473788"
+               id="stop53" />
+            <stop
+               offset="0.872"
+               style="stop-color:#2C2255"
+               id="stop55" />
+          </linearGradient>
+          <path
+             d="m 266.65,383.845 h -48.386 c 0.12,1.471 0.366,2.903 0.736,4.288 h 46.914 c 0.371,-1.385 0.617,-2.818 0.736,-4.288 z"
+             id="path58"
+             inkscape:connector-curvature="0"
+             style="fill:url(#SVGID_2_);stroke-width:3.06178" />
+          <linearGradient
+             id="SVGID_3_"
+             gradientUnits="userSpaceOnUse"
+             x1="242.45799"
+             y1="422.2861"
+             x2="242.45799"
+             y2="368.73639">
+            <stop
+               offset="0.3033"
+               style="stop-color:#473788"
+               id="stop60" />
+            <stop
+               offset="0.8631"
+               style="stop-color:#2C2255"
+               id="stop62" />
+          </linearGradient>
+          <path
+             d="m 242.458,406.137 c 9.742,0 18.14,-5.74 22.008,-14.022 H 220.45 c 3.867,8.281 12.265,14.022 22.008,14.022 z"
+             id="path65"
+             inkscape:connector-curvature="0"
+             style="fill:url(#SVGID_3_);stroke-width:3.06178" />
+        </g>
         <g
-           style="stroke-width:1.73496"
+           id="g75"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
-           id="g75">
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path69"
-   d="m 214.679,383.845 h 3.552 48.51 6.373 4.841 c 0.034,-0.633 0.053,-1.271 0.053,-1.913 0,-0.694 -0.025,-1.383 -0.064,-2.068 h -4.829 -6.373 -48.51 -3.802 -7.517 c -0.039,0.686 -0.064,1.374 -0.064,2.068 0,0.643 0.019,1.28 0.052,1.913 z" />
-
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path71"
-   d="m 220.308,371.594 h -12.037 c -0.396,1.297 -0.65,2.627 -0.896,3.982 h 6.2 5.279 47.035 6.662 4.761 c -0.245,-1.355 -0.562,-2.686 -0.957,-3.982" />
-
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path73"
-   d="m 272.739,388.133 h -6.661 -47.035 -5.027 -6.642 c 0.239,1.354 0.51,2.685 0.899,3.981 h 12.222 44.129 7.244 4.719 c 0.389,-1.297 0.701,-2.627 0.941,-3.981 z" />
-
-</g>
+           style="stroke-width:1.73496">
+          <path
+             d="m 214.679,383.845 h 3.552 48.51 6.373 4.841 c 0.034,-0.633 0.053,-1.271 0.053,-1.913 0,-0.694 -0.025,-1.383 -0.064,-2.068 h -4.829 -6.373 -48.51 -3.802 -7.517 c -0.039,0.686 -0.064,1.374 -0.064,2.068 0,0.643 0.019,1.28 0.052,1.913 z"
+             id="path69"
+             inkscape:connector-curvature="0"
+             style="fill:#ffffff;stroke-width:3.06178" />
+          <path
+             d="m 220.308,371.594 h -12.037 c -0.396,1.297 -0.65,2.627 -0.896,3.982 h 6.2 5.279 47.035 6.662 4.761 c -0.245,-1.355 -0.562,-2.686 -0.957,-3.982"
+             id="path71"
+             inkscape:connector-curvature="0"
+             style="fill:#ffffff;stroke-width:3.06178" />
+          <path
+             d="m 272.739,388.133 h -6.661 -47.035 -5.027 -6.642 c 0.239,1.354 0.51,2.685 0.899,3.981 h 12.222 44.129 7.244 4.719 c 0.389,-1.297 0.701,-2.627 0.941,-3.981 z"
+             id="path73"
+             inkscape:connector-curvature="0"
+             style="fill:#ffffff;stroke-width:3.06178" />
+        </g>
       </g>
     </g>
   </g>
diff --git a/packages/org.eclipse.epp.package.parallel/eclipse48@2x.png b/packages/org.eclipse.epp.package.parallel/eclipse48@2x.png
index 3b8d1cc..bff9aef 100644
--- a/packages/org.eclipse.epp.package.parallel/eclipse48@2x.png
+++ b/packages/org.eclipse.epp.package.parallel/eclipse48@2x.png
Binary files differ
diff --git a/packages/org.eclipse.epp.package.php/eclipse32.png b/packages/org.eclipse.epp.package.php/eclipse32.png
index 55d401d..eae69ee 100644
--- a/packages/org.eclipse.epp.package.php/eclipse32.png
+++ b/packages/org.eclipse.epp.package.php/eclipse32.png
Binary files differ
diff --git a/packages/org.eclipse.epp.package.php/eclipse32.svg b/packages/org.eclipse.epp.package.php/eclipse32.svg
index bc8bec1..ccc3e5e 100644
--- a/packages/org.eclipse.epp.package.php/eclipse32.svg
+++ b/packages/org.eclipse.epp.package.php/eclipse32.svg
@@ -7,9 +7,9 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:export-ydpi="384"
-   inkscape:export-xdpi="384"
-   inkscape:export-filename="/Users/d021678/git/org.eclipse.epp.packages/packages/org.eclipse.epp.package.php/eclipse32_2x.png"
+   inkscape:export-ydpi="96"
+   inkscape:export-xdpi="96"
+   inkscape:export-filename="/Users/d021678/git/org.eclipse.epp.packages/packages/org.eclipse.epp.package.java/eclipse32.png"
    inkscape:version="1.0rc1 (09960d6, 2020-04-09)"
    sodipodi:docname="eclipse32.svg"
    viewBox="0 0 32 32"
@@ -85,13 +85,13 @@
      inkscape:window-maximized="0"
      inkscape:window-y="23"
      inkscape:window-x="0"
-     inkscape:cy="7.0588235"
-     inkscape:cx="-2.1176471"
-     inkscape:zoom="8.5"
-     showgrid="false"
+     inkscape:cy="16"
+     inkscape:cx="16"
+     inkscape:zoom="25.84375"
+     showgrid="true"
      id="namedview2261"
-     inkscape:window-height="954"
-     inkscape:window-width="1305"
+     inkscape:window-height="1035"
+     inkscape:window-width="1486"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0"
      guidetolerance="10"
@@ -99,13 +99,16 @@
      objecttolerance="10"
      borderopacity="1"
      bordercolor="#666666"
-     pagecolor="#ffffff" />
+     pagecolor="#ffffff"
+     inkscape:document-rotation="0"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true" />
   <g
      id="g2267"
      inkscape:label="Image"
      inkscape:groupmode="layer">
     <g
-       transform="matrix(0.69565218,0,0,0.69565218,26.95397,22.85109)"
+       transform="matrix(0.69565218,0,0,0.69565218,26.95397,22.264755)"
        id="g3036">
       <g
          id="g139"
@@ -120,19 +123,17 @@
            style="stroke-width:1.73496"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
            id="g38">
-	<path
-   style="fill:#2c2255;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path34"
-   d="m 213.736,375.576 h -6.361 c -0.233,1.397 -0.391,2.824 -0.463,4.287 h 7.561 3.792 54.741 4.998 c -0.073,-1.463 -0.232,-2.89 -0.467,-4.287" />
-
-	<path
-   style="fill:#2c2255;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path36"
-   d="m 206.912,383.845 c 0.072,1.464 0.23,2.891 0.463,4.288 h 6.613 5.012 53.558 4.979 c 0.234,-1.397 0.395,-2.824 0.467,-4.288" />
-
-</g>
+          <path
+             style="fill:#2c2255;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path34"
+             d="m 213.736,375.576 h -6.361 c -0.233,1.397 -0.391,2.824 -0.463,4.287 h 7.561 3.792 54.741 4.998 c -0.073,-1.463 -0.232,-2.89 -0.467,-4.287" />
+          <path
+             style="fill:#2c2255;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path36"
+             d="m 206.912,383.845 c 0.072,1.464 0.23,2.891 0.463,4.288 h 6.613 5.012 53.558 4.979 c 0.234,-1.397 0.395,-2.824 0.467,-4.288" />
+        </g>
         <path
            style="fill:#2c2255;stroke-width:0.983117"
            inkscape:connector-curvature="0"
@@ -142,116 +143,100 @@
            style="stroke-width:1.73496"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
            id="g44">
-	<path
-   style="fill:#f7941e;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path42"
-   d="m 204.797,381.855 c 0,-18.78 14.104,-34.384 32.453,-37.128 -0.455,-0.017 -0.913,-0.035 -1.372,-0.035 -20.591,0 -37.284,16.639 -37.284,37.163 0,20.524 16.693,37.163 37.284,37.163 0.461,0 0.918,-0.019 1.375,-0.034 -18.351,-2.744 -32.456,-18.348 -32.456,-37.129 z" />
-
-</g>
+          <path
+             style="fill:#f7941e;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path42"
+             d="m 204.797,381.855 c 0,-18.78 14.104,-34.384 32.453,-37.128 -0.455,-0.017 -0.913,-0.035 -1.372,-0.035 -20.591,0 -37.284,16.639 -37.284,37.163 0,20.524 16.693,37.163 37.284,37.163 0.461,0 0.918,-0.019 1.375,-0.034 -18.351,-2.744 -32.456,-18.348 -32.456,-37.129 z" />
+        </g>
         <g
            style="stroke-width:1.73496"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
            id="g67">
-	<linearGradient
-   y2="368.73721"
-   x2="242.4575"
-   y1="422.2832"
-   x1="242.4575"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_1_">
-		<stop
-   id="stop46"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop48"
-   style="stop-color:#2C2255"
-   offset="0.872" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_1_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path51"
-   d="m 266.65,379.863 c -0.119,-1.47 -0.366,-2.903 -0.736,-4.287 h -46.913 c -0.37,1.384 -0.617,2.817 -0.737,4.287 z" />
-
-	<linearGradient
-   y2="368.7338"
-   x2="242.4575"
-   y1="422.29199"
-   x1="242.4575"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_2_">
-		<stop
-   id="stop53"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop55"
-   style="stop-color:#2C2255"
-   offset="0.872" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_2_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path58"
-   d="m 266.65,383.845 h -48.386 c 0.12,1.471 0.366,2.903 0.736,4.288 h 46.914 c 0.371,-1.385 0.617,-2.818 0.736,-4.288 z" />
-
-	<linearGradient
-   y2="368.73639"
-   x2="242.45799"
-   y1="422.2861"
-   x1="242.45799"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_3_">
-		<stop
-   id="stop60"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop62"
-   style="stop-color:#2C2255"
-   offset="0.8631" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_3_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path65"
-   d="m 242.458,406.137 c 9.742,0 18.14,-5.74 22.008,-14.022 H 220.45 c 3.867,8.281 12.265,14.022 22.008,14.022 z" />
-
-</g>
+          <linearGradient
+             y2="368.73721"
+             x2="242.4575"
+             y1="422.2832"
+             x1="242.4575"
+             gradientUnits="userSpaceOnUse"
+             id="SVGID_1_">
+            <stop
+               id="stop46"
+               style="stop-color:#473788"
+               offset="0.3033" />
+            <stop
+               id="stop48"
+               style="stop-color:#2C2255"
+               offset="0.872" />
+          </linearGradient>
+          <path
+             style="fill:url(#SVGID_1_);stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path51"
+             d="m 266.65,379.863 c -0.119,-1.47 -0.366,-2.903 -0.736,-4.287 h -46.913 c -0.37,1.384 -0.617,2.817 -0.737,4.287 z" />
+          <linearGradient
+             y2="368.7338"
+             x2="242.4575"
+             y1="422.29199"
+             x1="242.4575"
+             gradientUnits="userSpaceOnUse"
+             id="SVGID_2_">
+            <stop
+               id="stop53"
+               style="stop-color:#473788"
+               offset="0.3033" />
+            <stop
+               id="stop55"
+               style="stop-color:#2C2255"
+               offset="0.872" />
+          </linearGradient>
+          <path
+             style="fill:url(#SVGID_2_);stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path58"
+             d="m 266.65,383.845 h -48.386 c 0.12,1.471 0.366,2.903 0.736,4.288 h 46.914 c 0.371,-1.385 0.617,-2.818 0.736,-4.288 z" />
+          <linearGradient
+             y2="368.73639"
+             x2="242.45799"
+             y1="422.2861"
+             x1="242.45799"
+             gradientUnits="userSpaceOnUse"
+             id="SVGID_3_">
+            <stop
+               id="stop60"
+               style="stop-color:#473788"
+               offset="0.3033" />
+            <stop
+               id="stop62"
+               style="stop-color:#2C2255"
+               offset="0.8631" />
+          </linearGradient>
+          <path
+             style="fill:url(#SVGID_3_);stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path65"
+             d="m 242.458,406.137 c 9.742,0 18.14,-5.74 22.008,-14.022 H 220.45 c 3.867,8.281 12.265,14.022 22.008,14.022 z" />
+        </g>
         <g
            style="stroke-width:1.73496"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
            id="g75">
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path69"
-   d="m 214.679,383.845 h 3.552 48.51 6.373 4.841 c 0.034,-0.633 0.053,-1.271 0.053,-1.913 0,-0.694 -0.025,-1.383 -0.064,-2.068 h -4.829 -6.373 -48.51 -3.802 -7.517 c -0.039,0.686 -0.064,1.374 -0.064,2.068 0,0.643 0.019,1.28 0.052,1.913 z" />
-
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path71"
-   d="m 220.308,371.594 h -12.037 c -0.396,1.297 -0.65,2.627 -0.896,3.982 h 6.2 5.279 47.035 6.662 4.761 c -0.245,-1.355 -0.562,-2.686 -0.957,-3.982" />
-
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path73"
-   d="m 272.739,388.133 h -6.661 -47.035 -5.027 -6.642 c 0.239,1.354 0.51,2.685 0.899,3.981 h 12.222 44.129 7.244 4.719 c 0.389,-1.297 0.701,-2.627 0.941,-3.981 z" />
-
-</g>
+          <path
+             style="fill:#ffffff;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path69"
+             d="m 214.679,383.845 h 3.552 48.51 6.373 4.841 c 0.034,-0.633 0.053,-1.271 0.053,-1.913 0,-0.694 -0.025,-1.383 -0.064,-2.068 h -4.829 -6.373 -48.51 -3.802 -7.517 c -0.039,0.686 -0.064,1.374 -0.064,2.068 0,0.643 0.019,1.28 0.052,1.913 z" />
+          <path
+             style="fill:#ffffff;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path71"
+             d="m 220.308,371.594 h -12.037 c -0.396,1.297 -0.65,2.627 -0.896,3.982 h 6.2 5.279 47.035 6.662 4.761 c -0.245,-1.355 -0.562,-2.686 -0.957,-3.982" />
+          <path
+             style="fill:#ffffff;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path73"
+             d="m 272.739,388.133 h -6.661 -47.035 -5.027 -6.642 c 0.239,1.354 0.51,2.685 0.899,3.981 h 12.222 44.129 7.244 4.719 c 0.389,-1.297 0.701,-2.627 0.941,-3.981 z" />
+        </g>
       </g>
     </g>
   </g>
diff --git a/packages/org.eclipse.epp.package.php/eclipse32@2x.png b/packages/org.eclipse.epp.package.php/eclipse32@2x.png
index d44f785..3307f99 100644
--- a/packages/org.eclipse.epp.package.php/eclipse32@2x.png
+++ b/packages/org.eclipse.epp.package.php/eclipse32@2x.png
Binary files differ
diff --git a/packages/org.eclipse.epp.package.php/eclipse48.png b/packages/org.eclipse.epp.package.php/eclipse48.png
index bff9aef..de9928f 100644
--- a/packages/org.eclipse.epp.package.php/eclipse48.png
+++ b/packages/org.eclipse.epp.package.php/eclipse48.png
Binary files differ
diff --git a/packages/org.eclipse.epp.package.php/eclipse48.svg b/packages/org.eclipse.epp.package.php/eclipse48.svg
index 099b7d2..80513d7 100644
--- a/packages/org.eclipse.epp.package.php/eclipse48.svg
+++ b/packages/org.eclipse.epp.package.php/eclipse48.svg
@@ -7,13 +7,16 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:version="1.0rc1 (09960d6, 2020-04-09)"
-   sodipodi:docname="eclipse48.svg"
-   viewBox="0 0 48 48"
-   height="48"
-   width="48"
+   inkscape:export-ydpi="192"
+   inkscape:export-xdpi="192"
+   inkscape:export-filename="/Users/d021678/git/org.eclipse.epp.packages/packages/org.eclipse.epp.package.java/eclipse48@2x.png"
+   version="1.1"
    id="svg1412"
-   version="1.1">
+   width="48"
+   height="48"
+   viewBox="0 0 48 48"
+   sodipodi:docname="eclipse48.svg"
+   inkscape:version="1.0rc1 (09960d6, 2020-04-09)">
   <metadata
      id="metadata1418">
     <rdf:RDF>
@@ -28,226 +31,209 @@
   <defs
      id="defs1416">
     <linearGradient
-       y2="368.73721"
-       x2="242.4575"
+       id="linearGradient3462"
+       gradientUnits="userSpaceOnUse"
+       x1="242.4575"
        y1="422.2832"
-       x1="242.4575"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3462">
-      <stop
-         id="stop46-2"
-         style="stop-color:#473788"
-         offset="0.3033" />
-      <stop
-         id="stop48-6"
-         style="stop-color:#2C2255"
-         offset="0.872" />
-    </linearGradient>
-    <linearGradient
-       y2="368.7338"
        x2="242.4575"
-       y1="422.29199"
-       x1="242.4575"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3466">
+       y2="368.73721">
       <stop
-         id="stop53-6"
+         offset="0.3033"
          style="stop-color:#473788"
-         offset="0.3033" />
+         id="stop46-2" />
       <stop
-         id="stop55-8"
+         offset="0.872"
          style="stop-color:#2C2255"
-         offset="0.872" />
+         id="stop48-6" />
     </linearGradient>
     <linearGradient
-       y2="368.73639"
-       x2="242.45799"
-       y1="422.2861"
-       x1="242.45799"
+       id="linearGradient3466"
        gradientUnits="userSpaceOnUse"
-       id="linearGradient3470">
+       x1="242.4575"
+       y1="422.29199"
+       x2="242.4575"
+       y2="368.7338">
       <stop
-         id="stop60-3"
+         offset="0.3033"
          style="stop-color:#473788"
-         offset="0.3033" />
+         id="stop53-6" />
       <stop
-         id="stop62-4"
+         offset="0.872"
          style="stop-color:#2C2255"
-         offset="0.8631" />
+         id="stop55-8" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3470"
+       gradientUnits="userSpaceOnUse"
+       x1="242.45799"
+       y1="422.2861"
+       x2="242.45799"
+       y2="368.73639">
+      <stop
+         offset="0.3033"
+         style="stop-color:#473788"
+         id="stop60-3" />
+      <stop
+         offset="0.8631"
+         style="stop-color:#2C2255"
+         id="stop62-4" />
     </linearGradient>
   </defs>
   <sodipodi:namedview
-     inkscape:current-layer="g1420"
-     inkscape:window-maximized="0"
-     inkscape:window-y="23"
-     inkscape:window-x="0"
-     inkscape:cy="24"
-     inkscape:cx="-3.1764706"
-     inkscape:zoom="5.6666667"
-     showgrid="false"
-     id="namedview1414"
-     inkscape:window-height="910"
-     inkscape:window-width="1310"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     guidetolerance="10"
-     gridtolerance="10"
-     objecttolerance="10"
-     borderopacity="1"
+     inkscape:document-rotation="0"
+     pagecolor="#ffffff"
      bordercolor="#666666"
-     pagecolor="#ffffff" />
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1416"
+     inkscape:window-height="1035"
+     id="namedview1414"
+     showgrid="false"
+     inkscape:zoom="5.6666667"
+     inkscape:cx="-3.1764706"
+     inkscape:cy="24"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g1420" />
   <g
-     id="g1420"
+     inkscape:groupmode="layer"
      inkscape:label="Image"
-     inkscape:groupmode="layer">
+     id="g1420">
     <g
-       transform="matrix(0.99893516,0,0,0.99893516,47.95795,3.4517308)"
-       id="g2207">
+       id="g2207"
+       transform="matrix(0.99893516,0,0,0.99893516,47.95795,3.4517308)">
       <g
-         id="g139"
+         style="stroke-width:0.983117"
          transform="matrix(1.0678037,0,0,1.0572816,-79.316579,-1.6972965)"
-         style="stroke-width:0.983117">
+         id="g139">
         <path
-           style="fill:#2c2255;stroke-width:0.983117"
-           inkscape:connector-curvature="0"
+           d="m 41.680839,26.851877 h -6.90011 c 0.91344,3.13415 2.60886,5.94303 5.09022,8.42496 3.95636,3.95636 8.71509,5.93397 14.27903,5.93397 1.11234,0 2.18954,-0.0827 3.23671,-0.24083 4.19039,-0.63295 7.86002,-2.52726 11.00323,-5.69314 2.49836,-2.48193 4.20568,-5.29081 5.12649,-8.42496 h -2.79982 -4.09462 z"
            id="path32"
-           d="m 41.680839,26.851877 h -6.90011 c 0.91344,3.13415 2.60886,5.94303 5.09022,8.42496 3.95636,3.95636 8.71509,5.93397 14.27903,5.93397 1.11234,0 2.18954,-0.0827 3.23671,-0.24083 4.19039,-0.63295 7.86002,-2.52726 11.00323,-5.69314 2.49836,-2.48193 4.20568,-5.29081 5.12649,-8.42496 h -2.79982 -4.09462 z" />
-        <g
-           style="stroke-width:1.73496"
-           transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
-           id="g38">
-	<path
-   style="fill:#2c2255;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path34"
-   d="m 213.736,375.576 h -6.361 c -0.233,1.397 -0.391,2.824 -0.463,4.287 h 7.561 3.792 54.741 4.998 c -0.073,-1.463 -0.232,-2.89 -0.467,-4.287" />
-
-	<path
-   style="fill:#2c2255;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path36"
-   d="m 206.912,383.845 c 0.072,1.464 0.23,2.891 0.463,4.288 h 6.613 5.012 53.558 4.979 c 0.234,-1.397 0.395,-2.824 0.467,-4.288" />
-
-</g>
-        <path
-           style="fill:#2c2255;stroke-width:0.983117"
            inkscape:connector-curvature="0"
+           style="fill:#2c2255;stroke-width:0.983117" />
+        <g
+           id="g38"
+           transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
+           style="stroke-width:1.73496">
+          <path
+             d="m 213.736,375.576 h -6.361 c -0.233,1.397 -0.391,2.824 -0.463,4.287 h 7.561 3.792 54.741 4.998 c -0.073,-1.463 -0.232,-2.89 -0.467,-4.287"
+             id="path34"
+             inkscape:connector-curvature="0"
+             style="fill:#2c2255;stroke-width:3.06178" />
+          <path
+             d="m 206.912,383.845 c 0.072,1.464 0.23,2.891 0.463,4.288 h 6.613 5.012 53.558 4.979 c 0.234,-1.397 0.395,-2.824 0.467,-4.288"
+             id="path36"
+             inkscape:connector-curvature="0"
+             style="fill:#2c2255;stroke-width:3.06178" />
+        </g>
+        <path
+           d="m 73.517539,15.224207 c -0.92024,-3.14265 -2.62813,-5.9639998 -5.12762,-8.4640598 -3.13528,-3.13585 -6.79414,-5.01713 -10.97093,-5.65008 -1.0568,-0.16035995 -2.14477,-0.24421995 -3.26901,-0.24421995 -5.56394,0 -10.3221,1.96513995 -14.27903,5.89429995 -2.48306,2.49949 -4.17905,5.3214098 -5.09192,8.4640598 z"
            id="path40"
-           d="m 73.517539,15.224207 c -0.92024,-3.14265 -2.62813,-5.9639998 -5.12762,-8.4640598 -3.13528,-3.13585 -6.79414,-5.01713 -10.97093,-5.65008 -1.0568,-0.16035995 -2.14477,-0.24421995 -3.26901,-0.24421995 -5.56394,0 -10.3221,1.96513995 -14.27903,5.89429995 -2.48306,2.49949 -4.17905,5.3214098 -5.09192,8.4640598 z" />
+           inkscape:connector-curvature="0"
+           style="fill:#2c2255;stroke-width:0.983117" />
         <g
-           style="stroke-width:1.73496"
+           id="g44"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
-           id="g44">
-	<path
-   style="fill:#f7941e;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path42"
-   d="m 204.797,381.855 c 0,-18.78 14.104,-34.384 32.453,-37.128 -0.455,-0.017 -0.913,-0.035 -1.372,-0.035 -20.591,0 -37.284,16.639 -37.284,37.163 0,20.524 16.693,37.163 37.284,37.163 0.461,0 0.918,-0.019 1.375,-0.034 -18.351,-2.744 -32.456,-18.348 -32.456,-37.129 z" />
-
-</g>
+           style="stroke-width:1.73496">
+          <path
+             d="m 204.797,381.855 c 0,-18.78 14.104,-34.384 32.453,-37.128 -0.455,-0.017 -0.913,-0.035 -1.372,-0.035 -20.591,0 -37.284,16.639 -37.284,37.163 0,20.524 16.693,37.163 37.284,37.163 0.461,0 0.918,-0.019 1.375,-0.034 -18.351,-2.744 -32.456,-18.348 -32.456,-37.129 z"
+             id="path42"
+             inkscape:connector-curvature="0"
+             style="fill:#f7941e;stroke-width:3.06178" />
+        </g>
         <g
-           style="stroke-width:1.73496"
+           id="g67"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
-           id="g67">
-	<linearGradient
-   y2="368.73721"
-   x2="242.4575"
-   y1="422.2832"
-   x1="242.4575"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_1_">
-		<stop
-   id="stop46"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop48"
-   style="stop-color:#2C2255"
-   offset="0.872" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_1_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path51"
-   d="m 266.65,379.863 c -0.119,-1.47 -0.366,-2.903 -0.736,-4.287 h -46.913 c -0.37,1.384 -0.617,2.817 -0.737,4.287 z" />
-
-	<linearGradient
-   y2="368.7338"
-   x2="242.4575"
-   y1="422.29199"
-   x1="242.4575"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_2_">
-		<stop
-   id="stop53"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop55"
-   style="stop-color:#2C2255"
-   offset="0.872" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_2_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path58"
-   d="m 266.65,383.845 h -48.386 c 0.12,1.471 0.366,2.903 0.736,4.288 h 46.914 c 0.371,-1.385 0.617,-2.818 0.736,-4.288 z" />
-
-	<linearGradient
-   y2="368.73639"
-   x2="242.45799"
-   y1="422.2861"
-   x1="242.45799"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_3_">
-		<stop
-   id="stop60"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop62"
-   style="stop-color:#2C2255"
-   offset="0.8631" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_3_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path65"
-   d="m 242.458,406.137 c 9.742,0 18.14,-5.74 22.008,-14.022 H 220.45 c 3.867,8.281 12.265,14.022 22.008,14.022 z" />
-
-</g>
+           style="stroke-width:1.73496">
+          <linearGradient
+             id="SVGID_1_"
+             gradientUnits="userSpaceOnUse"
+             x1="242.4575"
+             y1="422.2832"
+             x2="242.4575"
+             y2="368.73721">
+            <stop
+               offset="0.3033"
+               style="stop-color:#473788"
+               id="stop46" />
+            <stop
+               offset="0.872"
+               style="stop-color:#2C2255"
+               id="stop48" />
+          </linearGradient>
+          <path
+             d="m 266.65,379.863 c -0.119,-1.47 -0.366,-2.903 -0.736,-4.287 h -46.913 c -0.37,1.384 -0.617,2.817 -0.737,4.287 z"
+             id="path51"
+             inkscape:connector-curvature="0"
+             style="fill:url(#SVGID_1_);stroke-width:3.06178" />
+          <linearGradient
+             id="SVGID_2_"
+             gradientUnits="userSpaceOnUse"
+             x1="242.4575"
+             y1="422.29199"
+             x2="242.4575"
+             y2="368.7338">
+            <stop
+               offset="0.3033"
+               style="stop-color:#473788"
+               id="stop53" />
+            <stop
+               offset="0.872"
+               style="stop-color:#2C2255"
+               id="stop55" />
+          </linearGradient>
+          <path
+             d="m 266.65,383.845 h -48.386 c 0.12,1.471 0.366,2.903 0.736,4.288 h 46.914 c 0.371,-1.385 0.617,-2.818 0.736,-4.288 z"
+             id="path58"
+             inkscape:connector-curvature="0"
+             style="fill:url(#SVGID_2_);stroke-width:3.06178" />
+          <linearGradient
+             id="SVGID_3_"
+             gradientUnits="userSpaceOnUse"
+             x1="242.45799"
+             y1="422.2861"
+             x2="242.45799"
+             y2="368.73639">
+            <stop
+               offset="0.3033"
+               style="stop-color:#473788"
+               id="stop60" />
+            <stop
+               offset="0.8631"
+               style="stop-color:#2C2255"
+               id="stop62" />
+          </linearGradient>
+          <path
+             d="m 242.458,406.137 c 9.742,0 18.14,-5.74 22.008,-14.022 H 220.45 c 3.867,8.281 12.265,14.022 22.008,14.022 z"
+             id="path65"
+             inkscape:connector-curvature="0"
+             style="fill:url(#SVGID_3_);stroke-width:3.06178" />
+        </g>
         <g
-           style="stroke-width:1.73496"
+           id="g75"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
-           id="g75">
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path69"
-   d="m 214.679,383.845 h 3.552 48.51 6.373 4.841 c 0.034,-0.633 0.053,-1.271 0.053,-1.913 0,-0.694 -0.025,-1.383 -0.064,-2.068 h -4.829 -6.373 -48.51 -3.802 -7.517 c -0.039,0.686 -0.064,1.374 -0.064,2.068 0,0.643 0.019,1.28 0.052,1.913 z" />
-
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path71"
-   d="m 220.308,371.594 h -12.037 c -0.396,1.297 -0.65,2.627 -0.896,3.982 h 6.2 5.279 47.035 6.662 4.761 c -0.245,-1.355 -0.562,-2.686 -0.957,-3.982" />
-
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path73"
-   d="m 272.739,388.133 h -6.661 -47.035 -5.027 -6.642 c 0.239,1.354 0.51,2.685 0.899,3.981 h 12.222 44.129 7.244 4.719 c 0.389,-1.297 0.701,-2.627 0.941,-3.981 z" />
-
-</g>
+           style="stroke-width:1.73496">
+          <path
+             d="m 214.679,383.845 h 3.552 48.51 6.373 4.841 c 0.034,-0.633 0.053,-1.271 0.053,-1.913 0,-0.694 -0.025,-1.383 -0.064,-2.068 h -4.829 -6.373 -48.51 -3.802 -7.517 c -0.039,0.686 -0.064,1.374 -0.064,2.068 0,0.643 0.019,1.28 0.052,1.913 z"
+             id="path69"
+             inkscape:connector-curvature="0"
+             style="fill:#ffffff;stroke-width:3.06178" />
+          <path
+             d="m 220.308,371.594 h -12.037 c -0.396,1.297 -0.65,2.627 -0.896,3.982 h 6.2 5.279 47.035 6.662 4.761 c -0.245,-1.355 -0.562,-2.686 -0.957,-3.982"
+             id="path71"
+             inkscape:connector-curvature="0"
+             style="fill:#ffffff;stroke-width:3.06178" />
+          <path
+             d="m 272.739,388.133 h -6.661 -47.035 -5.027 -6.642 c 0.239,1.354 0.51,2.685 0.899,3.981 h 12.222 44.129 7.244 4.719 c 0.389,-1.297 0.701,-2.627 0.941,-3.981 z"
+             id="path73"
+             inkscape:connector-curvature="0"
+             style="fill:#ffffff;stroke-width:3.06178" />
+        </g>
       </g>
     </g>
   </g>
diff --git a/packages/org.eclipse.epp.package.php/eclipse48@2x.png b/packages/org.eclipse.epp.package.php/eclipse48@2x.png
index 3b8d1cc..bff9aef 100644
--- a/packages/org.eclipse.epp.package.php/eclipse48@2x.png
+++ b/packages/org.eclipse.epp.package.php/eclipse48@2x.png
Binary files differ
diff --git a/packages/org.eclipse.epp.package.rcp/eclipse32.png b/packages/org.eclipse.epp.package.rcp/eclipse32.png
index 55d401d..eae69ee 100644
--- a/packages/org.eclipse.epp.package.rcp/eclipse32.png
+++ b/packages/org.eclipse.epp.package.rcp/eclipse32.png
Binary files differ
diff --git a/packages/org.eclipse.epp.package.rcp/eclipse32.svg b/packages/org.eclipse.epp.package.rcp/eclipse32.svg
index 2591500..ccc3e5e 100644
--- a/packages/org.eclipse.epp.package.rcp/eclipse32.svg
+++ b/packages/org.eclipse.epp.package.rcp/eclipse32.svg
@@ -7,9 +7,9 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:export-ydpi="384"
-   inkscape:export-xdpi="384"
-   inkscape:export-filename="/Users/d021678/git/org.eclipse.epp.packages/packages/org.eclipse.epp.package.rcp/eclipse32_2x.png"
+   inkscape:export-ydpi="96"
+   inkscape:export-xdpi="96"
+   inkscape:export-filename="/Users/d021678/git/org.eclipse.epp.packages/packages/org.eclipse.epp.package.java/eclipse32.png"
    inkscape:version="1.0rc1 (09960d6, 2020-04-09)"
    sodipodi:docname="eclipse32.svg"
    viewBox="0 0 32 32"
@@ -85,13 +85,13 @@
      inkscape:window-maximized="0"
      inkscape:window-y="23"
      inkscape:window-x="0"
-     inkscape:cy="7.0588235"
-     inkscape:cx="-2.1176471"
-     inkscape:zoom="8.5"
-     showgrid="false"
+     inkscape:cy="16"
+     inkscape:cx="16"
+     inkscape:zoom="25.84375"
+     showgrid="true"
      id="namedview2261"
-     inkscape:window-height="954"
-     inkscape:window-width="1305"
+     inkscape:window-height="1035"
+     inkscape:window-width="1486"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0"
      guidetolerance="10"
@@ -99,13 +99,16 @@
      objecttolerance="10"
      borderopacity="1"
      bordercolor="#666666"
-     pagecolor="#ffffff" />
+     pagecolor="#ffffff"
+     inkscape:document-rotation="0"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true" />
   <g
      id="g2267"
      inkscape:label="Image"
      inkscape:groupmode="layer">
     <g
-       transform="matrix(0.69565218,0,0,0.69565218,26.95397,22.85109)"
+       transform="matrix(0.69565218,0,0,0.69565218,26.95397,22.264755)"
        id="g3036">
       <g
          id="g139"
@@ -120,19 +123,17 @@
            style="stroke-width:1.73496"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
            id="g38">
-	<path
-   style="fill:#2c2255;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path34"
-   d="m 213.736,375.576 h -6.361 c -0.233,1.397 -0.391,2.824 -0.463,4.287 h 7.561 3.792 54.741 4.998 c -0.073,-1.463 -0.232,-2.89 -0.467,-4.287" />
-
-	<path
-   style="fill:#2c2255;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path36"
-   d="m 206.912,383.845 c 0.072,1.464 0.23,2.891 0.463,4.288 h 6.613 5.012 53.558 4.979 c 0.234,-1.397 0.395,-2.824 0.467,-4.288" />
-
-</g>
+          <path
+             style="fill:#2c2255;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path34"
+             d="m 213.736,375.576 h -6.361 c -0.233,1.397 -0.391,2.824 -0.463,4.287 h 7.561 3.792 54.741 4.998 c -0.073,-1.463 -0.232,-2.89 -0.467,-4.287" />
+          <path
+             style="fill:#2c2255;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path36"
+             d="m 206.912,383.845 c 0.072,1.464 0.23,2.891 0.463,4.288 h 6.613 5.012 53.558 4.979 c 0.234,-1.397 0.395,-2.824 0.467,-4.288" />
+        </g>
         <path
            style="fill:#2c2255;stroke-width:0.983117"
            inkscape:connector-curvature="0"
@@ -142,116 +143,100 @@
            style="stroke-width:1.73496"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
            id="g44">
-	<path
-   style="fill:#f7941e;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path42"
-   d="m 204.797,381.855 c 0,-18.78 14.104,-34.384 32.453,-37.128 -0.455,-0.017 -0.913,-0.035 -1.372,-0.035 -20.591,0 -37.284,16.639 -37.284,37.163 0,20.524 16.693,37.163 37.284,37.163 0.461,0 0.918,-0.019 1.375,-0.034 -18.351,-2.744 -32.456,-18.348 -32.456,-37.129 z" />
-
-</g>
+          <path
+             style="fill:#f7941e;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path42"
+             d="m 204.797,381.855 c 0,-18.78 14.104,-34.384 32.453,-37.128 -0.455,-0.017 -0.913,-0.035 -1.372,-0.035 -20.591,0 -37.284,16.639 -37.284,37.163 0,20.524 16.693,37.163 37.284,37.163 0.461,0 0.918,-0.019 1.375,-0.034 -18.351,-2.744 -32.456,-18.348 -32.456,-37.129 z" />
+        </g>
         <g
            style="stroke-width:1.73496"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
            id="g67">
-	<linearGradient
-   y2="368.73721"
-   x2="242.4575"
-   y1="422.2832"
-   x1="242.4575"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_1_">
-		<stop
-   id="stop46"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop48"
-   style="stop-color:#2C2255"
-   offset="0.872" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_1_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path51"
-   d="m 266.65,379.863 c -0.119,-1.47 -0.366,-2.903 -0.736,-4.287 h -46.913 c -0.37,1.384 -0.617,2.817 -0.737,4.287 z" />
-
-	<linearGradient
-   y2="368.7338"
-   x2="242.4575"
-   y1="422.29199"
-   x1="242.4575"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_2_">
-		<stop
-   id="stop53"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop55"
-   style="stop-color:#2C2255"
-   offset="0.872" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_2_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path58"
-   d="m 266.65,383.845 h -48.386 c 0.12,1.471 0.366,2.903 0.736,4.288 h 46.914 c 0.371,-1.385 0.617,-2.818 0.736,-4.288 z" />
-
-	<linearGradient
-   y2="368.73639"
-   x2="242.45799"
-   y1="422.2861"
-   x1="242.45799"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_3_">
-		<stop
-   id="stop60"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop62"
-   style="stop-color:#2C2255"
-   offset="0.8631" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_3_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path65"
-   d="m 242.458,406.137 c 9.742,0 18.14,-5.74 22.008,-14.022 H 220.45 c 3.867,8.281 12.265,14.022 22.008,14.022 z" />
-
-</g>
+          <linearGradient
+             y2="368.73721"
+             x2="242.4575"
+             y1="422.2832"
+             x1="242.4575"
+             gradientUnits="userSpaceOnUse"
+             id="SVGID_1_">
+            <stop
+               id="stop46"
+               style="stop-color:#473788"
+               offset="0.3033" />
+            <stop
+               id="stop48"
+               style="stop-color:#2C2255"
+               offset="0.872" />
+          </linearGradient>
+          <path
+             style="fill:url(#SVGID_1_);stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path51"
+             d="m 266.65,379.863 c -0.119,-1.47 -0.366,-2.903 -0.736,-4.287 h -46.913 c -0.37,1.384 -0.617,2.817 -0.737,4.287 z" />
+          <linearGradient
+             y2="368.7338"
+             x2="242.4575"
+             y1="422.29199"
+             x1="242.4575"
+             gradientUnits="userSpaceOnUse"
+             id="SVGID_2_">
+            <stop
+               id="stop53"
+               style="stop-color:#473788"
+               offset="0.3033" />
+            <stop
+               id="stop55"
+               style="stop-color:#2C2255"
+               offset="0.872" />
+          </linearGradient>
+          <path
+             style="fill:url(#SVGID_2_);stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path58"
+             d="m 266.65,383.845 h -48.386 c 0.12,1.471 0.366,2.903 0.736,4.288 h 46.914 c 0.371,-1.385 0.617,-2.818 0.736,-4.288 z" />
+          <linearGradient
+             y2="368.73639"
+             x2="242.45799"
+             y1="422.2861"
+             x1="242.45799"
+             gradientUnits="userSpaceOnUse"
+             id="SVGID_3_">
+            <stop
+               id="stop60"
+               style="stop-color:#473788"
+               offset="0.3033" />
+            <stop
+               id="stop62"
+               style="stop-color:#2C2255"
+               offset="0.8631" />
+          </linearGradient>
+          <path
+             style="fill:url(#SVGID_3_);stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path65"
+             d="m 242.458,406.137 c 9.742,0 18.14,-5.74 22.008,-14.022 H 220.45 c 3.867,8.281 12.265,14.022 22.008,14.022 z" />
+        </g>
         <g
            style="stroke-width:1.73496"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
            id="g75">
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path69"
-   d="m 214.679,383.845 h 3.552 48.51 6.373 4.841 c 0.034,-0.633 0.053,-1.271 0.053,-1.913 0,-0.694 -0.025,-1.383 -0.064,-2.068 h -4.829 -6.373 -48.51 -3.802 -7.517 c -0.039,0.686 -0.064,1.374 -0.064,2.068 0,0.643 0.019,1.28 0.052,1.913 z" />
-
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path71"
-   d="m 220.308,371.594 h -12.037 c -0.396,1.297 -0.65,2.627 -0.896,3.982 h 6.2 5.279 47.035 6.662 4.761 c -0.245,-1.355 -0.562,-2.686 -0.957,-3.982" />
-
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path73"
-   d="m 272.739,388.133 h -6.661 -47.035 -5.027 -6.642 c 0.239,1.354 0.51,2.685 0.899,3.981 h 12.222 44.129 7.244 4.719 c 0.389,-1.297 0.701,-2.627 0.941,-3.981 z" />
-
-</g>
+          <path
+             style="fill:#ffffff;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path69"
+             d="m 214.679,383.845 h 3.552 48.51 6.373 4.841 c 0.034,-0.633 0.053,-1.271 0.053,-1.913 0,-0.694 -0.025,-1.383 -0.064,-2.068 h -4.829 -6.373 -48.51 -3.802 -7.517 c -0.039,0.686 -0.064,1.374 -0.064,2.068 0,0.643 0.019,1.28 0.052,1.913 z" />
+          <path
+             style="fill:#ffffff;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path71"
+             d="m 220.308,371.594 h -12.037 c -0.396,1.297 -0.65,2.627 -0.896,3.982 h 6.2 5.279 47.035 6.662 4.761 c -0.245,-1.355 -0.562,-2.686 -0.957,-3.982" />
+          <path
+             style="fill:#ffffff;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path73"
+             d="m 272.739,388.133 h -6.661 -47.035 -5.027 -6.642 c 0.239,1.354 0.51,2.685 0.899,3.981 h 12.222 44.129 7.244 4.719 c 0.389,-1.297 0.701,-2.627 0.941,-3.981 z" />
+        </g>
       </g>
     </g>
   </g>
diff --git a/packages/org.eclipse.epp.package.rcp/eclipse32@2x.png b/packages/org.eclipse.epp.package.rcp/eclipse32@2x.png
index d44f785..3307f99 100644
--- a/packages/org.eclipse.epp.package.rcp/eclipse32@2x.png
+++ b/packages/org.eclipse.epp.package.rcp/eclipse32@2x.png
Binary files differ
diff --git a/packages/org.eclipse.epp.package.rcp/eclipse48.png b/packages/org.eclipse.epp.package.rcp/eclipse48.png
index bff9aef..de9928f 100644
--- a/packages/org.eclipse.epp.package.rcp/eclipse48.png
+++ b/packages/org.eclipse.epp.package.rcp/eclipse48.png
Binary files differ
diff --git a/packages/org.eclipse.epp.package.rcp/eclipse48.svg b/packages/org.eclipse.epp.package.rcp/eclipse48.svg
index 099b7d2..80513d7 100644
--- a/packages/org.eclipse.epp.package.rcp/eclipse48.svg
+++ b/packages/org.eclipse.epp.package.rcp/eclipse48.svg
@@ -7,13 +7,16 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:version="1.0rc1 (09960d6, 2020-04-09)"
-   sodipodi:docname="eclipse48.svg"
-   viewBox="0 0 48 48"
-   height="48"
-   width="48"
+   inkscape:export-ydpi="192"
+   inkscape:export-xdpi="192"
+   inkscape:export-filename="/Users/d021678/git/org.eclipse.epp.packages/packages/org.eclipse.epp.package.java/eclipse48@2x.png"
+   version="1.1"
    id="svg1412"
-   version="1.1">
+   width="48"
+   height="48"
+   viewBox="0 0 48 48"
+   sodipodi:docname="eclipse48.svg"
+   inkscape:version="1.0rc1 (09960d6, 2020-04-09)">
   <metadata
      id="metadata1418">
     <rdf:RDF>
@@ -28,226 +31,209 @@
   <defs
      id="defs1416">
     <linearGradient
-       y2="368.73721"
-       x2="242.4575"
+       id="linearGradient3462"
+       gradientUnits="userSpaceOnUse"
+       x1="242.4575"
        y1="422.2832"
-       x1="242.4575"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3462">
-      <stop
-         id="stop46-2"
-         style="stop-color:#473788"
-         offset="0.3033" />
-      <stop
-         id="stop48-6"
-         style="stop-color:#2C2255"
-         offset="0.872" />
-    </linearGradient>
-    <linearGradient
-       y2="368.7338"
        x2="242.4575"
-       y1="422.29199"
-       x1="242.4575"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3466">
+       y2="368.73721">
       <stop
-         id="stop53-6"
+         offset="0.3033"
          style="stop-color:#473788"
-         offset="0.3033" />
+         id="stop46-2" />
       <stop
-         id="stop55-8"
+         offset="0.872"
          style="stop-color:#2C2255"
-         offset="0.872" />
+         id="stop48-6" />
     </linearGradient>
     <linearGradient
-       y2="368.73639"
-       x2="242.45799"
-       y1="422.2861"
-       x1="242.45799"
+       id="linearGradient3466"
        gradientUnits="userSpaceOnUse"
-       id="linearGradient3470">
+       x1="242.4575"
+       y1="422.29199"
+       x2="242.4575"
+       y2="368.7338">
       <stop
-         id="stop60-3"
+         offset="0.3033"
          style="stop-color:#473788"
-         offset="0.3033" />
+         id="stop53-6" />
       <stop
-         id="stop62-4"
+         offset="0.872"
          style="stop-color:#2C2255"
-         offset="0.8631" />
+         id="stop55-8" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3470"
+       gradientUnits="userSpaceOnUse"
+       x1="242.45799"
+       y1="422.2861"
+       x2="242.45799"
+       y2="368.73639">
+      <stop
+         offset="0.3033"
+         style="stop-color:#473788"
+         id="stop60-3" />
+      <stop
+         offset="0.8631"
+         style="stop-color:#2C2255"
+         id="stop62-4" />
     </linearGradient>
   </defs>
   <sodipodi:namedview
-     inkscape:current-layer="g1420"
-     inkscape:window-maximized="0"
-     inkscape:window-y="23"
-     inkscape:window-x="0"
-     inkscape:cy="24"
-     inkscape:cx="-3.1764706"
-     inkscape:zoom="5.6666667"
-     showgrid="false"
-     id="namedview1414"
-     inkscape:window-height="910"
-     inkscape:window-width="1310"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     guidetolerance="10"
-     gridtolerance="10"
-     objecttolerance="10"
-     borderopacity="1"
+     inkscape:document-rotation="0"
+     pagecolor="#ffffff"
      bordercolor="#666666"
-     pagecolor="#ffffff" />
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1416"
+     inkscape:window-height="1035"
+     id="namedview1414"
+     showgrid="false"
+     inkscape:zoom="5.6666667"
+     inkscape:cx="-3.1764706"
+     inkscape:cy="24"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g1420" />
   <g
-     id="g1420"
+     inkscape:groupmode="layer"
      inkscape:label="Image"
-     inkscape:groupmode="layer">
+     id="g1420">
     <g
-       transform="matrix(0.99893516,0,0,0.99893516,47.95795,3.4517308)"
-       id="g2207">
+       id="g2207"
+       transform="matrix(0.99893516,0,0,0.99893516,47.95795,3.4517308)">
       <g
-         id="g139"
+         style="stroke-width:0.983117"
          transform="matrix(1.0678037,0,0,1.0572816,-79.316579,-1.6972965)"
-         style="stroke-width:0.983117">
+         id="g139">
         <path
-           style="fill:#2c2255;stroke-width:0.983117"
-           inkscape:connector-curvature="0"
+           d="m 41.680839,26.851877 h -6.90011 c 0.91344,3.13415 2.60886,5.94303 5.09022,8.42496 3.95636,3.95636 8.71509,5.93397 14.27903,5.93397 1.11234,0 2.18954,-0.0827 3.23671,-0.24083 4.19039,-0.63295 7.86002,-2.52726 11.00323,-5.69314 2.49836,-2.48193 4.20568,-5.29081 5.12649,-8.42496 h -2.79982 -4.09462 z"
            id="path32"
-           d="m 41.680839,26.851877 h -6.90011 c 0.91344,3.13415 2.60886,5.94303 5.09022,8.42496 3.95636,3.95636 8.71509,5.93397 14.27903,5.93397 1.11234,0 2.18954,-0.0827 3.23671,-0.24083 4.19039,-0.63295 7.86002,-2.52726 11.00323,-5.69314 2.49836,-2.48193 4.20568,-5.29081 5.12649,-8.42496 h -2.79982 -4.09462 z" />
-        <g
-           style="stroke-width:1.73496"
-           transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
-           id="g38">
-	<path
-   style="fill:#2c2255;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path34"
-   d="m 213.736,375.576 h -6.361 c -0.233,1.397 -0.391,2.824 -0.463,4.287 h 7.561 3.792 54.741 4.998 c -0.073,-1.463 -0.232,-2.89 -0.467,-4.287" />
-
-	<path
-   style="fill:#2c2255;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path36"
-   d="m 206.912,383.845 c 0.072,1.464 0.23,2.891 0.463,4.288 h 6.613 5.012 53.558 4.979 c 0.234,-1.397 0.395,-2.824 0.467,-4.288" />
-
-</g>
-        <path
-           style="fill:#2c2255;stroke-width:0.983117"
            inkscape:connector-curvature="0"
+           style="fill:#2c2255;stroke-width:0.983117" />
+        <g
+           id="g38"
+           transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
+           style="stroke-width:1.73496">
+          <path
+             d="m 213.736,375.576 h -6.361 c -0.233,1.397 -0.391,2.824 -0.463,4.287 h 7.561 3.792 54.741 4.998 c -0.073,-1.463 -0.232,-2.89 -0.467,-4.287"
+             id="path34"
+             inkscape:connector-curvature="0"
+             style="fill:#2c2255;stroke-width:3.06178" />
+          <path
+             d="m 206.912,383.845 c 0.072,1.464 0.23,2.891 0.463,4.288 h 6.613 5.012 53.558 4.979 c 0.234,-1.397 0.395,-2.824 0.467,-4.288"
+             id="path36"
+             inkscape:connector-curvature="0"
+             style="fill:#2c2255;stroke-width:3.06178" />
+        </g>
+        <path
+           d="m 73.517539,15.224207 c -0.92024,-3.14265 -2.62813,-5.9639998 -5.12762,-8.4640598 -3.13528,-3.13585 -6.79414,-5.01713 -10.97093,-5.65008 -1.0568,-0.16035995 -2.14477,-0.24421995 -3.26901,-0.24421995 -5.56394,0 -10.3221,1.96513995 -14.27903,5.89429995 -2.48306,2.49949 -4.17905,5.3214098 -5.09192,8.4640598 z"
            id="path40"
-           d="m 73.517539,15.224207 c -0.92024,-3.14265 -2.62813,-5.9639998 -5.12762,-8.4640598 -3.13528,-3.13585 -6.79414,-5.01713 -10.97093,-5.65008 -1.0568,-0.16035995 -2.14477,-0.24421995 -3.26901,-0.24421995 -5.56394,0 -10.3221,1.96513995 -14.27903,5.89429995 -2.48306,2.49949 -4.17905,5.3214098 -5.09192,8.4640598 z" />
+           inkscape:connector-curvature="0"
+           style="fill:#2c2255;stroke-width:0.983117" />
         <g
-           style="stroke-width:1.73496"
+           id="g44"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
-           id="g44">
-	<path
-   style="fill:#f7941e;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path42"
-   d="m 204.797,381.855 c 0,-18.78 14.104,-34.384 32.453,-37.128 -0.455,-0.017 -0.913,-0.035 -1.372,-0.035 -20.591,0 -37.284,16.639 -37.284,37.163 0,20.524 16.693,37.163 37.284,37.163 0.461,0 0.918,-0.019 1.375,-0.034 -18.351,-2.744 -32.456,-18.348 -32.456,-37.129 z" />
-
-</g>
+           style="stroke-width:1.73496">
+          <path
+             d="m 204.797,381.855 c 0,-18.78 14.104,-34.384 32.453,-37.128 -0.455,-0.017 -0.913,-0.035 -1.372,-0.035 -20.591,0 -37.284,16.639 -37.284,37.163 0,20.524 16.693,37.163 37.284,37.163 0.461,0 0.918,-0.019 1.375,-0.034 -18.351,-2.744 -32.456,-18.348 -32.456,-37.129 z"
+             id="path42"
+             inkscape:connector-curvature="0"
+             style="fill:#f7941e;stroke-width:3.06178" />
+        </g>
         <g
-           style="stroke-width:1.73496"
+           id="g67"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
-           id="g67">
-	<linearGradient
-   y2="368.73721"
-   x2="242.4575"
-   y1="422.2832"
-   x1="242.4575"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_1_">
-		<stop
-   id="stop46"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop48"
-   style="stop-color:#2C2255"
-   offset="0.872" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_1_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path51"
-   d="m 266.65,379.863 c -0.119,-1.47 -0.366,-2.903 -0.736,-4.287 h -46.913 c -0.37,1.384 -0.617,2.817 -0.737,4.287 z" />
-
-	<linearGradient
-   y2="368.7338"
-   x2="242.4575"
-   y1="422.29199"
-   x1="242.4575"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_2_">
-		<stop
-   id="stop53"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop55"
-   style="stop-color:#2C2255"
-   offset="0.872" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_2_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path58"
-   d="m 266.65,383.845 h -48.386 c 0.12,1.471 0.366,2.903 0.736,4.288 h 46.914 c 0.371,-1.385 0.617,-2.818 0.736,-4.288 z" />
-
-	<linearGradient
-   y2="368.73639"
-   x2="242.45799"
-   y1="422.2861"
-   x1="242.45799"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_3_">
-		<stop
-   id="stop60"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop62"
-   style="stop-color:#2C2255"
-   offset="0.8631" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_3_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path65"
-   d="m 242.458,406.137 c 9.742,0 18.14,-5.74 22.008,-14.022 H 220.45 c 3.867,8.281 12.265,14.022 22.008,14.022 z" />
-
-</g>
+           style="stroke-width:1.73496">
+          <linearGradient
+             id="SVGID_1_"
+             gradientUnits="userSpaceOnUse"
+             x1="242.4575"
+             y1="422.2832"
+             x2="242.4575"
+             y2="368.73721">
+            <stop
+               offset="0.3033"
+               style="stop-color:#473788"
+               id="stop46" />
+            <stop
+               offset="0.872"
+               style="stop-color:#2C2255"
+               id="stop48" />
+          </linearGradient>
+          <path
+             d="m 266.65,379.863 c -0.119,-1.47 -0.366,-2.903 -0.736,-4.287 h -46.913 c -0.37,1.384 -0.617,2.817 -0.737,4.287 z"
+             id="path51"
+             inkscape:connector-curvature="0"
+             style="fill:url(#SVGID_1_);stroke-width:3.06178" />
+          <linearGradient
+             id="SVGID_2_"
+             gradientUnits="userSpaceOnUse"
+             x1="242.4575"
+             y1="422.29199"
+             x2="242.4575"
+             y2="368.7338">
+            <stop
+               offset="0.3033"
+               style="stop-color:#473788"
+               id="stop53" />
+            <stop
+               offset="0.872"
+               style="stop-color:#2C2255"
+               id="stop55" />
+          </linearGradient>
+          <path
+             d="m 266.65,383.845 h -48.386 c 0.12,1.471 0.366,2.903 0.736,4.288 h 46.914 c 0.371,-1.385 0.617,-2.818 0.736,-4.288 z"
+             id="path58"
+             inkscape:connector-curvature="0"
+             style="fill:url(#SVGID_2_);stroke-width:3.06178" />
+          <linearGradient
+             id="SVGID_3_"
+             gradientUnits="userSpaceOnUse"
+             x1="242.45799"
+             y1="422.2861"
+             x2="242.45799"
+             y2="368.73639">
+            <stop
+               offset="0.3033"
+               style="stop-color:#473788"
+               id="stop60" />
+            <stop
+               offset="0.8631"
+               style="stop-color:#2C2255"
+               id="stop62" />
+          </linearGradient>
+          <path
+             d="m 242.458,406.137 c 9.742,0 18.14,-5.74 22.008,-14.022 H 220.45 c 3.867,8.281 12.265,14.022 22.008,14.022 z"
+             id="path65"
+             inkscape:connector-curvature="0"
+             style="fill:url(#SVGID_3_);stroke-width:3.06178" />
+        </g>
         <g
-           style="stroke-width:1.73496"
+           id="g75"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
-           id="g75">
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path69"
-   d="m 214.679,383.845 h 3.552 48.51 6.373 4.841 c 0.034,-0.633 0.053,-1.271 0.053,-1.913 0,-0.694 -0.025,-1.383 -0.064,-2.068 h -4.829 -6.373 -48.51 -3.802 -7.517 c -0.039,0.686 -0.064,1.374 -0.064,2.068 0,0.643 0.019,1.28 0.052,1.913 z" />
-
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path71"
-   d="m 220.308,371.594 h -12.037 c -0.396,1.297 -0.65,2.627 -0.896,3.982 h 6.2 5.279 47.035 6.662 4.761 c -0.245,-1.355 -0.562,-2.686 -0.957,-3.982" />
-
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path73"
-   d="m 272.739,388.133 h -6.661 -47.035 -5.027 -6.642 c 0.239,1.354 0.51,2.685 0.899,3.981 h 12.222 44.129 7.244 4.719 c 0.389,-1.297 0.701,-2.627 0.941,-3.981 z" />
-
-</g>
+           style="stroke-width:1.73496">
+          <path
+             d="m 214.679,383.845 h 3.552 48.51 6.373 4.841 c 0.034,-0.633 0.053,-1.271 0.053,-1.913 0,-0.694 -0.025,-1.383 -0.064,-2.068 h -4.829 -6.373 -48.51 -3.802 -7.517 c -0.039,0.686 -0.064,1.374 -0.064,2.068 0,0.643 0.019,1.28 0.052,1.913 z"
+             id="path69"
+             inkscape:connector-curvature="0"
+             style="fill:#ffffff;stroke-width:3.06178" />
+          <path
+             d="m 220.308,371.594 h -12.037 c -0.396,1.297 -0.65,2.627 -0.896,3.982 h 6.2 5.279 47.035 6.662 4.761 c -0.245,-1.355 -0.562,-2.686 -0.957,-3.982"
+             id="path71"
+             inkscape:connector-curvature="0"
+             style="fill:#ffffff;stroke-width:3.06178" />
+          <path
+             d="m 272.739,388.133 h -6.661 -47.035 -5.027 -6.642 c 0.239,1.354 0.51,2.685 0.899,3.981 h 12.222 44.129 7.244 4.719 c 0.389,-1.297 0.701,-2.627 0.941,-3.981 z"
+             id="path73"
+             inkscape:connector-curvature="0"
+             style="fill:#ffffff;stroke-width:3.06178" />
+        </g>
       </g>
     </g>
   </g>
diff --git a/packages/org.eclipse.epp.package.rcp/eclipse48@2x.png b/packages/org.eclipse.epp.package.rcp/eclipse48@2x.png
index 3b8d1cc..bff9aef 100644
--- a/packages/org.eclipse.epp.package.rcp/eclipse48@2x.png
+++ b/packages/org.eclipse.epp.package.rcp/eclipse48@2x.png
Binary files differ
diff --git a/packages/org.eclipse.epp.package.rust/eclipse32.png b/packages/org.eclipse.epp.package.rust/eclipse32.png
index 55d401d..eae69ee 100644
--- a/packages/org.eclipse.epp.package.rust/eclipse32.png
+++ b/packages/org.eclipse.epp.package.rust/eclipse32.png
Binary files differ
diff --git a/packages/org.eclipse.epp.package.rust/eclipse32.svg b/packages/org.eclipse.epp.package.rust/eclipse32.svg
index 740e03c..ccc3e5e 100644
--- a/packages/org.eclipse.epp.package.rust/eclipse32.svg
+++ b/packages/org.eclipse.epp.package.rust/eclipse32.svg
@@ -7,9 +7,9 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:export-ydpi="384"
-   inkscape:export-xdpi="384"
-   inkscape:export-filename="/Users/d021678/git/org.eclipse.epp.packages/packages/org.eclipse.epp.package.rust/eclipse32_2x.png"
+   inkscape:export-ydpi="96"
+   inkscape:export-xdpi="96"
+   inkscape:export-filename="/Users/d021678/git/org.eclipse.epp.packages/packages/org.eclipse.epp.package.java/eclipse32.png"
    inkscape:version="1.0rc1 (09960d6, 2020-04-09)"
    sodipodi:docname="eclipse32.svg"
    viewBox="0 0 32 32"
@@ -85,13 +85,13 @@
      inkscape:window-maximized="0"
      inkscape:window-y="23"
      inkscape:window-x="0"
-     inkscape:cy="7.0588235"
-     inkscape:cx="-2.1176471"
-     inkscape:zoom="8.5"
-     showgrid="false"
+     inkscape:cy="16"
+     inkscape:cx="16"
+     inkscape:zoom="25.84375"
+     showgrid="true"
      id="namedview2261"
-     inkscape:window-height="954"
-     inkscape:window-width="1305"
+     inkscape:window-height="1035"
+     inkscape:window-width="1486"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0"
      guidetolerance="10"
@@ -99,13 +99,16 @@
      objecttolerance="10"
      borderopacity="1"
      bordercolor="#666666"
-     pagecolor="#ffffff" />
+     pagecolor="#ffffff"
+     inkscape:document-rotation="0"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true" />
   <g
      id="g2267"
      inkscape:label="Image"
      inkscape:groupmode="layer">
     <g
-       transform="matrix(0.69565218,0,0,0.69565218,26.95397,22.85109)"
+       transform="matrix(0.69565218,0,0,0.69565218,26.95397,22.264755)"
        id="g3036">
       <g
          id="g139"
@@ -120,19 +123,17 @@
            style="stroke-width:1.73496"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
            id="g38">
-	<path
-   style="fill:#2c2255;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path34"
-   d="m 213.736,375.576 h -6.361 c -0.233,1.397 -0.391,2.824 -0.463,4.287 h 7.561 3.792 54.741 4.998 c -0.073,-1.463 -0.232,-2.89 -0.467,-4.287" />
-
-	<path
-   style="fill:#2c2255;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path36"
-   d="m 206.912,383.845 c 0.072,1.464 0.23,2.891 0.463,4.288 h 6.613 5.012 53.558 4.979 c 0.234,-1.397 0.395,-2.824 0.467,-4.288" />
-
-</g>
+          <path
+             style="fill:#2c2255;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path34"
+             d="m 213.736,375.576 h -6.361 c -0.233,1.397 -0.391,2.824 -0.463,4.287 h 7.561 3.792 54.741 4.998 c -0.073,-1.463 -0.232,-2.89 -0.467,-4.287" />
+          <path
+             style="fill:#2c2255;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path36"
+             d="m 206.912,383.845 c 0.072,1.464 0.23,2.891 0.463,4.288 h 6.613 5.012 53.558 4.979 c 0.234,-1.397 0.395,-2.824 0.467,-4.288" />
+        </g>
         <path
            style="fill:#2c2255;stroke-width:0.983117"
            inkscape:connector-curvature="0"
@@ -142,116 +143,100 @@
            style="stroke-width:1.73496"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
            id="g44">
-	<path
-   style="fill:#f7941e;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path42"
-   d="m 204.797,381.855 c 0,-18.78 14.104,-34.384 32.453,-37.128 -0.455,-0.017 -0.913,-0.035 -1.372,-0.035 -20.591,0 -37.284,16.639 -37.284,37.163 0,20.524 16.693,37.163 37.284,37.163 0.461,0 0.918,-0.019 1.375,-0.034 -18.351,-2.744 -32.456,-18.348 -32.456,-37.129 z" />
-
-</g>
+          <path
+             style="fill:#f7941e;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path42"
+             d="m 204.797,381.855 c 0,-18.78 14.104,-34.384 32.453,-37.128 -0.455,-0.017 -0.913,-0.035 -1.372,-0.035 -20.591,0 -37.284,16.639 -37.284,37.163 0,20.524 16.693,37.163 37.284,37.163 0.461,0 0.918,-0.019 1.375,-0.034 -18.351,-2.744 -32.456,-18.348 -32.456,-37.129 z" />
+        </g>
         <g
            style="stroke-width:1.73496"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
            id="g67">
-	<linearGradient
-   y2="368.73721"
-   x2="242.4575"
-   y1="422.2832"
-   x1="242.4575"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_1_">
-		<stop
-   id="stop46"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop48"
-   style="stop-color:#2C2255"
-   offset="0.872" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_1_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path51"
-   d="m 266.65,379.863 c -0.119,-1.47 -0.366,-2.903 -0.736,-4.287 h -46.913 c -0.37,1.384 -0.617,2.817 -0.737,4.287 z" />
-
-	<linearGradient
-   y2="368.7338"
-   x2="242.4575"
-   y1="422.29199"
-   x1="242.4575"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_2_">
-		<stop
-   id="stop53"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop55"
-   style="stop-color:#2C2255"
-   offset="0.872" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_2_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path58"
-   d="m 266.65,383.845 h -48.386 c 0.12,1.471 0.366,2.903 0.736,4.288 h 46.914 c 0.371,-1.385 0.617,-2.818 0.736,-4.288 z" />
-
-	<linearGradient
-   y2="368.73639"
-   x2="242.45799"
-   y1="422.2861"
-   x1="242.45799"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_3_">
-		<stop
-   id="stop60"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop62"
-   style="stop-color:#2C2255"
-   offset="0.8631" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_3_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path65"
-   d="m 242.458,406.137 c 9.742,0 18.14,-5.74 22.008,-14.022 H 220.45 c 3.867,8.281 12.265,14.022 22.008,14.022 z" />
-
-</g>
+          <linearGradient
+             y2="368.73721"
+             x2="242.4575"
+             y1="422.2832"
+             x1="242.4575"
+             gradientUnits="userSpaceOnUse"
+             id="SVGID_1_">
+            <stop
+               id="stop46"
+               style="stop-color:#473788"
+               offset="0.3033" />
+            <stop
+               id="stop48"
+               style="stop-color:#2C2255"
+               offset="0.872" />
+          </linearGradient>
+          <path
+             style="fill:url(#SVGID_1_);stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path51"
+             d="m 266.65,379.863 c -0.119,-1.47 -0.366,-2.903 -0.736,-4.287 h -46.913 c -0.37,1.384 -0.617,2.817 -0.737,4.287 z" />
+          <linearGradient
+             y2="368.7338"
+             x2="242.4575"
+             y1="422.29199"
+             x1="242.4575"
+             gradientUnits="userSpaceOnUse"
+             id="SVGID_2_">
+            <stop
+               id="stop53"
+               style="stop-color:#473788"
+               offset="0.3033" />
+            <stop
+               id="stop55"
+               style="stop-color:#2C2255"
+               offset="0.872" />
+          </linearGradient>
+          <path
+             style="fill:url(#SVGID_2_);stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path58"
+             d="m 266.65,383.845 h -48.386 c 0.12,1.471 0.366,2.903 0.736,4.288 h 46.914 c 0.371,-1.385 0.617,-2.818 0.736,-4.288 z" />
+          <linearGradient
+             y2="368.73639"
+             x2="242.45799"
+             y1="422.2861"
+             x1="242.45799"
+             gradientUnits="userSpaceOnUse"
+             id="SVGID_3_">
+            <stop
+               id="stop60"
+               style="stop-color:#473788"
+               offset="0.3033" />
+            <stop
+               id="stop62"
+               style="stop-color:#2C2255"
+               offset="0.8631" />
+          </linearGradient>
+          <path
+             style="fill:url(#SVGID_3_);stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path65"
+             d="m 242.458,406.137 c 9.742,0 18.14,-5.74 22.008,-14.022 H 220.45 c 3.867,8.281 12.265,14.022 22.008,14.022 z" />
+        </g>
         <g
            style="stroke-width:1.73496"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
            id="g75">
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path69"
-   d="m 214.679,383.845 h 3.552 48.51 6.373 4.841 c 0.034,-0.633 0.053,-1.271 0.053,-1.913 0,-0.694 -0.025,-1.383 -0.064,-2.068 h -4.829 -6.373 -48.51 -3.802 -7.517 c -0.039,0.686 -0.064,1.374 -0.064,2.068 0,0.643 0.019,1.28 0.052,1.913 z" />
-
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path71"
-   d="m 220.308,371.594 h -12.037 c -0.396,1.297 -0.65,2.627 -0.896,3.982 h 6.2 5.279 47.035 6.662 4.761 c -0.245,-1.355 -0.562,-2.686 -0.957,-3.982" />
-
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path73"
-   d="m 272.739,388.133 h -6.661 -47.035 -5.027 -6.642 c 0.239,1.354 0.51,2.685 0.899,3.981 h 12.222 44.129 7.244 4.719 c 0.389,-1.297 0.701,-2.627 0.941,-3.981 z" />
-
-</g>
+          <path
+             style="fill:#ffffff;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path69"
+             d="m 214.679,383.845 h 3.552 48.51 6.373 4.841 c 0.034,-0.633 0.053,-1.271 0.053,-1.913 0,-0.694 -0.025,-1.383 -0.064,-2.068 h -4.829 -6.373 -48.51 -3.802 -7.517 c -0.039,0.686 -0.064,1.374 -0.064,2.068 0,0.643 0.019,1.28 0.052,1.913 z" />
+          <path
+             style="fill:#ffffff;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path71"
+             d="m 220.308,371.594 h -12.037 c -0.396,1.297 -0.65,2.627 -0.896,3.982 h 6.2 5.279 47.035 6.662 4.761 c -0.245,-1.355 -0.562,-2.686 -0.957,-3.982" />
+          <path
+             style="fill:#ffffff;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path73"
+             d="m 272.739,388.133 h -6.661 -47.035 -5.027 -6.642 c 0.239,1.354 0.51,2.685 0.899,3.981 h 12.222 44.129 7.244 4.719 c 0.389,-1.297 0.701,-2.627 0.941,-3.981 z" />
+        </g>
       </g>
     </g>
   </g>
diff --git a/packages/org.eclipse.epp.package.rust/eclipse32@2x.png b/packages/org.eclipse.epp.package.rust/eclipse32@2x.png
index d44f785..3307f99 100644
--- a/packages/org.eclipse.epp.package.rust/eclipse32@2x.png
+++ b/packages/org.eclipse.epp.package.rust/eclipse32@2x.png
Binary files differ
diff --git a/packages/org.eclipse.epp.package.rust/eclipse48.png b/packages/org.eclipse.epp.package.rust/eclipse48.png
index bff9aef..de9928f 100644
--- a/packages/org.eclipse.epp.package.rust/eclipse48.png
+++ b/packages/org.eclipse.epp.package.rust/eclipse48.png
Binary files differ
diff --git a/packages/org.eclipse.epp.package.rust/eclipse48.svg b/packages/org.eclipse.epp.package.rust/eclipse48.svg
index 099b7d2..80513d7 100644
--- a/packages/org.eclipse.epp.package.rust/eclipse48.svg
+++ b/packages/org.eclipse.epp.package.rust/eclipse48.svg
@@ -7,13 +7,16 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:version="1.0rc1 (09960d6, 2020-04-09)"
-   sodipodi:docname="eclipse48.svg"
-   viewBox="0 0 48 48"
-   height="48"
-   width="48"
+   inkscape:export-ydpi="192"
+   inkscape:export-xdpi="192"
+   inkscape:export-filename="/Users/d021678/git/org.eclipse.epp.packages/packages/org.eclipse.epp.package.java/eclipse48@2x.png"
+   version="1.1"
    id="svg1412"
-   version="1.1">
+   width="48"
+   height="48"
+   viewBox="0 0 48 48"
+   sodipodi:docname="eclipse48.svg"
+   inkscape:version="1.0rc1 (09960d6, 2020-04-09)">
   <metadata
      id="metadata1418">
     <rdf:RDF>
@@ -28,226 +31,209 @@
   <defs
      id="defs1416">
     <linearGradient
-       y2="368.73721"
-       x2="242.4575"
+       id="linearGradient3462"
+       gradientUnits="userSpaceOnUse"
+       x1="242.4575"
        y1="422.2832"
-       x1="242.4575"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3462">
-      <stop
-         id="stop46-2"
-         style="stop-color:#473788"
-         offset="0.3033" />
-      <stop
-         id="stop48-6"
-         style="stop-color:#2C2255"
-         offset="0.872" />
-    </linearGradient>
-    <linearGradient
-       y2="368.7338"
        x2="242.4575"
-       y1="422.29199"
-       x1="242.4575"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3466">
+       y2="368.73721">
       <stop
-         id="stop53-6"
+         offset="0.3033"
          style="stop-color:#473788"
-         offset="0.3033" />
+         id="stop46-2" />
       <stop
-         id="stop55-8"
+         offset="0.872"
          style="stop-color:#2C2255"
-         offset="0.872" />
+         id="stop48-6" />
     </linearGradient>
     <linearGradient
-       y2="368.73639"
-       x2="242.45799"
-       y1="422.2861"
-       x1="242.45799"
+       id="linearGradient3466"
        gradientUnits="userSpaceOnUse"
-       id="linearGradient3470">
+       x1="242.4575"
+       y1="422.29199"
+       x2="242.4575"
+       y2="368.7338">
       <stop
-         id="stop60-3"
+         offset="0.3033"
          style="stop-color:#473788"
-         offset="0.3033" />
+         id="stop53-6" />
       <stop
-         id="stop62-4"
+         offset="0.872"
          style="stop-color:#2C2255"
-         offset="0.8631" />
+         id="stop55-8" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3470"
+       gradientUnits="userSpaceOnUse"
+       x1="242.45799"
+       y1="422.2861"
+       x2="242.45799"
+       y2="368.73639">
+      <stop
+         offset="0.3033"
+         style="stop-color:#473788"
+         id="stop60-3" />
+      <stop
+         offset="0.8631"
+         style="stop-color:#2C2255"
+         id="stop62-4" />
     </linearGradient>
   </defs>
   <sodipodi:namedview
-     inkscape:current-layer="g1420"
-     inkscape:window-maximized="0"
-     inkscape:window-y="23"
-     inkscape:window-x="0"
-     inkscape:cy="24"
-     inkscape:cx="-3.1764706"
-     inkscape:zoom="5.6666667"
-     showgrid="false"
-     id="namedview1414"
-     inkscape:window-height="910"
-     inkscape:window-width="1310"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     guidetolerance="10"
-     gridtolerance="10"
-     objecttolerance="10"
-     borderopacity="1"
+     inkscape:document-rotation="0"
+     pagecolor="#ffffff"
      bordercolor="#666666"
-     pagecolor="#ffffff" />
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1416"
+     inkscape:window-height="1035"
+     id="namedview1414"
+     showgrid="false"
+     inkscape:zoom="5.6666667"
+     inkscape:cx="-3.1764706"
+     inkscape:cy="24"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g1420" />
   <g
-     id="g1420"
+     inkscape:groupmode="layer"
      inkscape:label="Image"
-     inkscape:groupmode="layer">
+     id="g1420">
     <g
-       transform="matrix(0.99893516,0,0,0.99893516,47.95795,3.4517308)"
-       id="g2207">
+       id="g2207"
+       transform="matrix(0.99893516,0,0,0.99893516,47.95795,3.4517308)">
       <g
-         id="g139"
+         style="stroke-width:0.983117"
          transform="matrix(1.0678037,0,0,1.0572816,-79.316579,-1.6972965)"
-         style="stroke-width:0.983117">
+         id="g139">
         <path
-           style="fill:#2c2255;stroke-width:0.983117"
-           inkscape:connector-curvature="0"
+           d="m 41.680839,26.851877 h -6.90011 c 0.91344,3.13415 2.60886,5.94303 5.09022,8.42496 3.95636,3.95636 8.71509,5.93397 14.27903,5.93397 1.11234,0 2.18954,-0.0827 3.23671,-0.24083 4.19039,-0.63295 7.86002,-2.52726 11.00323,-5.69314 2.49836,-2.48193 4.20568,-5.29081 5.12649,-8.42496 h -2.79982 -4.09462 z"
            id="path32"
-           d="m 41.680839,26.851877 h -6.90011 c 0.91344,3.13415 2.60886,5.94303 5.09022,8.42496 3.95636,3.95636 8.71509,5.93397 14.27903,5.93397 1.11234,0 2.18954,-0.0827 3.23671,-0.24083 4.19039,-0.63295 7.86002,-2.52726 11.00323,-5.69314 2.49836,-2.48193 4.20568,-5.29081 5.12649,-8.42496 h -2.79982 -4.09462 z" />
-        <g
-           style="stroke-width:1.73496"
-           transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
-           id="g38">
-	<path
-   style="fill:#2c2255;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path34"
-   d="m 213.736,375.576 h -6.361 c -0.233,1.397 -0.391,2.824 -0.463,4.287 h 7.561 3.792 54.741 4.998 c -0.073,-1.463 -0.232,-2.89 -0.467,-4.287" />
-
-	<path
-   style="fill:#2c2255;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path36"
-   d="m 206.912,383.845 c 0.072,1.464 0.23,2.891 0.463,4.288 h 6.613 5.012 53.558 4.979 c 0.234,-1.397 0.395,-2.824 0.467,-4.288" />
-
-</g>
-        <path
-           style="fill:#2c2255;stroke-width:0.983117"
            inkscape:connector-curvature="0"
+           style="fill:#2c2255;stroke-width:0.983117" />
+        <g
+           id="g38"
+           transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
+           style="stroke-width:1.73496">
+          <path
+             d="m 213.736,375.576 h -6.361 c -0.233,1.397 -0.391,2.824 -0.463,4.287 h 7.561 3.792 54.741 4.998 c -0.073,-1.463 -0.232,-2.89 -0.467,-4.287"
+             id="path34"
+             inkscape:connector-curvature="0"
+             style="fill:#2c2255;stroke-width:3.06178" />
+          <path
+             d="m 206.912,383.845 c 0.072,1.464 0.23,2.891 0.463,4.288 h 6.613 5.012 53.558 4.979 c 0.234,-1.397 0.395,-2.824 0.467,-4.288"
+             id="path36"
+             inkscape:connector-curvature="0"
+             style="fill:#2c2255;stroke-width:3.06178" />
+        </g>
+        <path
+           d="m 73.517539,15.224207 c -0.92024,-3.14265 -2.62813,-5.9639998 -5.12762,-8.4640598 -3.13528,-3.13585 -6.79414,-5.01713 -10.97093,-5.65008 -1.0568,-0.16035995 -2.14477,-0.24421995 -3.26901,-0.24421995 -5.56394,0 -10.3221,1.96513995 -14.27903,5.89429995 -2.48306,2.49949 -4.17905,5.3214098 -5.09192,8.4640598 z"
            id="path40"
-           d="m 73.517539,15.224207 c -0.92024,-3.14265 -2.62813,-5.9639998 -5.12762,-8.4640598 -3.13528,-3.13585 -6.79414,-5.01713 -10.97093,-5.65008 -1.0568,-0.16035995 -2.14477,-0.24421995 -3.26901,-0.24421995 -5.56394,0 -10.3221,1.96513995 -14.27903,5.89429995 -2.48306,2.49949 -4.17905,5.3214098 -5.09192,8.4640598 z" />
+           inkscape:connector-curvature="0"
+           style="fill:#2c2255;stroke-width:0.983117" />
         <g
-           style="stroke-width:1.73496"
+           id="g44"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
-           id="g44">
-	<path
-   style="fill:#f7941e;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path42"
-   d="m 204.797,381.855 c 0,-18.78 14.104,-34.384 32.453,-37.128 -0.455,-0.017 -0.913,-0.035 -1.372,-0.035 -20.591,0 -37.284,16.639 -37.284,37.163 0,20.524 16.693,37.163 37.284,37.163 0.461,0 0.918,-0.019 1.375,-0.034 -18.351,-2.744 -32.456,-18.348 -32.456,-37.129 z" />
-
-</g>
+           style="stroke-width:1.73496">
+          <path
+             d="m 204.797,381.855 c 0,-18.78 14.104,-34.384 32.453,-37.128 -0.455,-0.017 -0.913,-0.035 -1.372,-0.035 -20.591,0 -37.284,16.639 -37.284,37.163 0,20.524 16.693,37.163 37.284,37.163 0.461,0 0.918,-0.019 1.375,-0.034 -18.351,-2.744 -32.456,-18.348 -32.456,-37.129 z"
+             id="path42"
+             inkscape:connector-curvature="0"
+             style="fill:#f7941e;stroke-width:3.06178" />
+        </g>
         <g
-           style="stroke-width:1.73496"
+           id="g67"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
-           id="g67">
-	<linearGradient
-   y2="368.73721"
-   x2="242.4575"
-   y1="422.2832"
-   x1="242.4575"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_1_">
-		<stop
-   id="stop46"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop48"
-   style="stop-color:#2C2255"
-   offset="0.872" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_1_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path51"
-   d="m 266.65,379.863 c -0.119,-1.47 -0.366,-2.903 -0.736,-4.287 h -46.913 c -0.37,1.384 -0.617,2.817 -0.737,4.287 z" />
-
-	<linearGradient
-   y2="368.7338"
-   x2="242.4575"
-   y1="422.29199"
-   x1="242.4575"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_2_">
-		<stop
-   id="stop53"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop55"
-   style="stop-color:#2C2255"
-   offset="0.872" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_2_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path58"
-   d="m 266.65,383.845 h -48.386 c 0.12,1.471 0.366,2.903 0.736,4.288 h 46.914 c 0.371,-1.385 0.617,-2.818 0.736,-4.288 z" />
-
-	<linearGradient
-   y2="368.73639"
-   x2="242.45799"
-   y1="422.2861"
-   x1="242.45799"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_3_">
-		<stop
-   id="stop60"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop62"
-   style="stop-color:#2C2255"
-   offset="0.8631" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_3_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path65"
-   d="m 242.458,406.137 c 9.742,0 18.14,-5.74 22.008,-14.022 H 220.45 c 3.867,8.281 12.265,14.022 22.008,14.022 z" />
-
-</g>
+           style="stroke-width:1.73496">
+          <linearGradient
+             id="SVGID_1_"
+             gradientUnits="userSpaceOnUse"
+             x1="242.4575"
+             y1="422.2832"
+             x2="242.4575"
+             y2="368.73721">
+            <stop
+               offset="0.3033"
+               style="stop-color:#473788"
+               id="stop46" />
+            <stop
+               offset="0.872"
+               style="stop-color:#2C2255"
+               id="stop48" />
+          </linearGradient>
+          <path
+             d="m 266.65,379.863 c -0.119,-1.47 -0.366,-2.903 -0.736,-4.287 h -46.913 c -0.37,1.384 -0.617,2.817 -0.737,4.287 z"
+             id="path51"
+             inkscape:connector-curvature="0"
+             style="fill:url(#SVGID_1_);stroke-width:3.06178" />
+          <linearGradient
+             id="SVGID_2_"
+             gradientUnits="userSpaceOnUse"
+             x1="242.4575"
+             y1="422.29199"
+             x2="242.4575"
+             y2="368.7338">
+            <stop
+               offset="0.3033"
+               style="stop-color:#473788"
+               id="stop53" />
+            <stop
+               offset="0.872"
+               style="stop-color:#2C2255"
+               id="stop55" />
+          </linearGradient>
+          <path
+             d="m 266.65,383.845 h -48.386 c 0.12,1.471 0.366,2.903 0.736,4.288 h 46.914 c 0.371,-1.385 0.617,-2.818 0.736,-4.288 z"
+             id="path58"
+             inkscape:connector-curvature="0"
+             style="fill:url(#SVGID_2_);stroke-width:3.06178" />
+          <linearGradient
+             id="SVGID_3_"
+             gradientUnits="userSpaceOnUse"
+             x1="242.45799"
+             y1="422.2861"
+             x2="242.45799"
+             y2="368.73639">
+            <stop
+               offset="0.3033"
+               style="stop-color:#473788"
+               id="stop60" />
+            <stop
+               offset="0.8631"
+               style="stop-color:#2C2255"
+               id="stop62" />
+          </linearGradient>
+          <path
+             d="m 242.458,406.137 c 9.742,0 18.14,-5.74 22.008,-14.022 H 220.45 c 3.867,8.281 12.265,14.022 22.008,14.022 z"
+             id="path65"
+             inkscape:connector-curvature="0"
+             style="fill:url(#SVGID_3_);stroke-width:3.06178" />
+        </g>
         <g
-           style="stroke-width:1.73496"
+           id="g75"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
-           id="g75">
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path69"
-   d="m 214.679,383.845 h 3.552 48.51 6.373 4.841 c 0.034,-0.633 0.053,-1.271 0.053,-1.913 0,-0.694 -0.025,-1.383 -0.064,-2.068 h -4.829 -6.373 -48.51 -3.802 -7.517 c -0.039,0.686 -0.064,1.374 -0.064,2.068 0,0.643 0.019,1.28 0.052,1.913 z" />
-
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path71"
-   d="m 220.308,371.594 h -12.037 c -0.396,1.297 -0.65,2.627 -0.896,3.982 h 6.2 5.279 47.035 6.662 4.761 c -0.245,-1.355 -0.562,-2.686 -0.957,-3.982" />
-
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path73"
-   d="m 272.739,388.133 h -6.661 -47.035 -5.027 -6.642 c 0.239,1.354 0.51,2.685 0.899,3.981 h 12.222 44.129 7.244 4.719 c 0.389,-1.297 0.701,-2.627 0.941,-3.981 z" />
-
-</g>
+           style="stroke-width:1.73496">
+          <path
+             d="m 214.679,383.845 h 3.552 48.51 6.373 4.841 c 0.034,-0.633 0.053,-1.271 0.053,-1.913 0,-0.694 -0.025,-1.383 -0.064,-2.068 h -4.829 -6.373 -48.51 -3.802 -7.517 c -0.039,0.686 -0.064,1.374 -0.064,2.068 0,0.643 0.019,1.28 0.052,1.913 z"
+             id="path69"
+             inkscape:connector-curvature="0"
+             style="fill:#ffffff;stroke-width:3.06178" />
+          <path
+             d="m 220.308,371.594 h -12.037 c -0.396,1.297 -0.65,2.627 -0.896,3.982 h 6.2 5.279 47.035 6.662 4.761 c -0.245,-1.355 -0.562,-2.686 -0.957,-3.982"
+             id="path71"
+             inkscape:connector-curvature="0"
+             style="fill:#ffffff;stroke-width:3.06178" />
+          <path
+             d="m 272.739,388.133 h -6.661 -47.035 -5.027 -6.642 c 0.239,1.354 0.51,2.685 0.899,3.981 h 12.222 44.129 7.244 4.719 c 0.389,-1.297 0.701,-2.627 0.941,-3.981 z"
+             id="path73"
+             inkscape:connector-curvature="0"
+             style="fill:#ffffff;stroke-width:3.06178" />
+        </g>
       </g>
     </g>
   </g>
diff --git a/packages/org.eclipse.epp.package.rust/eclipse48@2x.png b/packages/org.eclipse.epp.package.rust/eclipse48@2x.png
index 3b8d1cc..bff9aef 100644
--- a/packages/org.eclipse.epp.package.rust/eclipse48@2x.png
+++ b/packages/org.eclipse.epp.package.rust/eclipse48@2x.png
Binary files differ
diff --git a/packages/org.eclipse.epp.package.scout/eclipse32.png b/packages/org.eclipse.epp.package.scout/eclipse32.png
index 55d401d..eae69ee 100644
--- a/packages/org.eclipse.epp.package.scout/eclipse32.png
+++ b/packages/org.eclipse.epp.package.scout/eclipse32.png
Binary files differ
diff --git a/packages/org.eclipse.epp.package.scout/eclipse32.svg b/packages/org.eclipse.epp.package.scout/eclipse32.svg
index b313757..ccc3e5e 100644
--- a/packages/org.eclipse.epp.package.scout/eclipse32.svg
+++ b/packages/org.eclipse.epp.package.scout/eclipse32.svg
@@ -7,9 +7,9 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:export-ydpi="384"
-   inkscape:export-xdpi="384"
-   inkscape:export-filename="/Users/d021678/git/org.eclipse.epp.packages/packages/org.eclipse.epp.package.scout/eclipse32_2x.png"
+   inkscape:export-ydpi="96"
+   inkscape:export-xdpi="96"
+   inkscape:export-filename="/Users/d021678/git/org.eclipse.epp.packages/packages/org.eclipse.epp.package.java/eclipse32.png"
    inkscape:version="1.0rc1 (09960d6, 2020-04-09)"
    sodipodi:docname="eclipse32.svg"
    viewBox="0 0 32 32"
@@ -85,13 +85,13 @@
      inkscape:window-maximized="0"
      inkscape:window-y="23"
      inkscape:window-x="0"
-     inkscape:cy="7.0588235"
-     inkscape:cx="-2.1176471"
-     inkscape:zoom="8.5"
-     showgrid="false"
+     inkscape:cy="16"
+     inkscape:cx="16"
+     inkscape:zoom="25.84375"
+     showgrid="true"
      id="namedview2261"
-     inkscape:window-height="954"
-     inkscape:window-width="1305"
+     inkscape:window-height="1035"
+     inkscape:window-width="1486"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0"
      guidetolerance="10"
@@ -99,13 +99,16 @@
      objecttolerance="10"
      borderopacity="1"
      bordercolor="#666666"
-     pagecolor="#ffffff" />
+     pagecolor="#ffffff"
+     inkscape:document-rotation="0"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true" />
   <g
      id="g2267"
      inkscape:label="Image"
      inkscape:groupmode="layer">
     <g
-       transform="matrix(0.69565218,0,0,0.69565218,26.95397,22.85109)"
+       transform="matrix(0.69565218,0,0,0.69565218,26.95397,22.264755)"
        id="g3036">
       <g
          id="g139"
@@ -120,19 +123,17 @@
            style="stroke-width:1.73496"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
            id="g38">
-	<path
-   style="fill:#2c2255;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path34"
-   d="m 213.736,375.576 h -6.361 c -0.233,1.397 -0.391,2.824 -0.463,4.287 h 7.561 3.792 54.741 4.998 c -0.073,-1.463 -0.232,-2.89 -0.467,-4.287" />
-
-	<path
-   style="fill:#2c2255;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path36"
-   d="m 206.912,383.845 c 0.072,1.464 0.23,2.891 0.463,4.288 h 6.613 5.012 53.558 4.979 c 0.234,-1.397 0.395,-2.824 0.467,-4.288" />
-
-</g>
+          <path
+             style="fill:#2c2255;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path34"
+             d="m 213.736,375.576 h -6.361 c -0.233,1.397 -0.391,2.824 -0.463,4.287 h 7.561 3.792 54.741 4.998 c -0.073,-1.463 -0.232,-2.89 -0.467,-4.287" />
+          <path
+             style="fill:#2c2255;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path36"
+             d="m 206.912,383.845 c 0.072,1.464 0.23,2.891 0.463,4.288 h 6.613 5.012 53.558 4.979 c 0.234,-1.397 0.395,-2.824 0.467,-4.288" />
+        </g>
         <path
            style="fill:#2c2255;stroke-width:0.983117"
            inkscape:connector-curvature="0"
@@ -142,116 +143,100 @@
            style="stroke-width:1.73496"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
            id="g44">
-	<path
-   style="fill:#f7941e;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path42"
-   d="m 204.797,381.855 c 0,-18.78 14.104,-34.384 32.453,-37.128 -0.455,-0.017 -0.913,-0.035 -1.372,-0.035 -20.591,0 -37.284,16.639 -37.284,37.163 0,20.524 16.693,37.163 37.284,37.163 0.461,0 0.918,-0.019 1.375,-0.034 -18.351,-2.744 -32.456,-18.348 -32.456,-37.129 z" />
-
-</g>
+          <path
+             style="fill:#f7941e;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path42"
+             d="m 204.797,381.855 c 0,-18.78 14.104,-34.384 32.453,-37.128 -0.455,-0.017 -0.913,-0.035 -1.372,-0.035 -20.591,0 -37.284,16.639 -37.284,37.163 0,20.524 16.693,37.163 37.284,37.163 0.461,0 0.918,-0.019 1.375,-0.034 -18.351,-2.744 -32.456,-18.348 -32.456,-37.129 z" />
+        </g>
         <g
            style="stroke-width:1.73496"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
            id="g67">
-	<linearGradient
-   y2="368.73721"
-   x2="242.4575"
-   y1="422.2832"
-   x1="242.4575"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_1_">
-		<stop
-   id="stop46"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop48"
-   style="stop-color:#2C2255"
-   offset="0.872" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_1_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path51"
-   d="m 266.65,379.863 c -0.119,-1.47 -0.366,-2.903 -0.736,-4.287 h -46.913 c -0.37,1.384 -0.617,2.817 -0.737,4.287 z" />
-
-	<linearGradient
-   y2="368.7338"
-   x2="242.4575"
-   y1="422.29199"
-   x1="242.4575"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_2_">
-		<stop
-   id="stop53"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop55"
-   style="stop-color:#2C2255"
-   offset="0.872" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_2_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path58"
-   d="m 266.65,383.845 h -48.386 c 0.12,1.471 0.366,2.903 0.736,4.288 h 46.914 c 0.371,-1.385 0.617,-2.818 0.736,-4.288 z" />
-
-	<linearGradient
-   y2="368.73639"
-   x2="242.45799"
-   y1="422.2861"
-   x1="242.45799"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_3_">
-		<stop
-   id="stop60"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop62"
-   style="stop-color:#2C2255"
-   offset="0.8631" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_3_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path65"
-   d="m 242.458,406.137 c 9.742,0 18.14,-5.74 22.008,-14.022 H 220.45 c 3.867,8.281 12.265,14.022 22.008,14.022 z" />
-
-</g>
+          <linearGradient
+             y2="368.73721"
+             x2="242.4575"
+             y1="422.2832"
+             x1="242.4575"
+             gradientUnits="userSpaceOnUse"
+             id="SVGID_1_">
+            <stop
+               id="stop46"
+               style="stop-color:#473788"
+               offset="0.3033" />
+            <stop
+               id="stop48"
+               style="stop-color:#2C2255"
+               offset="0.872" />
+          </linearGradient>
+          <path
+             style="fill:url(#SVGID_1_);stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path51"
+             d="m 266.65,379.863 c -0.119,-1.47 -0.366,-2.903 -0.736,-4.287 h -46.913 c -0.37,1.384 -0.617,2.817 -0.737,4.287 z" />
+          <linearGradient
+             y2="368.7338"
+             x2="242.4575"
+             y1="422.29199"
+             x1="242.4575"
+             gradientUnits="userSpaceOnUse"
+             id="SVGID_2_">
+            <stop
+               id="stop53"
+               style="stop-color:#473788"
+               offset="0.3033" />
+            <stop
+               id="stop55"
+               style="stop-color:#2C2255"
+               offset="0.872" />
+          </linearGradient>
+          <path
+             style="fill:url(#SVGID_2_);stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path58"
+             d="m 266.65,383.845 h -48.386 c 0.12,1.471 0.366,2.903 0.736,4.288 h 46.914 c 0.371,-1.385 0.617,-2.818 0.736,-4.288 z" />
+          <linearGradient
+             y2="368.73639"
+             x2="242.45799"
+             y1="422.2861"
+             x1="242.45799"
+             gradientUnits="userSpaceOnUse"
+             id="SVGID_3_">
+            <stop
+               id="stop60"
+               style="stop-color:#473788"
+               offset="0.3033" />
+            <stop
+               id="stop62"
+               style="stop-color:#2C2255"
+               offset="0.8631" />
+          </linearGradient>
+          <path
+             style="fill:url(#SVGID_3_);stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path65"
+             d="m 242.458,406.137 c 9.742,0 18.14,-5.74 22.008,-14.022 H 220.45 c 3.867,8.281 12.265,14.022 22.008,14.022 z" />
+        </g>
         <g
            style="stroke-width:1.73496"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
            id="g75">
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path69"
-   d="m 214.679,383.845 h 3.552 48.51 6.373 4.841 c 0.034,-0.633 0.053,-1.271 0.053,-1.913 0,-0.694 -0.025,-1.383 -0.064,-2.068 h -4.829 -6.373 -48.51 -3.802 -7.517 c -0.039,0.686 -0.064,1.374 -0.064,2.068 0,0.643 0.019,1.28 0.052,1.913 z" />
-
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path71"
-   d="m 220.308,371.594 h -12.037 c -0.396,1.297 -0.65,2.627 -0.896,3.982 h 6.2 5.279 47.035 6.662 4.761 c -0.245,-1.355 -0.562,-2.686 -0.957,-3.982" />
-
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path73"
-   d="m 272.739,388.133 h -6.661 -47.035 -5.027 -6.642 c 0.239,1.354 0.51,2.685 0.899,3.981 h 12.222 44.129 7.244 4.719 c 0.389,-1.297 0.701,-2.627 0.941,-3.981 z" />
-
-</g>
+          <path
+             style="fill:#ffffff;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path69"
+             d="m 214.679,383.845 h 3.552 48.51 6.373 4.841 c 0.034,-0.633 0.053,-1.271 0.053,-1.913 0,-0.694 -0.025,-1.383 -0.064,-2.068 h -4.829 -6.373 -48.51 -3.802 -7.517 c -0.039,0.686 -0.064,1.374 -0.064,2.068 0,0.643 0.019,1.28 0.052,1.913 z" />
+          <path
+             style="fill:#ffffff;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path71"
+             d="m 220.308,371.594 h -12.037 c -0.396,1.297 -0.65,2.627 -0.896,3.982 h 6.2 5.279 47.035 6.662 4.761 c -0.245,-1.355 -0.562,-2.686 -0.957,-3.982" />
+          <path
+             style="fill:#ffffff;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path73"
+             d="m 272.739,388.133 h -6.661 -47.035 -5.027 -6.642 c 0.239,1.354 0.51,2.685 0.899,3.981 h 12.222 44.129 7.244 4.719 c 0.389,-1.297 0.701,-2.627 0.941,-3.981 z" />
+        </g>
       </g>
     </g>
   </g>
diff --git a/packages/org.eclipse.epp.package.scout/eclipse32@2x.png b/packages/org.eclipse.epp.package.scout/eclipse32@2x.png
index d44f785..3307f99 100644
--- a/packages/org.eclipse.epp.package.scout/eclipse32@2x.png
+++ b/packages/org.eclipse.epp.package.scout/eclipse32@2x.png
Binary files differ
diff --git a/packages/org.eclipse.epp.package.scout/eclipse48.png b/packages/org.eclipse.epp.package.scout/eclipse48.png
index bff9aef..de9928f 100644
--- a/packages/org.eclipse.epp.package.scout/eclipse48.png
+++ b/packages/org.eclipse.epp.package.scout/eclipse48.png
Binary files differ
diff --git a/packages/org.eclipse.epp.package.scout/eclipse48.svg b/packages/org.eclipse.epp.package.scout/eclipse48.svg
index 099b7d2..80513d7 100644
--- a/packages/org.eclipse.epp.package.scout/eclipse48.svg
+++ b/packages/org.eclipse.epp.package.scout/eclipse48.svg
@@ -7,13 +7,16 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:version="1.0rc1 (09960d6, 2020-04-09)"
-   sodipodi:docname="eclipse48.svg"
-   viewBox="0 0 48 48"
-   height="48"
-   width="48"
+   inkscape:export-ydpi="192"
+   inkscape:export-xdpi="192"
+   inkscape:export-filename="/Users/d021678/git/org.eclipse.epp.packages/packages/org.eclipse.epp.package.java/eclipse48@2x.png"
+   version="1.1"
    id="svg1412"
-   version="1.1">
+   width="48"
+   height="48"
+   viewBox="0 0 48 48"
+   sodipodi:docname="eclipse48.svg"
+   inkscape:version="1.0rc1 (09960d6, 2020-04-09)">
   <metadata
      id="metadata1418">
     <rdf:RDF>
@@ -28,226 +31,209 @@
   <defs
      id="defs1416">
     <linearGradient
-       y2="368.73721"
-       x2="242.4575"
+       id="linearGradient3462"
+       gradientUnits="userSpaceOnUse"
+       x1="242.4575"
        y1="422.2832"
-       x1="242.4575"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3462">
-      <stop
-         id="stop46-2"
-         style="stop-color:#473788"
-         offset="0.3033" />
-      <stop
-         id="stop48-6"
-         style="stop-color:#2C2255"
-         offset="0.872" />
-    </linearGradient>
-    <linearGradient
-       y2="368.7338"
        x2="242.4575"
-       y1="422.29199"
-       x1="242.4575"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3466">
+       y2="368.73721">
       <stop
-         id="stop53-6"
+         offset="0.3033"
          style="stop-color:#473788"
-         offset="0.3033" />
+         id="stop46-2" />
       <stop
-         id="stop55-8"
+         offset="0.872"
          style="stop-color:#2C2255"
-         offset="0.872" />
+         id="stop48-6" />
     </linearGradient>
     <linearGradient
-       y2="368.73639"
-       x2="242.45799"
-       y1="422.2861"
-       x1="242.45799"
+       id="linearGradient3466"
        gradientUnits="userSpaceOnUse"
-       id="linearGradient3470">
+       x1="242.4575"
+       y1="422.29199"
+       x2="242.4575"
+       y2="368.7338">
       <stop
-         id="stop60-3"
+         offset="0.3033"
          style="stop-color:#473788"
-         offset="0.3033" />
+         id="stop53-6" />
       <stop
-         id="stop62-4"
+         offset="0.872"
          style="stop-color:#2C2255"
-         offset="0.8631" />
+         id="stop55-8" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3470"
+       gradientUnits="userSpaceOnUse"
+       x1="242.45799"
+       y1="422.2861"
+       x2="242.45799"
+       y2="368.73639">
+      <stop
+         offset="0.3033"
+         style="stop-color:#473788"
+         id="stop60-3" />
+      <stop
+         offset="0.8631"
+         style="stop-color:#2C2255"
+         id="stop62-4" />
     </linearGradient>
   </defs>
   <sodipodi:namedview
-     inkscape:current-layer="g1420"
-     inkscape:window-maximized="0"
-     inkscape:window-y="23"
-     inkscape:window-x="0"
-     inkscape:cy="24"
-     inkscape:cx="-3.1764706"
-     inkscape:zoom="5.6666667"
-     showgrid="false"
-     id="namedview1414"
-     inkscape:window-height="910"
-     inkscape:window-width="1310"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     guidetolerance="10"
-     gridtolerance="10"
-     objecttolerance="10"
-     borderopacity="1"
+     inkscape:document-rotation="0"
+     pagecolor="#ffffff"
      bordercolor="#666666"
-     pagecolor="#ffffff" />
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1416"
+     inkscape:window-height="1035"
+     id="namedview1414"
+     showgrid="false"
+     inkscape:zoom="5.6666667"
+     inkscape:cx="-3.1764706"
+     inkscape:cy="24"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g1420" />
   <g
-     id="g1420"
+     inkscape:groupmode="layer"
      inkscape:label="Image"
-     inkscape:groupmode="layer">
+     id="g1420">
     <g
-       transform="matrix(0.99893516,0,0,0.99893516,47.95795,3.4517308)"
-       id="g2207">
+       id="g2207"
+       transform="matrix(0.99893516,0,0,0.99893516,47.95795,3.4517308)">
       <g
-         id="g139"
+         style="stroke-width:0.983117"
          transform="matrix(1.0678037,0,0,1.0572816,-79.316579,-1.6972965)"
-         style="stroke-width:0.983117">
+         id="g139">
         <path
-           style="fill:#2c2255;stroke-width:0.983117"
-           inkscape:connector-curvature="0"
+           d="m 41.680839,26.851877 h -6.90011 c 0.91344,3.13415 2.60886,5.94303 5.09022,8.42496 3.95636,3.95636 8.71509,5.93397 14.27903,5.93397 1.11234,0 2.18954,-0.0827 3.23671,-0.24083 4.19039,-0.63295 7.86002,-2.52726 11.00323,-5.69314 2.49836,-2.48193 4.20568,-5.29081 5.12649,-8.42496 h -2.79982 -4.09462 z"
            id="path32"
-           d="m 41.680839,26.851877 h -6.90011 c 0.91344,3.13415 2.60886,5.94303 5.09022,8.42496 3.95636,3.95636 8.71509,5.93397 14.27903,5.93397 1.11234,0 2.18954,-0.0827 3.23671,-0.24083 4.19039,-0.63295 7.86002,-2.52726 11.00323,-5.69314 2.49836,-2.48193 4.20568,-5.29081 5.12649,-8.42496 h -2.79982 -4.09462 z" />
-        <g
-           style="stroke-width:1.73496"
-           transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
-           id="g38">
-	<path
-   style="fill:#2c2255;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path34"
-   d="m 213.736,375.576 h -6.361 c -0.233,1.397 -0.391,2.824 -0.463,4.287 h 7.561 3.792 54.741 4.998 c -0.073,-1.463 -0.232,-2.89 -0.467,-4.287" />
-
-	<path
-   style="fill:#2c2255;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path36"
-   d="m 206.912,383.845 c 0.072,1.464 0.23,2.891 0.463,4.288 h 6.613 5.012 53.558 4.979 c 0.234,-1.397 0.395,-2.824 0.467,-4.288" />
-
-</g>
-        <path
-           style="fill:#2c2255;stroke-width:0.983117"
            inkscape:connector-curvature="0"
+           style="fill:#2c2255;stroke-width:0.983117" />
+        <g
+           id="g38"
+           transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
+           style="stroke-width:1.73496">
+          <path
+             d="m 213.736,375.576 h -6.361 c -0.233,1.397 -0.391,2.824 -0.463,4.287 h 7.561 3.792 54.741 4.998 c -0.073,-1.463 -0.232,-2.89 -0.467,-4.287"
+             id="path34"
+             inkscape:connector-curvature="0"
+             style="fill:#2c2255;stroke-width:3.06178" />
+          <path
+             d="m 206.912,383.845 c 0.072,1.464 0.23,2.891 0.463,4.288 h 6.613 5.012 53.558 4.979 c 0.234,-1.397 0.395,-2.824 0.467,-4.288"
+             id="path36"
+             inkscape:connector-curvature="0"
+             style="fill:#2c2255;stroke-width:3.06178" />
+        </g>
+        <path
+           d="m 73.517539,15.224207 c -0.92024,-3.14265 -2.62813,-5.9639998 -5.12762,-8.4640598 -3.13528,-3.13585 -6.79414,-5.01713 -10.97093,-5.65008 -1.0568,-0.16035995 -2.14477,-0.24421995 -3.26901,-0.24421995 -5.56394,0 -10.3221,1.96513995 -14.27903,5.89429995 -2.48306,2.49949 -4.17905,5.3214098 -5.09192,8.4640598 z"
            id="path40"
-           d="m 73.517539,15.224207 c -0.92024,-3.14265 -2.62813,-5.9639998 -5.12762,-8.4640598 -3.13528,-3.13585 -6.79414,-5.01713 -10.97093,-5.65008 -1.0568,-0.16035995 -2.14477,-0.24421995 -3.26901,-0.24421995 -5.56394,0 -10.3221,1.96513995 -14.27903,5.89429995 -2.48306,2.49949 -4.17905,5.3214098 -5.09192,8.4640598 z" />
+           inkscape:connector-curvature="0"
+           style="fill:#2c2255;stroke-width:0.983117" />
         <g
-           style="stroke-width:1.73496"
+           id="g44"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
-           id="g44">
-	<path
-   style="fill:#f7941e;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path42"
-   d="m 204.797,381.855 c 0,-18.78 14.104,-34.384 32.453,-37.128 -0.455,-0.017 -0.913,-0.035 -1.372,-0.035 -20.591,0 -37.284,16.639 -37.284,37.163 0,20.524 16.693,37.163 37.284,37.163 0.461,0 0.918,-0.019 1.375,-0.034 -18.351,-2.744 -32.456,-18.348 -32.456,-37.129 z" />
-
-</g>
+           style="stroke-width:1.73496">
+          <path
+             d="m 204.797,381.855 c 0,-18.78 14.104,-34.384 32.453,-37.128 -0.455,-0.017 -0.913,-0.035 -1.372,-0.035 -20.591,0 -37.284,16.639 -37.284,37.163 0,20.524 16.693,37.163 37.284,37.163 0.461,0 0.918,-0.019 1.375,-0.034 -18.351,-2.744 -32.456,-18.348 -32.456,-37.129 z"
+             id="path42"
+             inkscape:connector-curvature="0"
+             style="fill:#f7941e;stroke-width:3.06178" />
+        </g>
         <g
-           style="stroke-width:1.73496"
+           id="g67"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
-           id="g67">
-	<linearGradient
-   y2="368.73721"
-   x2="242.4575"
-   y1="422.2832"
-   x1="242.4575"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_1_">
-		<stop
-   id="stop46"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop48"
-   style="stop-color:#2C2255"
-   offset="0.872" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_1_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path51"
-   d="m 266.65,379.863 c -0.119,-1.47 -0.366,-2.903 -0.736,-4.287 h -46.913 c -0.37,1.384 -0.617,2.817 -0.737,4.287 z" />
-
-	<linearGradient
-   y2="368.7338"
-   x2="242.4575"
-   y1="422.29199"
-   x1="242.4575"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_2_">
-		<stop
-   id="stop53"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop55"
-   style="stop-color:#2C2255"
-   offset="0.872" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_2_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path58"
-   d="m 266.65,383.845 h -48.386 c 0.12,1.471 0.366,2.903 0.736,4.288 h 46.914 c 0.371,-1.385 0.617,-2.818 0.736,-4.288 z" />
-
-	<linearGradient
-   y2="368.73639"
-   x2="242.45799"
-   y1="422.2861"
-   x1="242.45799"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_3_">
-		<stop
-   id="stop60"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop62"
-   style="stop-color:#2C2255"
-   offset="0.8631" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_3_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path65"
-   d="m 242.458,406.137 c 9.742,0 18.14,-5.74 22.008,-14.022 H 220.45 c 3.867,8.281 12.265,14.022 22.008,14.022 z" />
-
-</g>
+           style="stroke-width:1.73496">
+          <linearGradient
+             id="SVGID_1_"
+             gradientUnits="userSpaceOnUse"
+             x1="242.4575"
+             y1="422.2832"
+             x2="242.4575"
+             y2="368.73721">
+            <stop
+               offset="0.3033"
+               style="stop-color:#473788"
+               id="stop46" />
+            <stop
+               offset="0.872"
+               style="stop-color:#2C2255"
+               id="stop48" />
+          </linearGradient>
+          <path
+             d="m 266.65,379.863 c -0.119,-1.47 -0.366,-2.903 -0.736,-4.287 h -46.913 c -0.37,1.384 -0.617,2.817 -0.737,4.287 z"
+             id="path51"
+             inkscape:connector-curvature="0"
+             style="fill:url(#SVGID_1_);stroke-width:3.06178" />
+          <linearGradient
+             id="SVGID_2_"
+             gradientUnits="userSpaceOnUse"
+             x1="242.4575"
+             y1="422.29199"
+             x2="242.4575"
+             y2="368.7338">
+            <stop
+               offset="0.3033"
+               style="stop-color:#473788"
+               id="stop53" />
+            <stop
+               offset="0.872"
+               style="stop-color:#2C2255"
+               id="stop55" />
+          </linearGradient>
+          <path
+             d="m 266.65,383.845 h -48.386 c 0.12,1.471 0.366,2.903 0.736,4.288 h 46.914 c 0.371,-1.385 0.617,-2.818 0.736,-4.288 z"
+             id="path58"
+             inkscape:connector-curvature="0"
+             style="fill:url(#SVGID_2_);stroke-width:3.06178" />
+          <linearGradient
+             id="SVGID_3_"
+             gradientUnits="userSpaceOnUse"
+             x1="242.45799"
+             y1="422.2861"
+             x2="242.45799"
+             y2="368.73639">
+            <stop
+               offset="0.3033"
+               style="stop-color:#473788"
+               id="stop60" />
+            <stop
+               offset="0.8631"
+               style="stop-color:#2C2255"
+               id="stop62" />
+          </linearGradient>
+          <path
+             d="m 242.458,406.137 c 9.742,0 18.14,-5.74 22.008,-14.022 H 220.45 c 3.867,8.281 12.265,14.022 22.008,14.022 z"
+             id="path65"
+             inkscape:connector-curvature="0"
+             style="fill:url(#SVGID_3_);stroke-width:3.06178" />
+        </g>
         <g
-           style="stroke-width:1.73496"
+           id="g75"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
-           id="g75">
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path69"
-   d="m 214.679,383.845 h 3.552 48.51 6.373 4.841 c 0.034,-0.633 0.053,-1.271 0.053,-1.913 0,-0.694 -0.025,-1.383 -0.064,-2.068 h -4.829 -6.373 -48.51 -3.802 -7.517 c -0.039,0.686 -0.064,1.374 -0.064,2.068 0,0.643 0.019,1.28 0.052,1.913 z" />
-
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path71"
-   d="m 220.308,371.594 h -12.037 c -0.396,1.297 -0.65,2.627 -0.896,3.982 h 6.2 5.279 47.035 6.662 4.761 c -0.245,-1.355 -0.562,-2.686 -0.957,-3.982" />
-
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path73"
-   d="m 272.739,388.133 h -6.661 -47.035 -5.027 -6.642 c 0.239,1.354 0.51,2.685 0.899,3.981 h 12.222 44.129 7.244 4.719 c 0.389,-1.297 0.701,-2.627 0.941,-3.981 z" />
-
-</g>
+           style="stroke-width:1.73496">
+          <path
+             d="m 214.679,383.845 h 3.552 48.51 6.373 4.841 c 0.034,-0.633 0.053,-1.271 0.053,-1.913 0,-0.694 -0.025,-1.383 -0.064,-2.068 h -4.829 -6.373 -48.51 -3.802 -7.517 c -0.039,0.686 -0.064,1.374 -0.064,2.068 0,0.643 0.019,1.28 0.052,1.913 z"
+             id="path69"
+             inkscape:connector-curvature="0"
+             style="fill:#ffffff;stroke-width:3.06178" />
+          <path
+             d="m 220.308,371.594 h -12.037 c -0.396,1.297 -0.65,2.627 -0.896,3.982 h 6.2 5.279 47.035 6.662 4.761 c -0.245,-1.355 -0.562,-2.686 -0.957,-3.982"
+             id="path71"
+             inkscape:connector-curvature="0"
+             style="fill:#ffffff;stroke-width:3.06178" />
+          <path
+             d="m 272.739,388.133 h -6.661 -47.035 -5.027 -6.642 c 0.239,1.354 0.51,2.685 0.899,3.981 h 12.222 44.129 7.244 4.719 c 0.389,-1.297 0.701,-2.627 0.941,-3.981 z"
+             id="path73"
+             inkscape:connector-curvature="0"
+             style="fill:#ffffff;stroke-width:3.06178" />
+        </g>
       </g>
     </g>
   </g>
diff --git a/packages/org.eclipse.epp.package.scout/eclipse48@2x.png b/packages/org.eclipse.epp.package.scout/eclipse48@2x.png
index 3b8d1cc..bff9aef 100644
--- a/packages/org.eclipse.epp.package.scout/eclipse48@2x.png
+++ b/packages/org.eclipse.epp.package.scout/eclipse48@2x.png
Binary files differ
diff --git a/packages/org.eclipse.epp.package.testing/eclipse32.png b/packages/org.eclipse.epp.package.testing/eclipse32.png
index 55d401d..eae69ee 100644
--- a/packages/org.eclipse.epp.package.testing/eclipse32.png
+++ b/packages/org.eclipse.epp.package.testing/eclipse32.png
Binary files differ
diff --git a/packages/org.eclipse.epp.package.testing/eclipse32.svg b/packages/org.eclipse.epp.package.testing/eclipse32.svg
index cd6ae07..ccc3e5e 100644
--- a/packages/org.eclipse.epp.package.testing/eclipse32.svg
+++ b/packages/org.eclipse.epp.package.testing/eclipse32.svg
@@ -7,9 +7,9 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:export-ydpi="384"
-   inkscape:export-xdpi="384"
-   inkscape:export-filename="/Users/d021678/git/org.eclipse.epp.packages/packages/org.eclipse.epp.package.testing/eclipse32_2x.png"
+   inkscape:export-ydpi="96"
+   inkscape:export-xdpi="96"
+   inkscape:export-filename="/Users/d021678/git/org.eclipse.epp.packages/packages/org.eclipse.epp.package.java/eclipse32.png"
    inkscape:version="1.0rc1 (09960d6, 2020-04-09)"
    sodipodi:docname="eclipse32.svg"
    viewBox="0 0 32 32"
@@ -85,13 +85,13 @@
      inkscape:window-maximized="0"
      inkscape:window-y="23"
      inkscape:window-x="0"
-     inkscape:cy="7.0588235"
-     inkscape:cx="-2.1176471"
-     inkscape:zoom="8.5"
-     showgrid="false"
+     inkscape:cy="16"
+     inkscape:cx="16"
+     inkscape:zoom="25.84375"
+     showgrid="true"
      id="namedview2261"
-     inkscape:window-height="954"
-     inkscape:window-width="1305"
+     inkscape:window-height="1035"
+     inkscape:window-width="1486"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0"
      guidetolerance="10"
@@ -99,13 +99,16 @@
      objecttolerance="10"
      borderopacity="1"
      bordercolor="#666666"
-     pagecolor="#ffffff" />
+     pagecolor="#ffffff"
+     inkscape:document-rotation="0"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true" />
   <g
      id="g2267"
      inkscape:label="Image"
      inkscape:groupmode="layer">
     <g
-       transform="matrix(0.69565218,0,0,0.69565218,26.95397,22.85109)"
+       transform="matrix(0.69565218,0,0,0.69565218,26.95397,22.264755)"
        id="g3036">
       <g
          id="g139"
@@ -120,19 +123,17 @@
            style="stroke-width:1.73496"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
            id="g38">
-	<path
-   style="fill:#2c2255;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path34"
-   d="m 213.736,375.576 h -6.361 c -0.233,1.397 -0.391,2.824 -0.463,4.287 h 7.561 3.792 54.741 4.998 c -0.073,-1.463 -0.232,-2.89 -0.467,-4.287" />
-
-	<path
-   style="fill:#2c2255;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path36"
-   d="m 206.912,383.845 c 0.072,1.464 0.23,2.891 0.463,4.288 h 6.613 5.012 53.558 4.979 c 0.234,-1.397 0.395,-2.824 0.467,-4.288" />
-
-</g>
+          <path
+             style="fill:#2c2255;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path34"
+             d="m 213.736,375.576 h -6.361 c -0.233,1.397 -0.391,2.824 -0.463,4.287 h 7.561 3.792 54.741 4.998 c -0.073,-1.463 -0.232,-2.89 -0.467,-4.287" />
+          <path
+             style="fill:#2c2255;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path36"
+             d="m 206.912,383.845 c 0.072,1.464 0.23,2.891 0.463,4.288 h 6.613 5.012 53.558 4.979 c 0.234,-1.397 0.395,-2.824 0.467,-4.288" />
+        </g>
         <path
            style="fill:#2c2255;stroke-width:0.983117"
            inkscape:connector-curvature="0"
@@ -142,116 +143,100 @@
            style="stroke-width:1.73496"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
            id="g44">
-	<path
-   style="fill:#f7941e;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path42"
-   d="m 204.797,381.855 c 0,-18.78 14.104,-34.384 32.453,-37.128 -0.455,-0.017 -0.913,-0.035 -1.372,-0.035 -20.591,0 -37.284,16.639 -37.284,37.163 0,20.524 16.693,37.163 37.284,37.163 0.461,0 0.918,-0.019 1.375,-0.034 -18.351,-2.744 -32.456,-18.348 -32.456,-37.129 z" />
-
-</g>
+          <path
+             style="fill:#f7941e;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path42"
+             d="m 204.797,381.855 c 0,-18.78 14.104,-34.384 32.453,-37.128 -0.455,-0.017 -0.913,-0.035 -1.372,-0.035 -20.591,0 -37.284,16.639 -37.284,37.163 0,20.524 16.693,37.163 37.284,37.163 0.461,0 0.918,-0.019 1.375,-0.034 -18.351,-2.744 -32.456,-18.348 -32.456,-37.129 z" />
+        </g>
         <g
            style="stroke-width:1.73496"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
            id="g67">
-	<linearGradient
-   y2="368.73721"
-   x2="242.4575"
-   y1="422.2832"
-   x1="242.4575"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_1_">
-		<stop
-   id="stop46"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop48"
-   style="stop-color:#2C2255"
-   offset="0.872" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_1_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path51"
-   d="m 266.65,379.863 c -0.119,-1.47 -0.366,-2.903 -0.736,-4.287 h -46.913 c -0.37,1.384 -0.617,2.817 -0.737,4.287 z" />
-
-	<linearGradient
-   y2="368.7338"
-   x2="242.4575"
-   y1="422.29199"
-   x1="242.4575"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_2_">
-		<stop
-   id="stop53"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop55"
-   style="stop-color:#2C2255"
-   offset="0.872" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_2_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path58"
-   d="m 266.65,383.845 h -48.386 c 0.12,1.471 0.366,2.903 0.736,4.288 h 46.914 c 0.371,-1.385 0.617,-2.818 0.736,-4.288 z" />
-
-	<linearGradient
-   y2="368.73639"
-   x2="242.45799"
-   y1="422.2861"
-   x1="242.45799"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_3_">
-		<stop
-   id="stop60"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop62"
-   style="stop-color:#2C2255"
-   offset="0.8631" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_3_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path65"
-   d="m 242.458,406.137 c 9.742,0 18.14,-5.74 22.008,-14.022 H 220.45 c 3.867,8.281 12.265,14.022 22.008,14.022 z" />
-
-</g>
+          <linearGradient
+             y2="368.73721"
+             x2="242.4575"
+             y1="422.2832"
+             x1="242.4575"
+             gradientUnits="userSpaceOnUse"
+             id="SVGID_1_">
+            <stop
+               id="stop46"
+               style="stop-color:#473788"
+               offset="0.3033" />
+            <stop
+               id="stop48"
+               style="stop-color:#2C2255"
+               offset="0.872" />
+          </linearGradient>
+          <path
+             style="fill:url(#SVGID_1_);stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path51"
+             d="m 266.65,379.863 c -0.119,-1.47 -0.366,-2.903 -0.736,-4.287 h -46.913 c -0.37,1.384 -0.617,2.817 -0.737,4.287 z" />
+          <linearGradient
+             y2="368.7338"
+             x2="242.4575"
+             y1="422.29199"
+             x1="242.4575"
+             gradientUnits="userSpaceOnUse"
+             id="SVGID_2_">
+            <stop
+               id="stop53"
+               style="stop-color:#473788"
+               offset="0.3033" />
+            <stop
+               id="stop55"
+               style="stop-color:#2C2255"
+               offset="0.872" />
+          </linearGradient>
+          <path
+             style="fill:url(#SVGID_2_);stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path58"
+             d="m 266.65,383.845 h -48.386 c 0.12,1.471 0.366,2.903 0.736,4.288 h 46.914 c 0.371,-1.385 0.617,-2.818 0.736,-4.288 z" />
+          <linearGradient
+             y2="368.73639"
+             x2="242.45799"
+             y1="422.2861"
+             x1="242.45799"
+             gradientUnits="userSpaceOnUse"
+             id="SVGID_3_">
+            <stop
+               id="stop60"
+               style="stop-color:#473788"
+               offset="0.3033" />
+            <stop
+               id="stop62"
+               style="stop-color:#2C2255"
+               offset="0.8631" />
+          </linearGradient>
+          <path
+             style="fill:url(#SVGID_3_);stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path65"
+             d="m 242.458,406.137 c 9.742,0 18.14,-5.74 22.008,-14.022 H 220.45 c 3.867,8.281 12.265,14.022 22.008,14.022 z" />
+        </g>
         <g
            style="stroke-width:1.73496"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
            id="g75">
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path69"
-   d="m 214.679,383.845 h 3.552 48.51 6.373 4.841 c 0.034,-0.633 0.053,-1.271 0.053,-1.913 0,-0.694 -0.025,-1.383 -0.064,-2.068 h -4.829 -6.373 -48.51 -3.802 -7.517 c -0.039,0.686 -0.064,1.374 -0.064,2.068 0,0.643 0.019,1.28 0.052,1.913 z" />
-
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path71"
-   d="m 220.308,371.594 h -12.037 c -0.396,1.297 -0.65,2.627 -0.896,3.982 h 6.2 5.279 47.035 6.662 4.761 c -0.245,-1.355 -0.562,-2.686 -0.957,-3.982" />
-
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path73"
-   d="m 272.739,388.133 h -6.661 -47.035 -5.027 -6.642 c 0.239,1.354 0.51,2.685 0.899,3.981 h 12.222 44.129 7.244 4.719 c 0.389,-1.297 0.701,-2.627 0.941,-3.981 z" />
-
-</g>
+          <path
+             style="fill:#ffffff;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path69"
+             d="m 214.679,383.845 h 3.552 48.51 6.373 4.841 c 0.034,-0.633 0.053,-1.271 0.053,-1.913 0,-0.694 -0.025,-1.383 -0.064,-2.068 h -4.829 -6.373 -48.51 -3.802 -7.517 c -0.039,0.686 -0.064,1.374 -0.064,2.068 0,0.643 0.019,1.28 0.052,1.913 z" />
+          <path
+             style="fill:#ffffff;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path71"
+             d="m 220.308,371.594 h -12.037 c -0.396,1.297 -0.65,2.627 -0.896,3.982 h 6.2 5.279 47.035 6.662 4.761 c -0.245,-1.355 -0.562,-2.686 -0.957,-3.982" />
+          <path
+             style="fill:#ffffff;stroke-width:3.06178"
+             inkscape:connector-curvature="0"
+             id="path73"
+             d="m 272.739,388.133 h -6.661 -47.035 -5.027 -6.642 c 0.239,1.354 0.51,2.685 0.899,3.981 h 12.222 44.129 7.244 4.719 c 0.389,-1.297 0.701,-2.627 0.941,-3.981 z" />
+        </g>
       </g>
     </g>
   </g>
diff --git a/packages/org.eclipse.epp.package.testing/eclipse32@2x.png b/packages/org.eclipse.epp.package.testing/eclipse32@2x.png
index d44f785..3307f99 100644
--- a/packages/org.eclipse.epp.package.testing/eclipse32@2x.png
+++ b/packages/org.eclipse.epp.package.testing/eclipse32@2x.png
Binary files differ
diff --git a/packages/org.eclipse.epp.package.testing/eclipse48.png b/packages/org.eclipse.epp.package.testing/eclipse48.png
index bff9aef..de9928f 100644
--- a/packages/org.eclipse.epp.package.testing/eclipse48.png
+++ b/packages/org.eclipse.epp.package.testing/eclipse48.png
Binary files differ
diff --git a/packages/org.eclipse.epp.package.testing/eclipse48.svg b/packages/org.eclipse.epp.package.testing/eclipse48.svg
index 099b7d2..80513d7 100644
--- a/packages/org.eclipse.epp.package.testing/eclipse48.svg
+++ b/packages/org.eclipse.epp.package.testing/eclipse48.svg
@@ -7,13 +7,16 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:version="1.0rc1 (09960d6, 2020-04-09)"
-   sodipodi:docname="eclipse48.svg"
-   viewBox="0 0 48 48"
-   height="48"
-   width="48"
+   inkscape:export-ydpi="192"
+   inkscape:export-xdpi="192"
+   inkscape:export-filename="/Users/d021678/git/org.eclipse.epp.packages/packages/org.eclipse.epp.package.java/eclipse48@2x.png"
+   version="1.1"
    id="svg1412"
-   version="1.1">
+   width="48"
+   height="48"
+   viewBox="0 0 48 48"
+   sodipodi:docname="eclipse48.svg"
+   inkscape:version="1.0rc1 (09960d6, 2020-04-09)">
   <metadata
      id="metadata1418">
     <rdf:RDF>
@@ -28,226 +31,209 @@
   <defs
      id="defs1416">
     <linearGradient
-       y2="368.73721"
-       x2="242.4575"
+       id="linearGradient3462"
+       gradientUnits="userSpaceOnUse"
+       x1="242.4575"
        y1="422.2832"
-       x1="242.4575"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3462">
-      <stop
-         id="stop46-2"
-         style="stop-color:#473788"
-         offset="0.3033" />
-      <stop
-         id="stop48-6"
-         style="stop-color:#2C2255"
-         offset="0.872" />
-    </linearGradient>
-    <linearGradient
-       y2="368.7338"
        x2="242.4575"
-       y1="422.29199"
-       x1="242.4575"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3466">
+       y2="368.73721">
       <stop
-         id="stop53-6"
+         offset="0.3033"
          style="stop-color:#473788"
-         offset="0.3033" />
+         id="stop46-2" />
       <stop
-         id="stop55-8"
+         offset="0.872"
          style="stop-color:#2C2255"
-         offset="0.872" />
+         id="stop48-6" />
     </linearGradient>
     <linearGradient
-       y2="368.73639"
-       x2="242.45799"
-       y1="422.2861"
-       x1="242.45799"
+       id="linearGradient3466"
        gradientUnits="userSpaceOnUse"
-       id="linearGradient3470">
+       x1="242.4575"
+       y1="422.29199"
+       x2="242.4575"
+       y2="368.7338">
       <stop
-         id="stop60-3"
+         offset="0.3033"
          style="stop-color:#473788"
-         offset="0.3033" />
+         id="stop53-6" />
       <stop
-         id="stop62-4"
+         offset="0.872"
          style="stop-color:#2C2255"
-         offset="0.8631" />
+         id="stop55-8" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3470"
+       gradientUnits="userSpaceOnUse"
+       x1="242.45799"
+       y1="422.2861"
+       x2="242.45799"
+       y2="368.73639">
+      <stop
+         offset="0.3033"
+         style="stop-color:#473788"
+         id="stop60-3" />
+      <stop
+         offset="0.8631"
+         style="stop-color:#2C2255"
+         id="stop62-4" />
     </linearGradient>
   </defs>
   <sodipodi:namedview
-     inkscape:current-layer="g1420"
-     inkscape:window-maximized="0"
-     inkscape:window-y="23"
-     inkscape:window-x="0"
-     inkscape:cy="24"
-     inkscape:cx="-3.1764706"
-     inkscape:zoom="5.6666667"
-     showgrid="false"
-     id="namedview1414"
-     inkscape:window-height="910"
-     inkscape:window-width="1310"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     guidetolerance="10"
-     gridtolerance="10"
-     objecttolerance="10"
-     borderopacity="1"
+     inkscape:document-rotation="0"
+     pagecolor="#ffffff"
      bordercolor="#666666"
-     pagecolor="#ffffff" />
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1416"
+     inkscape:window-height="1035"
+     id="namedview1414"
+     showgrid="false"
+     inkscape:zoom="5.6666667"
+     inkscape:cx="-3.1764706"
+     inkscape:cy="24"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g1420" />
   <g
-     id="g1420"
+     inkscape:groupmode="layer"
      inkscape:label="Image"
-     inkscape:groupmode="layer">
+     id="g1420">
     <g
-       transform="matrix(0.99893516,0,0,0.99893516,47.95795,3.4517308)"
-       id="g2207">
+       id="g2207"
+       transform="matrix(0.99893516,0,0,0.99893516,47.95795,3.4517308)">
       <g
-         id="g139"
+         style="stroke-width:0.983117"
          transform="matrix(1.0678037,0,0,1.0572816,-79.316579,-1.6972965)"
-         style="stroke-width:0.983117">
+         id="g139">
         <path
-           style="fill:#2c2255;stroke-width:0.983117"
-           inkscape:connector-curvature="0"
+           d="m 41.680839,26.851877 h -6.90011 c 0.91344,3.13415 2.60886,5.94303 5.09022,8.42496 3.95636,3.95636 8.71509,5.93397 14.27903,5.93397 1.11234,0 2.18954,-0.0827 3.23671,-0.24083 4.19039,-0.63295 7.86002,-2.52726 11.00323,-5.69314 2.49836,-2.48193 4.20568,-5.29081 5.12649,-8.42496 h -2.79982 -4.09462 z"
            id="path32"
-           d="m 41.680839,26.851877 h -6.90011 c 0.91344,3.13415 2.60886,5.94303 5.09022,8.42496 3.95636,3.95636 8.71509,5.93397 14.27903,5.93397 1.11234,0 2.18954,-0.0827 3.23671,-0.24083 4.19039,-0.63295 7.86002,-2.52726 11.00323,-5.69314 2.49836,-2.48193 4.20568,-5.29081 5.12649,-8.42496 h -2.79982 -4.09462 z" />
-        <g
-           style="stroke-width:1.73496"
-           transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
-           id="g38">
-	<path
-   style="fill:#2c2255;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path34"
-   d="m 213.736,375.576 h -6.361 c -0.233,1.397 -0.391,2.824 -0.463,4.287 h 7.561 3.792 54.741 4.998 c -0.073,-1.463 -0.232,-2.89 -0.467,-4.287" />
-
-	<path
-   style="fill:#2c2255;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path36"
-   d="m 206.912,383.845 c 0.072,1.464 0.23,2.891 0.463,4.288 h 6.613 5.012 53.558 4.979 c 0.234,-1.397 0.395,-2.824 0.467,-4.288" />
-
-</g>
-        <path
-           style="fill:#2c2255;stroke-width:0.983117"
            inkscape:connector-curvature="0"
+           style="fill:#2c2255;stroke-width:0.983117" />
+        <g
+           id="g38"
+           transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
+           style="stroke-width:1.73496">
+          <path
+             d="m 213.736,375.576 h -6.361 c -0.233,1.397 -0.391,2.824 -0.463,4.287 h 7.561 3.792 54.741 4.998 c -0.073,-1.463 -0.232,-2.89 -0.467,-4.287"
+             id="path34"
+             inkscape:connector-curvature="0"
+             style="fill:#2c2255;stroke-width:3.06178" />
+          <path
+             d="m 206.912,383.845 c 0.072,1.464 0.23,2.891 0.463,4.288 h 6.613 5.012 53.558 4.979 c 0.234,-1.397 0.395,-2.824 0.467,-4.288"
+             id="path36"
+             inkscape:connector-curvature="0"
+             style="fill:#2c2255;stroke-width:3.06178" />
+        </g>
+        <path
+           d="m 73.517539,15.224207 c -0.92024,-3.14265 -2.62813,-5.9639998 -5.12762,-8.4640598 -3.13528,-3.13585 -6.79414,-5.01713 -10.97093,-5.65008 -1.0568,-0.16035995 -2.14477,-0.24421995 -3.26901,-0.24421995 -5.56394,0 -10.3221,1.96513995 -14.27903,5.89429995 -2.48306,2.49949 -4.17905,5.3214098 -5.09192,8.4640598 z"
            id="path40"
-           d="m 73.517539,15.224207 c -0.92024,-3.14265 -2.62813,-5.9639998 -5.12762,-8.4640598 -3.13528,-3.13585 -6.79414,-5.01713 -10.97093,-5.65008 -1.0568,-0.16035995 -2.14477,-0.24421995 -3.26901,-0.24421995 -5.56394,0 -10.3221,1.96513995 -14.27903,5.89429995 -2.48306,2.49949 -4.17905,5.3214098 -5.09192,8.4640598 z" />
+           inkscape:connector-curvature="0"
+           style="fill:#2c2255;stroke-width:0.983117" />
         <g
-           style="stroke-width:1.73496"
+           id="g44"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
-           id="g44">
-	<path
-   style="fill:#f7941e;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path42"
-   d="m 204.797,381.855 c 0,-18.78 14.104,-34.384 32.453,-37.128 -0.455,-0.017 -0.913,-0.035 -1.372,-0.035 -20.591,0 -37.284,16.639 -37.284,37.163 0,20.524 16.693,37.163 37.284,37.163 0.461,0 0.918,-0.019 1.375,-0.034 -18.351,-2.744 -32.456,-18.348 -32.456,-37.129 z" />
-
-</g>
+           style="stroke-width:1.73496">
+          <path
+             d="m 204.797,381.855 c 0,-18.78 14.104,-34.384 32.453,-37.128 -0.455,-0.017 -0.913,-0.035 -1.372,-0.035 -20.591,0 -37.284,16.639 -37.284,37.163 0,20.524 16.693,37.163 37.284,37.163 0.461,0 0.918,-0.019 1.375,-0.034 -18.351,-2.744 -32.456,-18.348 -32.456,-37.129 z"
+             id="path42"
+             inkscape:connector-curvature="0"
+             style="fill:#f7941e;stroke-width:3.06178" />
+        </g>
         <g
-           style="stroke-width:1.73496"
+           id="g67"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
-           id="g67">
-	<linearGradient
-   y2="368.73721"
-   x2="242.4575"
-   y1="422.2832"
-   x1="242.4575"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_1_">
-		<stop
-   id="stop46"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop48"
-   style="stop-color:#2C2255"
-   offset="0.872" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_1_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path51"
-   d="m 266.65,379.863 c -0.119,-1.47 -0.366,-2.903 -0.736,-4.287 h -46.913 c -0.37,1.384 -0.617,2.817 -0.737,4.287 z" />
-
-	<linearGradient
-   y2="368.7338"
-   x2="242.4575"
-   y1="422.29199"
-   x1="242.4575"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_2_">
-		<stop
-   id="stop53"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop55"
-   style="stop-color:#2C2255"
-   offset="0.872" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_2_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path58"
-   d="m 266.65,383.845 h -48.386 c 0.12,1.471 0.366,2.903 0.736,4.288 h 46.914 c 0.371,-1.385 0.617,-2.818 0.736,-4.288 z" />
-
-	<linearGradient
-   y2="368.73639"
-   x2="242.45799"
-   y1="422.2861"
-   x1="242.45799"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_3_">
-		<stop
-   id="stop60"
-   style="stop-color:#473788"
-   offset="0.3033" />
-
-		<stop
-   id="stop62"
-   style="stop-color:#2C2255"
-   offset="0.8631" />
-
-	</linearGradient>
-
-	<path
-   style="fill:url(#SVGID_3_);stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path65"
-   d="m 242.458,406.137 c 9.742,0 18.14,-5.74 22.008,-14.022 H 220.45 c 3.867,8.281 12.265,14.022 22.008,14.022 z" />
-
-</g>
+           style="stroke-width:1.73496">
+          <linearGradient
+             id="SVGID_1_"
+             gradientUnits="userSpaceOnUse"
+             x1="242.4575"
+             y1="422.2832"
+             x2="242.4575"
+             y2="368.73721">
+            <stop
+               offset="0.3033"
+               style="stop-color:#473788"
+               id="stop46" />
+            <stop
+               offset="0.872"
+               style="stop-color:#2C2255"
+               id="stop48" />
+          </linearGradient>
+          <path
+             d="m 266.65,379.863 c -0.119,-1.47 -0.366,-2.903 -0.736,-4.287 h -46.913 c -0.37,1.384 -0.617,2.817 -0.737,4.287 z"
+             id="path51"
+             inkscape:connector-curvature="0"
+             style="fill:url(#SVGID_1_);stroke-width:3.06178" />
+          <linearGradient
+             id="SVGID_2_"
+             gradientUnits="userSpaceOnUse"
+             x1="242.4575"
+             y1="422.29199"
+             x2="242.4575"
+             y2="368.7338">
+            <stop
+               offset="0.3033"
+               style="stop-color:#473788"
+               id="stop53" />
+            <stop
+               offset="0.872"
+               style="stop-color:#2C2255"
+               id="stop55" />
+          </linearGradient>
+          <path
+             d="m 266.65,383.845 h -48.386 c 0.12,1.471 0.366,2.903 0.736,4.288 h 46.914 c 0.371,-1.385 0.617,-2.818 0.736,-4.288 z"
+             id="path58"
+             inkscape:connector-curvature="0"
+             style="fill:url(#SVGID_2_);stroke-width:3.06178" />
+          <linearGradient
+             id="SVGID_3_"
+             gradientUnits="userSpaceOnUse"
+             x1="242.45799"
+             y1="422.2861"
+             x2="242.45799"
+             y2="368.73639">
+            <stop
+               offset="0.3033"
+               style="stop-color:#473788"
+               id="stop60" />
+            <stop
+               offset="0.8631"
+               style="stop-color:#2C2255"
+               id="stop62" />
+          </linearGradient>
+          <path
+             d="m 242.458,406.137 c 9.742,0 18.14,-5.74 22.008,-14.022 H 220.45 c 3.867,8.281 12.265,14.022 22.008,14.022 z"
+             id="path65"
+             inkscape:connector-curvature="0"
+             style="fill:url(#SVGID_3_);stroke-width:3.06178" />
+        </g>
         <g
-           style="stroke-width:1.73496"
+           id="g75"
            transform="matrix(0.56665072,0,0,0.56665072,-83.237883,-195.3398)"
-           id="g75">
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path69"
-   d="m 214.679,383.845 h 3.552 48.51 6.373 4.841 c 0.034,-0.633 0.053,-1.271 0.053,-1.913 0,-0.694 -0.025,-1.383 -0.064,-2.068 h -4.829 -6.373 -48.51 -3.802 -7.517 c -0.039,0.686 -0.064,1.374 -0.064,2.068 0,0.643 0.019,1.28 0.052,1.913 z" />
-
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path71"
-   d="m 220.308,371.594 h -12.037 c -0.396,1.297 -0.65,2.627 -0.896,3.982 h 6.2 5.279 47.035 6.662 4.761 c -0.245,-1.355 -0.562,-2.686 -0.957,-3.982" />
-
-	<path
-   style="fill:#ffffff;stroke-width:3.06178"
-   inkscape:connector-curvature="0"
-   id="path73"
-   d="m 272.739,388.133 h -6.661 -47.035 -5.027 -6.642 c 0.239,1.354 0.51,2.685 0.899,3.981 h 12.222 44.129 7.244 4.719 c 0.389,-1.297 0.701,-2.627 0.941,-3.981 z" />
-
-</g>
+           style="stroke-width:1.73496">
+          <path
+             d="m 214.679,383.845 h 3.552 48.51 6.373 4.841 c 0.034,-0.633 0.053,-1.271 0.053,-1.913 0,-0.694 -0.025,-1.383 -0.064,-2.068 h -4.829 -6.373 -48.51 -3.802 -7.517 c -0.039,0.686 -0.064,1.374 -0.064,2.068 0,0.643 0.019,1.28 0.052,1.913 z"
+             id="path69"
+             inkscape:connector-curvature="0"
+             style="fill:#ffffff;stroke-width:3.06178" />
+          <path
+             d="m 220.308,371.594 h -12.037 c -0.396,1.297 -0.65,2.627 -0.896,3.982 h 6.2 5.279 47.035 6.662 4.761 c -0.245,-1.355 -0.562,-2.686 -0.957,-3.982"
+             id="path71"
+             inkscape:connector-curvature="0"
+             style="fill:#ffffff;stroke-width:3.06178" />
+          <path
+             d="m 272.739,388.133 h -6.661 -47.035 -5.027 -6.642 c 0.239,1.354 0.51,2.685 0.899,3.981 h 12.222 44.129 7.244 4.719 c 0.389,-1.297 0.701,-2.627 0.941,-3.981 z"
+             id="path73"
+             inkscape:connector-curvature="0"
+             style="fill:#ffffff;stroke-width:3.06178" />
+        </g>
       </g>
     </g>
   </g>
diff --git a/packages/org.eclipse.epp.package.testing/eclipse48@2x.png b/packages/org.eclipse.epp.package.testing/eclipse48@2x.png
index 3b8d1cc..bff9aef 100644
--- a/packages/org.eclipse.epp.package.testing/eclipse48@2x.png
+++ b/packages/org.eclipse.epp.package.testing/eclipse48@2x.png
Binary files differ