diff --git a/bundles/org.eclipse.ui.workbench.texteditor/META-INF/MANIFEST.MF b/bundles/org.eclipse.ui.workbench.texteditor/META-INF/MANIFEST.MF
index 1115872cdf15..6b6a3331b656 100644
--- a/bundles/org.eclipse.ui.workbench.texteditor/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.ui.workbench.texteditor/META-INF/MANIFEST.MF
@@ -36,3 +36,4 @@ Require-Bundle:
  org.eclipse.jface.notifications
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Automatic-Module-Name: org.eclipse.ui.workbench.texteditor
+Require-Capability: eclipse.swt;filter:="(image.format=svg)"
diff --git a/bundles/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/case_sensitive.svg b/bundles/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/case_sensitive.svg
new file mode 100644
index 000000000000..964b5e4b2326
--- /dev/null
+++ b/bundles/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/case_sensitive.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   fill="currentColor"
+   version="1.1"
+   id="svg5030"
+   sodipodi:docname="case_sensitive.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   inkscape:export-filename="case_sensitive@2x.png"
+   inkscape:export-xdpi="192"
+   inkscape:export-ydpi="192"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs5034" />
+  <sodipodi:namedview
+     id="namedview5032"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="64.1875"
+     inkscape:cx="4.7984421"
+     inkscape:cy="7.9922103"
+     inkscape:window-width="3440"
+     inkscape:window-height="1369"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg5030" />
+  <path
+     d="M8.85352 11.7021H7.85449L7.03809 9.54297H3.77246L3.00439 11.7021H2L4.9541 4H5.88867L8.85352 11.7021ZM6.74268 8.73193L5.53418 5.4502C5.49479 5.34277 5.4554 5.1709 5.41602 4.93457H5.39453C5.35872 5.15299 5.31755 5.32487 5.271 5.4502L4.07324 8.73193H6.74268Z"
+     id="path5026"
+     style="fill:#797979;fill-opacity:1" />
+  <path
+     d="M13.756 11.7021H12.8752V10.8428H12.8537C12.4706 11.5016 11.9066 11.8311 11.1618 11.8311C10.6139 11.8311 10.1843 11.686 9.87273 11.396C9.56479 11.106 9.41082 10.721 9.41082 10.2412C9.41082 9.21354 10.016 8.61556 11.2262 8.44727L12.8752 8.21631C12.8752 7.28174 12.4974 6.81445 11.7419 6.81445C11.0794 6.81445 10.4815 7.04004 9.94793 7.49121V6.58887C10.4886 6.24512 11.1117 6.07324 11.8171 6.07324C13.1097 6.07324 13.756 6.75716 13.756 8.125V11.7021ZM12.8752 8.91992L11.5485 9.10254C11.1403 9.15983 10.8324 9.26188 10.6247 9.40869C10.417 9.55192 10.3132 9.80794 10.3132 10.1768C10.3132 10.4453 10.4081 10.6655 10.5978 10.8374C10.7912 11.0057 11.0472 11.0898 11.3659 11.0898C11.8027 11.0898 12.1626 10.9377 12.4455 10.6333C12.7319 10.3254 12.8752 9.93685 12.8752 9.46777V8.91992Z"
+     id="path5028"
+     style="fill:#797979;fill-opacity:1" />
+</svg>
diff --git a/bundles/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/close.svg b/bundles/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/close.svg
new file mode 100644
index 000000000000..52721dd522d0
--- /dev/null
+++ b/bundles/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/close.svg
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   fill="currentColor"
+   version="1.1"
+   id="svg134"
+   sodipodi:docname="close.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   inkscape:export-filename="..\..\..\..\..\eclipse-png\org.eclipse.ui.workbench.texteditor\icons\full\elcl16\close@2x.png"
+   inkscape:export-xdpi="192"
+   inkscape:export-ydpi="192"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs138" />
+  <sodipodi:namedview
+     id="namedview136"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="50.375"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:window-width="1920"
+     inkscape:window-height="1009"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg134" />
+  <path
+     fill-rule="evenodd"
+     clip-rule="evenodd"
+     d="M 7.9993683,8.8930873 12.605547,13.5 13.5,12.606913 8.8925574,8 13.5,3.3943501 12.606811,2.5 7.9993683,7.1069132 3.3931894,2.5 2.5,3.3943501 7.106179,8 2.5,12.60565 3.3931894,13.5 Z"
+     id="path132"
+     style="fill:#797979;fill-opacity:1;stroke-width:1.26328" />
+</svg>
diff --git a/bundles/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/close_replace.svg b/bundles/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/close_replace.svg
new file mode 100644
index 000000000000..2def1ee8e4f0
--- /dev/null
+++ b/bundles/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/close_replace.svg
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   fill="currentColor"
+   version="1.1"
+   id="svg7155"
+   sodipodi:docname="close_replace.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   inkscape:export-filename="..\..\..\..\..\eclipse-png\org.eclipse.ui.workbench.texteditor\icons\full\elcl16\close_replace@2x.png"
+   inkscape:export-xdpi="192"
+   inkscape:export-ydpi="192"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs7159" />
+  <sodipodi:namedview
+     id="namedview7157"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="64.1875"
+     inkscape:cx="4.7984421"
+     inkscape:cy="7.9922103"
+     inkscape:window-width="3440"
+     inkscape:window-height="1369"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg7155" />
+  <path
+     fill-rule="evenodd"
+     clip-rule="evenodd"
+     d="M 8.024,9.357 3.667,5 3.047,5.618 7.716,10.285 H 8.334 L 13,5.618 12.381,5 Z"
+     id="path7153"
+     style="fill:#1a1a1a;fill-opacity:1" />
+</svg>
diff --git a/bundles/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/collapseall.svg b/bundles/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/collapseall.svg
new file mode 100644
index 000000000000..3dcb9a830bf6
--- /dev/null
+++ b/bundles/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/collapseall.svg
@@ -0,0 +1,289 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.0 r9654"
+   sodipodi:docname="collapseall.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4883-4"
+       id="linearGradient4889-2"
+       x1="28"
+       y1="1039.3622"
+       x2="28"
+       y2="1049.3622"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9,0,0,0.9,-17.7,103.93622)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4883-4">
+      <stop
+         style="stop-color:#ebf9ff;stop-opacity:1"
+         offset="0"
+         id="stop4885-5" />
+      <stop
+         style="stop-color:#fcffff;stop-opacity:1"
+         offset="1"
+         id="stop4887-5" />
+    </linearGradient>
+    <linearGradient
+       y2="1047.3622"
+       x2="-15"
+       y1="1047.3622"
+       x1="-12"
+       gradientTransform="translate(18,-3)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5062-9"
+       xlink:href="#linearGradient4910-4-4"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4910-4-4">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="0"
+         id="stop4912-8-8" />
+      <stop
+         style="stop-color:#c3e9ff;stop-opacity:1"
+         offset="1"
+         id="stop4914-8-8" />
+    </linearGradient>
+    <linearGradient
+       y2="1045.3622"
+       x2="-11"
+       y1="1042.3622"
+       x1="-11"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4975-2-1"
+       xlink:href="#linearGradient4994-4-7-7"
+       inkscape:collect="always"
+       gradientTransform="translate(18,-3)" />
+    <linearGradient
+       id="linearGradient4994-4-7-7"
+       inkscape:collect="always">
+      <stop
+         id="stop4996-5-4"
+         offset="0"
+         style="stop-color:#c3e9ff;stop-opacity:1" />
+      <stop
+         id="stop4998-5-0"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4883-4-7"
+       id="linearGradient4889-2-1"
+       x1="28"
+       y1="1039.3622"
+       x2="28"
+       y2="1049.3622"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9,0,0,0.9,-15.7,105.93622)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4883-4-7">
+      <stop
+         style="stop-color:#ebf9ff;stop-opacity:1"
+         offset="0"
+         id="stop4885-5-1" />
+      <stop
+         style="stop-color:#fcffff;stop-opacity:1"
+         offset="1"
+         id="stop4887-5-1" />
+    </linearGradient>
+    <linearGradient
+       y2="1043.3622"
+       x2="-11"
+       y1="1042.3622"
+       x1="-11"
+       gradientTransform="translate(22,4)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4970"
+       xlink:href="#linearGradient4989"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient4989">
+      <stop
+         style="stop-color:#c3e9ff;stop-opacity:0.49019608;"
+         offset="0"
+         id="stop4991" />
+      <stop
+         id="stop4995"
+         offset="0.5"
+         style="stop-color:#c3e9ff;stop-opacity:1;" />
+      <stop
+         style="stop-color:#c3e9ff;stop-opacity:0.49019608;"
+         offset="1"
+         id="stop4993" />
+    </linearGradient>
+    <linearGradient
+       y2="1047.3622"
+       x2="-15"
+       y1="1047.3622"
+       x1="-12"
+       gradientTransform="translate(20,-1)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5062-9-5"
+       xlink:href="#linearGradient4910-4-4-2"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4910-4-4-2">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="0"
+         id="stop4912-8-8-7" />
+      <stop
+         style="stop-color:#c3e9ff;stop-opacity:1"
+         offset="1"
+         id="stop4914-8-8-6" />
+    </linearGradient>
+    <linearGradient
+       y2="1045.3622"
+       x2="-11"
+       y1="1042.3622"
+       x1="-11"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4975-2-1-1"
+       xlink:href="#linearGradient4994-4-7-4"
+       inkscape:collect="always"
+       gradientTransform="translate(20,-1)" />
+    <linearGradient
+       id="linearGradient4994-4-7-4"
+       inkscape:collect="always">
+      <stop
+         id="stop4996-5-4-2"
+         offset="0"
+         style="stop-color:#c3e9ff;stop-opacity:1" />
+      <stop
+         id="stop4998-5-0-3"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="9.8506072"
+     inkscape:cy="9.9346296"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1241"
+     inkscape:window-height="809"
+     inkscape:window-x="175"
+     inkscape:window-y="175"
+     inkscape:window-maximized="0"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-global="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3999" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline"
+     transform="translate(0,-1036.3622)">
+    <path
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#a6afc4;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       d="m 2,1038.3622 0,11 11,0 0,-11 z m 1,1 9,0 0,9 -9,0 z"
+       id="rect3997-9-1"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccc"
+       inkscape:export-filename="C:\Users\jmietling\Documents\rect3997-9-1.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <path
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient4889-2);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       d="m 3,1039.3622 8.971875,0 0.02812,9 -8.971875,0 z"
+       id="rect3997-9-1-1"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:url(#linearGradient5062-9);fill-opacity:1;stroke:none;display:inline"
+       d="m 5,1041.3622 0,7 -2,0 0,-9 z"
+       id="rect4853-82-7-6"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:url(#linearGradient4975-2-1);fill-opacity:1;stroke:none;display:inline"
+       d="m 5,1041.3622 7,0 0,-2 -9,0 z"
+       id="rect4853-82-0-1"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#8b96ab;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       d="m 4,1040.3622 0,11 11,0 0,-11 z m 1,1 9,0 0,9 -9,0 z"
+       id="rect3997-9-1-2"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccc"
+       inkscape:export-filename="C:\Users\jmietling\Documents\rect3997-9-1.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <path
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient4889-2-1);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       d="m 5,1041.3622 8.971875,0 0.02812,9 -8.971875,0 z"
+       id="rect3997-9-1-1-2"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:url(#linearGradient4970);fill-opacity:1;stroke:none;display:inline"
+       d="m 8,1047.3622 5,0 c 1,0 1,-1 0,-1 l -5,0 c -1,0 -1,1 0,1 z"
+       id="rect4853-82-0-6-8"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:url(#linearGradient5062-9-5);fill-opacity:1;stroke:none;display:inline"
+       d="m 7,1043.3622 0,7 -2,0 0,-9 z"
+       id="rect4853-82-7-1"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:url(#linearGradient4975-2-1-1);fill-opacity:1;stroke:none;display:inline"
+       d="m 7,1043.3622 7,0 0,-2 -9,0 z"
+       id="rect4853-82-0-6"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <rect
+       style="fill:#01467a;fill-opacity:1;stroke:none;display:inline"
+       id="rect4167-8"
+       width="1"
+       height="7"
+       x="1045.3622"
+       y="-13"
+       transform="matrix(0,1,-1,0,0,0)" />
+  </g>
+</svg>
diff --git a/bundles/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/delete_template.svg b/bundles/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/delete_template.svg
new file mode 100644
index 000000000000..a331a49fa492
--- /dev/null
+++ b/bundles/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/delete_template.svg
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.0 r9654"
+   sodipodi:docname="delete_edit.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4852">
+      <stop
+         style="stop-color:#df2c33;stop-opacity:1"
+         offset="0"
+         id="stop4854" />
+      <stop
+         style="stop-color:#f5817d;stop-opacity:1"
+         offset="1"
+         id="stop4856" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4844">
+      <stop
+         style="stop-color:#c51325;stop-opacity:1;"
+         offset="0"
+         id="stop4846" />
+      <stop
+         style="stop-color:#ca5d49;stop-opacity:1"
+         offset="1"
+         id="stop4848" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4844"
+       id="linearGradient4850"
+       x1="8.6566515"
+       y1="1050.7386"
+       x2="8.6566515"
+       y2="1037.7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(1.962068e-6,-2.1458883e-5)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4852"
+       id="linearGradient4858"
+       x1="4.7528968"
+       y1="1051.0466"
+       x2="4.7528968"
+       y2="1038.5814"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(1.962068e-6,-2.1458883e-5)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.9999996"
+     inkscape:cx="-16.40091"
+     inkscape:cy="-0.10638011"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1241"
+     inkscape:window-height="814"
+     inkscape:window-x="200"
+     inkscape:window-y="572"
+     inkscape:window-maximized="0"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-global="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3999" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline"
+     transform="translate(0,-1036.3622)">
+    <path
+       style="fill:url(#linearGradient4858);fill-opacity:1;stroke:url(#linearGradient4850);stroke-width:0.98060334;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       d="m 13.419292,1038.6553 c -0.468185,-0.4682 -1.221974,-0.4682 -1.690135,-10e-5 l -3.1127968,3.1129 -3.1127723,-3.1128 c -0.4681138,-0.4682 -1.221974,-0.4682 -1.690134,0 l -0.8600555,0.8601 c -0.4681391,0.468 -0.4681272,1.2218 3.66e-5,1.6901 l 3.1127223,3.1128 -3.1127269,3.1127 c -0.4682099,0.4682 -0.468198,1.222 -1.34e-5,1.6902 l 0.8601016,0.8601 c 0.4681344,0.4681 1.2219244,0.4681 1.6901337,0 l 3.1127774,-3.1128 3.1344053,3.1344 c 0.468135,0.4682 1.221925,0.4682 1.690135,0 l 0.860055,-0.86 c 0.46816,-0.4682 0.463458,-1.2173 -3.7e-5,-1.6902 l -3.134406,-3.1344 3.112777,-3.1127 c 0.468181,-0.4683 0.468169,-1.2221 3.4e-5,-1.6902 z"
+       id="rect4043"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="sccccccccssccsccsccss" />
+  </g>
+</svg>
diff --git a/bundles/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/edit_template.svg b/bundles/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/edit_template.svg
new file mode 100644
index 000000000000..edf2530d65b5
--- /dev/null
+++ b/bundles/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/edit_template.svg
@@ -0,0 +1,219 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="write_obj.svg"
+   inkscape:export-filename="C:\Users\jmietling\Documents\rect3997-9-1.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient5300">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop5302" />
+      <stop
+         id="stop5308"
+         offset="0.29405674"
+         style="stop-color:#727272;stop-opacity:1;" />
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1"
+         offset="1"
+         id="stop5304" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5077-5">
+      <stop
+         style="stop-color:#e4cf94;stop-opacity:1"
+         offset="0"
+         id="stop5079-7" />
+      <stop
+         id="stop5087-6"
+         offset="0.32186735"
+         style="stop-color:#ede0ba;stop-opacity:1" />
+      <stop
+         id="stop5085-1"
+         offset="0.64764118"
+         style="stop-color:#c1aa7e;stop-opacity:1" />
+      <stop
+         style="stop-color:#ad8865;stop-opacity:1"
+         offset="1"
+         id="stop5081-8" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4908-52-3-2">
+      <stop
+         style="stop-color:#986443;stop-opacity:1"
+         offset="0"
+         id="stop4910-7-2-7" />
+      <stop
+         style="stop-color:#994f1b;stop-opacity:1"
+         offset="1"
+         id="stop4912-6-2-9" />
+    </linearGradient>
+    <linearGradient
+       y2="1044.6704"
+       x2="-8.7005796"
+       y1="1042.1598"
+       x1="-11.21119"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5173"
+       xlink:href="#linearGradient4908-52-3-2"
+       inkscape:collect="always"
+       gradientTransform="translate(20,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5077-5"
+       id="linearGradient5196"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(4,-1036.3622)"
+       x1="-0.9810437"
+       y1="1047.4242"
+       x2="1.9838035"
+       y2="1050.3188" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5300"
+       id="linearGradient5306"
+       x1="2.65625"
+       y1="1049.3976"
+       x2="4.0822439"
+       y2="1050.5304"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       inkscape:collect="always"
+       id="filter5428">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.22207033"
+         id="feGaussianBlur5430" />
+    </filter>
+    <linearGradient
+       y2="1044.6704"
+       x2="-8.7005796"
+       y1="1042.1598"
+       x1="-11.21119"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5173-2"
+       xlink:href="#linearGradient4908-52-3-2-0"
+       inkscape:collect="always"
+       gradientTransform="translate(20,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4908-52-3-2-0">
+      <stop
+         style="stop-color:#986443;stop-opacity:1"
+         offset="0"
+         id="stop4910-7-2-7-5" />
+      <stop
+         style="stop-color:#994f1b;stop-opacity:1"
+         offset="1"
+         id="stop4912-6-2-9-6" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="15.999999"
+     inkscape:cx="1.7639436"
+     inkscape:cy="11.44607"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1458"
+     inkscape:window-height="814"
+     inkscape:window-x="227"
+     inkscape:window-y="586"
+     inkscape:window-maximized="0"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-global="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3999" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline"
+     transform="translate(0,-1036.3622)">
+    <path
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:none;stroke:#ffffff;stroke-width:3;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;fill-opacity:1"
+       d="m 15.685953,1040.5523 -8.747594,8.7054 -5.461084,2.5938 2.59375,-5.4564 8.663811,-8.7231 c 1.269887,0.6025 2.210467,1.6169 2.951117,2.8807 z"
+       id="path5226-6-14-1-5-4"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:none;stroke:url(#linearGradient5173);stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       d="m 15.685953,1040.5523 -8.747594,8.7054 -5.461084,2.5938 2.59375,-5.4564 8.663811,-8.7231 c 1.269887,0.6025 2.210467,1.6169 2.951117,2.8807 z"
+       id="path5226-6-14-1-5"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffcb72;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       d="m 12.75,1037.6747 -8.6875,8.7188 0.9375,0.9062 8.9375,-8.875 c -0.362696,-0.2963 -0.752826,-0.5438 -1.1875,-0.75 z"
+       id="path5424"
+       inkscape:connector-curvature="0" />
+    <path
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#e5a856;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       d="m 15.3125,1039.956 -8.78125,8.9062 0.40625,0.4063 8.75,-8.7188 c -0.120121,-0.205 -0.24381,-0.4026 -0.375,-0.5937 z"
+       id="path5226-6-14-1-5-2"
+       inkscape:connector-curvature="0" />
+    <path
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#fbbc67;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       d="m 6.536718,1048.8567 -1.548139,-1.5456 8.939717,-8.8821 c 0.52506,0.4288 0.980135,0.9451 1.380966,1.5292 z"
+       id="path5226-6-14-1-5-2-7"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="opacity:0.5;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter5428)"
+       d="m 4.984376,1047.2528 8.937501,-8.8281"
+       id="path5426"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:url(#linearGradient5196);fill-opacity:1;stroke:none;display:inline"
+       d="M 5.40625,8.6875 4.09375,10 2.6875,12.9375 l 1.375,1.28125 -0.03125,0.0625 2.9375,-1.40625 0.75,-0.75 0.1875,-2 L 5.1875,9.96875 c 0,0 0.127199,-0.74275 0.21875,-1.28125 z"
+       id="path5006"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccc"
+       transform="translate(0,1036.3622)" />
+    <path
+       style="fill:url(#linearGradient5306);fill-opacity:1;stroke:none;display:inline"
+       d="m 3.25,1049.1435 c -0.211528,0.024 -0.41079,0.089 -0.5625,0.1562 l -1.21875,2.5625 2.5625,-1.2187 0.03125,-0.062 c 0.121601,-0.3002 0.273127,-0.8318 -0.09375,-1.2188 -0.132606,-0.1402 -0.331591,-0.1963 -0.5,-0.2187 -0.08057,-0.011 -0.138928,-0.01 -0.21875,0 z"
+       id="path5006-1"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/bundles/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/insert_template.svg b/bundles/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/insert_template.svg
new file mode 100644
index 000000000000..d86009d239c3
--- /dev/null
+++ b/bundles/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/insert_template.svg
@@ -0,0 +1,382 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="insert_template.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5135-7"
+       id="linearGradient4873-1"
+       x1="7.8741689"
+       y1="1051.8346"
+       x2="12.016466"
+       y2="1051.8571"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98453773,-1.977903,13.227712)" />
+    <linearGradient
+       id="linearGradient5135-7"
+       inkscape:collect="always">
+      <stop
+         id="stop5137-4"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         style="stop-color:#8499be;stop-opacity:1;"
+         offset="0.32171196"
+         id="stop4271" />
+      <stop
+         style="stop-color:#8095bb;stop-opacity:1;"
+         offset="0.5145241"
+         id="stop4269" />
+      <stop
+         id="stop5139-0"
+         offset="1"
+         style="stop-color:#637aa7;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5141-4"
+       id="linearGradient4875-9"
+       x1="9.6322184"
+       y1="1049.8571"
+       x2="14"
+       y2="1049.8571"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0078688,0,0,0.98453773,-2.0330399,13.196787)" />
+    <linearGradient
+       id="linearGradient5141-4"
+       inkscape:collect="always">
+      <stop
+         id="stop5143-8"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0.29999998"
+         id="stop4265" />
+      <stop
+         id="stop5145-8"
+         offset="1"
+         style="stop-color:#637aa7;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5147-4"
+       id="linearGradient4871-2"
+       x1="11.136922"
+       y1="1047.8571"
+       x2="14"
+       y2="1047.8571"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0067447,0,0,0.98453773,-2.0251632,13.165863)" />
+    <linearGradient
+       id="linearGradient5147-4"
+       inkscape:collect="always">
+      <stop
+         id="stop5149-5"
+         offset="0"
+         style="stop-color:#91a5c7;stop-opacity:1;" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0.1882157"
+         id="stop4263" />
+      <stop
+         id="stop4267"
+         offset="0.35057256"
+         style="stop-color:#d7dde8;stop-opacity:1;" />
+      <stop
+         id="stop5151-5"
+         offset="1"
+         style="stop-color:#637aa7;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4861-1"
+       id="linearGradient4869-17"
+       x1="10.212936"
+       y1="1045.8571"
+       x2="14"
+       y2="1045.8571"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0056205,0,0,0.99226886,-2.0172865,5.045372)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4861-1">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0"
+         id="stop4863-1" />
+      <stop
+         id="stop4261"
+         offset="0.33502904"
+         style="stop-color:#788db5;stop-opacity:1;" />
+      <stop
+         style="stop-color:#637aa7;stop-opacity:1"
+         offset="1"
+         id="stop4865-52" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4877-6"
+       id="linearGradient4867-7"
+       x1="8.1959734"
+       y1="1043.8571"
+       x2="11"
+       y2="1043.8571"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0098434,0,0,0.98453773,-2.0625979,13.104014)" />
+    <linearGradient
+       id="linearGradient4877-6"
+       inkscape:collect="always">
+      <stop
+         id="stop4879-1"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         style="stop-color:#7b90b7;stop-opacity:1;"
+         offset="0.5"
+         id="stop4259" />
+      <stop
+         id="stop4881-4"
+         offset="1"
+         style="stop-color:#5e76a3;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4902-3"
+       id="linearGradient4908-2"
+       x1="10.544736"
+       y1="1038.5779"
+       x2="10.544736"
+       y2="1052.3228"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.99992202,0,0,1.001644,-1.9770816,-2.7739047)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4902-3">
+      <stop
+         style="stop-color:#bfb688;stop-opacity:1"
+         offset="0"
+         id="stop4904-2" />
+      <stop
+         style="stop-color:#8392b0;stop-opacity:1"
+         offset="1"
+         id="stop4906-2" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4894-6"
+       id="linearGradient4900-1"
+       x1="7.9987183"
+       y1="1042.2307"
+       x2="9.9874563"
+       y2="1040.3303"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(2.022097,-1.044194)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4894-6">
+      <stop
+         style="stop-color:#e0c88f;stop-opacity:1"
+         offset="0"
+         id="stop4896-8" />
+      <stop
+         style="stop-color:#d5b269;stop-opacity:1"
+         offset="1"
+         id="stop4898-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4994-6">
+      <stop
+         style="stop-color:#f9fafc;stop-opacity:1;"
+         offset="0"
+         id="stop4996-1" />
+      <stop
+         style="stop-color:#dce7f7;stop-opacity:1"
+         offset="1"
+         id="stop4998-89" />
+    </linearGradient>
+    <linearGradient
+       y2="1051.8378"
+       x2="9.8946028"
+       y1="1039.153"
+       x1="9.8946028"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4101"
+       xlink:href="#linearGradient4994-6"
+       inkscape:collect="always"
+       gradientTransform="translate(-1.977903,-1.044194)" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="1046.4902"
+       x2="4.5"
+       y1="1042.047"
+       x1="4.5"
+       id="linearGradient4755"
+       xlink:href="#linearGradient4749"
+       inkscape:collect="always"
+       gradientTransform="translate(2.4048454e-4,1.997401)" />
+    <linearGradient
+       id="linearGradient4749"
+       inkscape:collect="always">
+      <stop
+         id="stop4751"
+         offset="0"
+         style="stop-color:#ffffee;stop-opacity:1" />
+      <stop
+         id="stop4753"
+         offset="1"
+         style="stop-color:#ffecad;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="1049.912"
+       x2="11.0625"
+       y1="1038.5497"
+       x1="11.0625"
+       id="linearGradient4747"
+       xlink:href="#linearGradient4741"
+       inkscape:collect="always"
+       gradientTransform="translate(2.4048454e-4,1.997401)" />
+    <linearGradient
+       id="linearGradient4741"
+       inkscape:collect="always">
+      <stop
+         id="stop4743"
+         offset="0"
+         style="stop-color:#ba7f0d;stop-opacity:1" />
+      <stop
+         id="stop4745"
+         offset="1"
+         style="stop-color:#a2660b;stop-opacity:1" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="14.430038"
+     inkscape:cy="6.6162183"
+     inkscape:document-units="px"
+     inkscape:current-layer="g4210"
+     showgrid="true"
+     inkscape:window-width="1313"
+     inkscape:window-height="969"
+     inkscape:window-x="863"
+     inkscape:window-y="330"
+     inkscape:window-maximized="0"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-global="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3999" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline"
+     transform="translate(0,-1036.3622)">
+    <g
+       id="g4210"
+       transform="matrix(0.99384981,0,0,1.0001295,2.0082085,0.90334861)">
+      <path
+         sodipodi:nodetypes="cccccc"
+         inkscape:connector-curvature="0"
+         id="rect4001-3"
+         d="m 3.5193795,1037.8597 7.0096695,0 3.062057,3.0066 0,9.9546 -10.0717265,0 z"
+         style="display:inline;fill:url(#linearGradient4101);fill-opacity:1;stroke:none" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4884"
+         d="m 10.065419,1037.3345 0,3.9737 4.012968,0.01 z"
+         style="display:inline;fill:url(#linearGradient4900-1);fill-opacity:1;stroke:none"
+         sodipodi:nodetypes="cccc" />
+      <path
+         sodipodi:nodetypes="cccccc"
+         inkscape:connector-curvature="0"
+         id="rect4001"
+         d="m 3.5197722,1037.838 7.0091228,0 3.061818,3.0115 0,9.971 -10.0709408,0 z"
+         style="display:inline;fill:none;stroke:url(#linearGradient4908-2);stroke-width:1.00078261;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
+      <rect
+         y="1040.323"
+         x="5.0134244"
+         height="0.99477041"
+         width="4.0322547"
+         id="rect4001-1"
+         style="display:inline;fill:url(#linearGradient4867-7);fill-opacity:1;stroke:none" />
+      <rect
+         y="1042.3152"
+         x="5.0291462"
+         height="1.0025818"
+         width="7.0322547"
+         id="rect4001-1-7"
+         style="display:inline;fill:url(#linearGradient4869-17);fill-opacity:1;stroke:none" />
+      <rect
+         y="1044.323"
+         x="5.0291462"
+         height="0.99477041"
+         width="7.0401154"
+         id="rect4001-1-7-4"
+         style="display:inline;fill:url(#linearGradient4871-2);fill-opacity:1;stroke:none" />
+      <rect
+         y="1046.323"
+         x="5.0291462"
+         height="0.99477041"
+         width="7.0479765"
+         id="rect4001-1-7-4-0"
+         style="display:inline;fill:url(#linearGradient4875-9);fill-opacity:1;stroke:none" />
+      <rect
+         y="1048.323"
+         x="5.0291462"
+         height="0.99477041"
+         width="5.0094166"
+         id="rect4001-1-7-4-0-9"
+         style="display:inline;fill:url(#linearGradient4873-1);fill-opacity:1;stroke:none" />
+    </g>
+    <g
+       style="display:inline"
+       id="layer1-9"
+       inkscape:label="Layer 1"
+       transform="translate(1.0509322e-5,2.6250011)" />
+    <path
+       inkscape:connector-curvature="0"
+       id="rect3968"
+       d="m 6.5002406,1041.8632 0,1.9964 -3.7812501,0 c -0.6678671,0 -1.2140274,0.5509 -1.21875,1.2188 l -0.011049,1.5625 c -0.00472,0.6678 0.5508829,1.2187 1.21875,1.2187 l 3.78125,0 0,1.9945 1,0 4.0053245,-4.0305 -3.9942759,-3.9604 z"
+       style="display:inline;fill:url(#linearGradient4755);fill-opacity:1;stroke:url(#linearGradient4747);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       sodipodi:nodetypes="ccsssscccccc" />
+  </g>
+</svg>
diff --git a/bundles/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/link_to_editor.svg b/bundles/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/link_to_editor.svg
new file mode 100644
index 000000000000..37c0b6ae3f3f
--- /dev/null
+++ b/bundles/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/link_to_editor.svg
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.0 r9654"
+   sodipodi:docname="synced.svg"
+   inkscape:export-filename="C:\Users\jmietling\Documents\rect3997-9-1.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4883">
+      <stop
+         style="stop-color:#bd8416;stop-opacity:1;"
+         offset="0"
+         id="stop4885" />
+      <stop
+         style="stop-color:#aa6f10;stop-opacity:1"
+         offset="1"
+         id="stop4887" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5103">
+      <stop
+         style="stop-color:#fefdef;stop-opacity:1"
+         offset="0"
+         id="stop5105" />
+      <stop
+         style="stop-color:#fce69e;stop-opacity:1"
+         offset="1"
+         id="stop5107" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5103"
+       id="linearGradient5109"
+       x1="11.906143"
+       y1="1042.3622"
+       x2="11.906143"
+       y2="1047.2684"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1,2.9999502)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4883"
+       id="linearGradient4889"
+       x1="11"
+       y1="1043.3622"
+       x2="11"
+       y2="1052.3622"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4883-7"
+       id="linearGradient4889-1"
+       x1="11"
+       y1="1043.3622"
+       x2="11"
+       y2="1052.3622"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1,0,0,1,15.987978,-7)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4883-7">
+      <stop
+         style="stop-color:#bd8416;stop-opacity:1;"
+         offset="0"
+         id="stop4885-4" />
+      <stop
+         style="stop-color:#aa6f10;stop-opacity:1"
+         offset="1"
+         id="stop4887-0" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5103-4">
+      <stop
+         style="stop-color:#fefdef;stop-opacity:1"
+         offset="0"
+         id="stop5105-8" />
+      <stop
+         style="stop-color:#fce69e;stop-opacity:1"
+         offset="1"
+         id="stop5107-8" />
+    </linearGradient>
+    <linearGradient
+       y2="1047.2684"
+       x2="11.906143"
+       y1="1042.3622"
+       x1="11.906143"
+       gradientTransform="matrix(-1,0,0,1,16.987978,-4)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4911"
+       xlink:href="#linearGradient5103-4"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="15.999999"
+     inkscape:cx="16.638127"
+     inkscape:cy="5.0891236"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1241"
+     inkscape:window-height="814"
+     inkscape:window-x="1124"
+     inkscape:window-y="592"
+     inkscape:window-maximized="0"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-global="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3999"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline"
+     transform="translate(0,-1036.3622)">
+    <path
+       style="fill:url(#linearGradient5109);fill-opacity:1;stroke:none;display:inline"
+       d="m 4,1047.3622 0,1 7,0 0,3 3.999893,-3.5 -3.999893,-3.5 0,3 z"
+       id="path4108-1"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccc" />
+    <path
+       style="fill:url(#linearGradient4889);fill-opacity:1;stroke:none;display:inline"
+       d="m 10,1043.3622 0,3 -5,0 -1,0 c -0.99185,0.9918 -0.986324,2.0137 0,3 l 1,0 5,0 0,3 c 0,0.6519 0.740915,0.6375 1.5,0 l 4.9375,-4.5 -4.9375,-4.5 c -0.760225,-0.7602 -1.5,-0.5203 -1.5,0 z m 1,1 4,3.5 -4,3.5 0,-3 -6.4375,0 c -0.276214,-0.2099 -0.277444,-0.7282 0,-1 l 6.4375,0 z"
+       id="path4108-1-6"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccccccccccccc" />
+    <path
+       style="fill:url(#linearGradient4911);fill-opacity:1;stroke:none;display:inline"
+       d="m 11.987978,1040.3622 0,1 -7.0000023,0 0,3 -3.99989299,-3.5 3.99989299,-3.5 0,3 z"
+       id="path4108-1-2"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccc" />
+    <path
+       style="fill:url(#linearGradient4889-1);fill-opacity:1;stroke:none;display:inline"
+       d="m 5.9879757,1036.3622 0,3 5.0000023,0 1,0 c 0.99185,0.9918 0.986324,2.0137 0,3 l -1,0 -5.0000023,0 0,3 c 0,0.6519 -0.740915,0.6375 -1.5,0 l -4.93749974,-4.5 4.93749974,-4.5 c 0.760225,-0.7602 1.5,-0.5203 1.5,0 z m -1,1 -3.99999999,3.5 3.99999999,3.5 0,-3 6.4375023,0 c 0.276214,-0.2099 0.277444,-0.7282 0,-1 l -6.4375023,0 z"
+       id="path4108-1-6-4"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccccccccccccc" />
+  </g>
+</svg>
diff --git a/bundles/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/new_template.svg b/bundles/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/new_template.svg
new file mode 100644
index 000000000000..29fa7ac75b77
--- /dev/null
+++ b/bundles/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/new_template.svg
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="new_template.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4152">
+      <stop
+         style="stop-color:#b3b09a;stop-opacity:1"
+         offset="0"
+         id="stop4154" />
+      <stop
+         style="stop-color:#f0ece8;stop-opacity:1"
+         offset="1"
+         id="stop4156" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4902-3"
+       id="linearGradient4908-2"
+       x1="10.544736"
+       y1="1038.5779"
+       x2="10.544736"
+       y2="1052.3228"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1.977903,-1.044194)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4902-3">
+      <stop
+         style="stop-color:#bfb688;stop-opacity:1"
+         offset="0"
+         id="stop4904-2" />
+      <stop
+         style="stop-color:#8392b0;stop-opacity:1"
+         offset="1"
+         id="stop4906-2" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4894-6"
+       id="linearGradient4900-1"
+       x1="7.9987183"
+       y1="1042.2307"
+       x2="9.9874563"
+       y2="1040.3303"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(2.022097,-1.044194)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4894-6">
+      <stop
+         style="stop-color:#e0c88f;stop-opacity:1"
+         offset="0"
+         id="stop4896-8" />
+      <stop
+         style="stop-color:#d5b269;stop-opacity:1"
+         offset="1"
+         id="stop4898-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4994-6">
+      <stop
+         style="stop-color:#f9fafc;stop-opacity:1;"
+         offset="0"
+         id="stop4996-1" />
+      <stop
+         style="stop-color:#dce7f7;stop-opacity:1"
+         offset="1"
+         id="stop4998-89" />
+    </linearGradient>
+    <linearGradient
+       y2="1051.8378"
+       x2="9.8946028"
+       y1="1039.153"
+       x1="9.8946028"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4101"
+       xlink:href="#linearGradient4994-6"
+       inkscape:collect="always"
+       gradientTransform="translate(-1.977903,-1.044194)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4152"
+       id="linearGradient4158"
+       x1="8.3968925"
+       y1="1049.9426"
+       x2="8.3968925"
+       y2="1039.9548"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32.000001"
+     inkscape:cx="13.064188"
+     inkscape:cy="7.8675805"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1250"
+     inkscape:window-height="1001"
+     inkscape:window-x="835"
+     inkscape:window-y="327"
+     inkscape:window-maximized="0"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-global="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3999" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline"
+     transform="translate(0,-1036.3622)">
+    <path
+       style="display:inline;fill:url(#linearGradient4101);fill-opacity:1;stroke:none"
+       d="m 2.6796902,1037.8597 7.8493588,0 3.062057,3.0066 0,10.7983 -10.9114158,0 z"
+       id="rect4001-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccc" />
+    <rect
+       style="opacity:1;fill:url(#linearGradient4158);fill-opacity:1;stroke:#aaa3a8;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4150"
+       width="6.9937277"
+       height="9.9989719"
+       x="4.5078058"
+       y="1039.8663" />
+    <path
+       style="fill:url(#linearGradient4900-1);fill-opacity:1;stroke:none;display:inline"
+       d="m 9.998718,1037.397 0,3.9112 3.977478,0 z"
+       id="path4884"
+       inkscape:connector-curvature="0" />
+    <path
+       style="display:inline;fill:none;stroke:url(#linearGradient4908-2);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 2.5029135,1037.8597 7.9377475,0 3.062057,3.0066 0,10.9932 -11.010853,0 z"
+       id="rect4001"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccc" />
+  </g>
+</svg>
diff --git a/bundles/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/open_replace.svg b/bundles/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/open_replace.svg
new file mode 100644
index 000000000000..adff3ff7ffa9
--- /dev/null
+++ b/bundles/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/open_replace.svg
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   fill="currentColor"
+   version="1.1"
+   id="svg6584"
+   sodipodi:docname="open_replace.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   inkscape:export-filename="..\..\..\..\..\..\..\eclipse.platform.ui\bundles\org.eclipse.ui.workbench.texteditor\icons\full\elcl16\open_replace@2x.png"
+   inkscape:export-xdpi="192"
+   inkscape:export-ydpi="192"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs6588" />
+  <sodipodi:namedview
+     id="namedview6586"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="32.09375"
+     inkscape:cx="4.5180136"
+     inkscape:cy="8.6932814"
+     inkscape:window-width="1920"
+     inkscape:window-height="1009"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg6584" />
+  <path
+     fill-rule="evenodd"
+     clip-rule="evenodd"
+     d="M10.072 8.024L5.715 3.667l.618-.62L11 7.716v.618L6.333 13l-.618-.619 4.357-4.357z"
+     id="path6582"
+     style="fill:#1a1a1a;fill-opacity:1" />
+</svg>
diff --git a/bundles/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/regex.svg b/bundles/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/regex.svg
new file mode 100644
index 000000000000..fe3f92b2096c
--- /dev/null
+++ b/bundles/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/regex.svg
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   fill="currentColor"
+   version="1.1"
+   id="svg5668"
+   sodipodi:docname="regex.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   inkscape:export-filename="regex@2x.png"
+   inkscape:export-xdpi="192"
+   inkscape:export-ydpi="192"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs5672" />
+  <sodipodi:namedview
+     id="namedview5670"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="64.1875"
+     inkscape:cx="4.7984421"
+     inkscape:cy="7.9922103"
+     inkscape:window-width="3440"
+     inkscape:window-height="1369"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg5668" />
+  <path
+     fill-rule="evenodd"
+     clip-rule="evenodd"
+     d="M10.012 2h.976v3.113l2.56-1.557.486.885L11.47 6l2.564 1.559-.485.885-2.561-1.557V10h-.976V6.887l-2.56 1.557-.486-.885L9.53 6 6.966 4.441l.485-.885 2.561 1.557V2zM2 10h4v4H2v-4z"
+     id="path5666"
+     style="fill:#797979;fill-opacity:1" />
+</svg>
diff --git a/bundles/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/replace.svg b/bundles/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/replace.svg
new file mode 100644
index 000000000000..46763e1302c4
--- /dev/null
+++ b/bundles/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/replace.svg
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   fill="currentColor"
+   version="1.1"
+   id="svg8989"
+   sodipodi:docname="replace.svg"
+   xml:space="preserve"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   inkscape:export-filename="replace@2x.png"
+   inkscape:export-xdpi="192"
+   inkscape:export-ydpi="192"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs8993"><linearGradient
+       inkscape:collect="always"
+       id="linearGradient14488"><stop
+         style="stop-color:#fbdf8c;stop-opacity:1"
+         offset="0"
+         id="stop14484" /><stop
+         style="stop-color:#fbf5df;stop-opacity:1;"
+         offset="1"
+         id="stop14486" /></linearGradient><clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath11676"><g
+         inkscape:label="Clip"
+         id="use11678"><path
+           fill-rule="evenodd"
+           clip-rule="evenodd"
+           d="M 3.221,3.739 5.482,6.008 7.7,3.784 7,3.084 5.988,4.091 5.98,2.491 A 0.523,0.523 0 0 1 6.48,1.965 H 8 V 1 H 6.48 A 1.482,1.482 0 0 0 5,2.489 V 4.1 L 3.927,3.033 Z m 6.67,1.794 h 0.01 C 10.084,5.844 10.352,6 10.707,6 11.1,6 11.413,5.832 11.647,5.497 11.883,5.162 12,4.717 12,4.164 12,3.653 11.9,3.251 11.699,2.957 11.498,2.662 11.211,2.515 10.839,2.515 c -0.405,0 -0.718,0.194 -0.938,0.581 H 9.891 V 1 H 9 V 5.919 H 9.89 V 5.533 Z M 9.876,4.472 v -0.34 c 0,-0.248 0.058,-0.448 0.175,-0.601 a 0.54,0.54 0 0 1 0.445,-0.23 0.49,0.49 0 0 1 0.436,0.233 c 0.104,0.154 0.155,0.368 0.155,0.643 0,0.33 -0.056,0.587 -0.169,0.768 A 0.524,0.524 0 0 1 10.448,5.215 0.495,0.495 0 0 1 10.037,5.004 0.853,0.853 0 0 1 9.877,4.472 Z M 9,12.769 C 8.744,12.923 8.375,13 7.892,13 7.329,13 6.872,12.822 6.523,12.467 6.174,12.112 6,11.654 6,11.093 6,10.445 6.186,9.935 6.56,9.563 6.934,9.187 7.435,9 8.06,9 8.493,9 8.806,9.06 9,9.179 v 0.998 A 1.26,1.26 0 0 0 8.208,9.901 c -0.325,0 -0.583,0.1 -0.774,0.298 -0.19,0.196 -0.283,0.468 -0.283,0.816 0,0.338 0.09,0.603 0.272,0.797 0.182,0.191 0.431,0.287 0.749,0.287 0.282,0 0.558,-0.092 0.828,-0.276 z M 4,7 3,8 v 6 l 1,1 h 7 l 1,-1 V 8 L 11,7 Z m 0,1 h 7 v 6 H 4 Z"
+           id="path11680"
+           style="fill:#797979;fill-opacity:1" /></g></clipPath><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient14488"
+       id="linearGradient14490"
+       x1="5.4640694"
+       y1="12.955132"
+       x2="5.4861021"
+       y2="8.4384623"
+       gradientUnits="userSpaceOnUse" /></defs><sodipodi:namedview
+     id="namedview8991"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="90.774833"
+     inkscape:cx="4.6819144"
+     inkscape:cy="9.8044796"
+     inkscape:window-width="3440"
+     inkscape:window-height="1369"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg8989" /><rect
+     style="fill:url(#linearGradient14490);fill-opacity:1"
+     id="rect14325"
+     width="7.2046399"
+     height="6.0809808"
+     x="3.9217918"
+     y="7.9537463" /><g
+     id="g11674"
+     clip-path="url(#clipPath11676)" /><path
+     fill-rule="evenodd"
+     clip-rule="evenodd"
+     d="M 4,7 3,8 v 6 l 1,1 h 7 l 1,-1 V 8 L 11,7 Z m 0,1 h 7 v 6 H 4 Z"
+     id="path8987"
+     style="fill:#b27914;fill-opacity:1"
+     sodipodi:nodetypes="cccccccccccccc" /><path
+     d="m 2.8393219,3.7247761 2.261,2.269 2.218,-2.224 -0.7000001,-0.7 -1.0119999,1.007 -0.008,-1.6 c -0.00189,-0.2812563 0.2190093,-0.5136372 0.5,-0.526 H 7.6183218 V 0.98577605 H 6.0983219 C 5.2778763,0.98687605 4.6144458,1.654339 4.6183218,2.4747761 v 1.611 l -1.073,-1.067 z m 6.6699999,1.794 h 0.01 c 0.183,0.311 0.4510001,0.467 0.8060002,0.467 0.393,0 0.706,-0.168 0.94,-0.503 0.236,-0.335 0.353,-0.78 0.353,-1.333 0,-0.511 -0.1,-0.913 -0.301,-1.207 -0.201,-0.295 -0.488,-0.442 -0.86,-0.442 -0.405,0 -0.7180001,0.194 -0.9380002,0.581 h -0.01 V 0.98577605 h -0.891 V 5.9047761 h 0.8900001 v -0.386 z m -0.015,-1.061 v -0.34 c 0,-0.248 0.058,-0.448 0.1750001,-0.601 0.101651,-0.1449906 0.267928,-0.2309316 0.4450001,-0.23 0.176733,-0.00671 0.343366,0.08234 0.436,0.233 0.104,0.154 0.155,0.368 0.155,0.643 0,0.33 -0.056,0.587 -0.169,0.768 -0.09433,0.1703324 -0.275337,0.2743125 -0.47,0.27 -0.1634332,0.00183 -0.3172372,-0.077126 -0.4110001,-0.211 -0.1112035,-0.1545111 -0.1675254,-0.3417809 -0.16,-0.532 z"
+     style="clip-rule:evenodd;fill:#797979;fill-opacity:1;fill-rule:evenodd"
+     id="path13146" /><path
+     d="m 8.8534567,12.768026 c -0.256,0.154 -0.625,0.231 -1.108,0.231 -0.563,0 -1.02,-0.178 -1.369,-0.533 -0.349,-0.355 -0.523,-0.813 -0.523,-1.374 0,-0.648 0.186,-1.1579997 0.56,-1.5299997 0.374,-0.376 0.875,-0.563 1.5,-0.563 0.433,0 0.746,0.06 0.94,0.179 v 0.9979997 c -0.224736,-0.1797436 -0.504228,-0.2771425 -0.792,-0.2759997 -0.325,0 -0.583,0.1 -0.774,0.2979997 -0.19,0.196 -0.283,0.468 -0.283,0.816 0,0.338 0.09,0.603 0.272,0.797 0.182,0.191 0.431,0.287 0.749,0.287 0.282,0 0.558,-0.092 0.828,-0.276 z"
+     style="clip-rule:evenodd;fill:#797979;fill-opacity:1;fill-rule:evenodd"
+     id="path13184" /></svg>
diff --git a/bundles/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/replace_all.svg b/bundles/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/replace_all.svg
new file mode 100644
index 000000000000..41402f030121
--- /dev/null
+++ b/bundles/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/replace_all.svg
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   fill="currentColor"
+   version="1.1"
+   id="svg30184"
+   sodipodi:docname="replace-all.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   inkscape:export-filename="replace-all.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs30188">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient14488">
+      <stop
+         style="stop-color:#fbdf8c;stop-opacity:1"
+         offset="0"
+         id="stop14484" />
+      <stop
+         style="stop-color:#fbf5df;stop-opacity:1;"
+         offset="1"
+         id="stop14486" />
+    </linearGradient>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath11676">
+      <g
+         inkscape:label="Clip"
+         id="use11678">
+        <path
+           fill-rule="evenodd"
+           clip-rule="evenodd"
+           d="M 3.221,3.739 5.482,6.008 7.7,3.784 7,3.084 5.988,4.091 5.98,2.491 A 0.523,0.523 0 0 1 6.48,1.965 H 8 V 1 H 6.48 A 1.482,1.482 0 0 0 5,2.489 V 4.1 L 3.927,3.033 Z m 6.67,1.794 h 0.01 C 10.084,5.844 10.352,6 10.707,6 11.1,6 11.413,5.832 11.647,5.497 11.883,5.162 12,4.717 12,4.164 12,3.653 11.9,3.251 11.699,2.957 11.498,2.662 11.211,2.515 10.839,2.515 c -0.405,0 -0.718,0.194 -0.938,0.581 H 9.891 V 1 H 9 V 5.919 H 9.89 V 5.533 Z M 9.876,4.472 v -0.34 c 0,-0.248 0.058,-0.448 0.175,-0.601 a 0.54,0.54 0 0 1 0.445,-0.23 0.49,0.49 0 0 1 0.436,0.233 c 0.104,0.154 0.155,0.368 0.155,0.643 0,0.33 -0.056,0.587 -0.169,0.768 A 0.524,0.524 0 0 1 10.448,5.215 0.495,0.495 0 0 1 10.037,5.004 0.853,0.853 0 0 1 9.877,4.472 Z M 9,12.769 C 8.744,12.923 8.375,13 7.892,13 7.329,13 6.872,12.822 6.523,12.467 6.174,12.112 6,11.654 6,11.093 6,10.445 6.186,9.935 6.56,9.563 6.934,9.187 7.435,9 8.06,9 8.493,9 8.806,9.06 9,9.179 v 0.998 A 1.26,1.26 0 0 0 8.208,9.901 c -0.325,0 -0.583,0.1 -0.774,0.298 -0.19,0.196 -0.283,0.468 -0.283,0.816 0,0.338 0.09,0.603 0.272,0.797 0.182,0.191 0.431,0.287 0.749,0.287 0.282,0 0.558,-0.092 0.828,-0.276 z M 4,7 3,8 v 6 l 1,1 h 7 l 1,-1 V 8 L 11,7 Z m 0,1 h 7 v 6 H 4 Z"
+           id="path11680"
+           style="fill:#797979;fill-opacity:1" />
+      </g>
+    </clipPath>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient14488"
+       id="linearGradient14490-5"
+       x1="5.4640694"
+       y1="12.955132"
+       x2="5.4861021"
+       y2="8.4384623"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-0.58957363,0.15915132)" />
+  </defs>
+  <sodipodi:namedview
+     id="namedview30186"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="32.09375"
+     inkscape:cx="0.43622201"
+     inkscape:cy="10.251217"
+     inkscape:window-width="3440"
+     inkscape:window-height="1369"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg30184" />
+  <path
+     d="m 4.4612487,7.2112722 1.000001,-1 h 6.9999983 l 1,1 v 4.9999988 l -1,1.000001 V 7.2112722 Z"
+     style="clip-rule:evenodd;fill:#b27914;fill-opacity:1;fill-rule:evenodd"
+     id="path33621-9" />
+  <rect
+     style="fill:url(#linearGradient14490-5);fill-opacity:1"
+     id="rect14325-6"
+     width="7.2046399"
+     height="6.0809808"
+     x="3.3322182"
+     y="8.1128979" />
+  <g
+     id="g11674"
+     clip-path="url(#clipPath11676)"
+     transform="translate(-19.581622,-6.0540246)" />
+  <path
+     fill-rule="evenodd"
+     clip-rule="evenodd"
+     d="m 3.4104264,8.159 -1,1 v 5.000151 l 1,1 h 6.9999996 l 1,-1 V 9.159 l -1,-1 z m 0,1 h 6.9999996 v 5.000151 H 3.4104264 Z"
+     id="path8987"
+     style="fill:#b27914;fill-opacity:1"
+     sodipodi:nodetypes="cccccccccccccc" />
+  <path
+     d="m 8.1689467,13.161068 c -0.2133334,0.128334 -0.5208334,0.1925 -0.9233333,0.1925 -0.4691666,0 -0.8500001,-0.148333 -1.1408334,-0.444166 -0.2908333,-0.295834 -0.4358333,-0.6775 -0.4358333,-1.145 0,-0.54 0.155,-0.964999 0.4666666,-1.275 0.3116667,-0.313334 0.7291667,-0.469167 1.25,-0.469167 0.3608334,0 0.6216666,0.05 0.7833334,0.149167 v 0.831666 c -0.18728,-0.149785 -0.4201901,-0.230951 -0.66,-0.229999 -0.2708334,0 -0.4858334,0.08333 -0.6450001,0.248333 -0.1583333,0.163332 -0.2358333,0.39 -0.2358333,0.68 0,0.281666 0.075,0.5025 0.2266667,0.664166 0.1516666,0.159167 0.3591666,0.239167 0.6241667,0.239167 0.2349999,0 0.465,-0.07667 0.69,-0.23 z"
+     style="clip-rule:evenodd;fill:#797979;fill-opacity:1;fill-rule:evenodd;stroke-width:0.833333"
+     id="path13184" />
+  <path
+     d="M 3.7429246,3.4157794 5.7745739,5.4546173 7.767585,3.4562147 7.1385913,2.8272212 6.2292464,3.7320734 6.2220579,2.2943737 C 6.2203596,2.0416474 6.4188514,1.8328387 6.671339,1.8217299 H 8.0371536 V 0.95461734 H 6.671339 C 5.9341175,0.95560574 5.337984,1.5553628 5.3414668,2.2925766 V 3.7401604 L 4.3773095,2.7813945 Z m 5.9934101,1.6120208 h 0.009 c 0.164437,0.2794528 0.4052523,0.4196286 0.7242423,0.4196286 0.353135,0 0.634385,-0.1509585 0.844648,-0.4519769 0.212061,-0.3010183 0.317193,-0.7008785 0.317193,-1.1977835 0,-0.4591652 -0.08985,-0.8203873 -0.270468,-1.0845647 -0.180611,-0.2650758 -0.438498,-0.3971644 -0.772764,-0.3971644 -0.363917,0 -0.6451673,0.174321 -0.8428513,0.5220646 h -0.009 V 0.95461734 H 8.9357159 V 5.3746452 H 9.7354357 V 5.0278002 Z M 9.7228567,4.0744256 V 3.7689144 c 0,-0.2228435 0.05212,-0.4025559 0.157249,-0.5400359 0.09134,-0.1302831 0.2407503,-0.2075064 0.3998603,-0.2066693 0.158805,-0.00603 0.308535,0.073988 0.391773,0.209365 0.09345,0.1383786 0.139277,0.3306709 0.139277,0.5777755 0,0.2965256 -0.05032,0.527456 -0.151858,0.6900958 -0.08476,0.1530544 -0.247406,0.246487 -0.422324,0.2426119 C 10.08998,4.7436974 9.9517767,4.6727554 9.8675247,4.5524607 9.7676047,4.4136229 9.7169927,4.2453493 9.7237557,4.0744256 Z"
+     style="clip-rule:evenodd;fill:#797979;fill-opacity:1;fill-rule:evenodd;stroke-width:0.898562"
+     id="path13146" />
+</svg>
diff --git a/bundles/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/search_all.svg b/bundles/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/search_all.svg
new file mode 100644
index 000000000000..e42f5d921fe0
--- /dev/null
+++ b/bundles/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/search_all.svg
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1"
+   viewBox="0 0 48 48"
+   enable-background="new 0 0 48 48"
+   id="svg440"
+   sodipodi:docname="search.svg"
+   inkscape:export-filename="search.png"
+   inkscape:export-xdpi="32"
+   inkscape:export-ydpi="32"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs444" />
+  <sodipodi:namedview
+     id="namedview442"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="20.875"
+     inkscape:cx="13.844311"
+     inkscape:cy="24.670659"
+     inkscape:window-width="3440"
+     inkscape:window-height="1369"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg440" />
+  <g
+     fill="#616161"
+     id="g432"
+     transform="translate(-3.3053892,3.3532934)"
+     style="fill:#979797;fill-opacity:1">
+    <rect
+       x="34.599998"
+       y="28.1"
+       transform="matrix(0.707,-0.707,0.707,0.707,-15.154,36.586)"
+       width="4"
+       height="17"
+       id="rect428"
+       style="fill:#979797;fill-opacity:1" />
+    <circle
+       cx="20"
+       cy="20"
+       r="16"
+       id="circle430"
+       style="fill:#979797;fill-opacity:1" />
+  </g>
+  <circle
+     fill="#64b5f6"
+     cx="16.694611"
+     cy="23.353292"
+     r="13"
+     id="circle436"
+     style="fill:#9dcff7;fill-opacity:1" />
+  <path
+     fill="#bbdefb"
+     d="m 23.594611,17.553293 c -1.7,-2 -4.2,-3.2 -6.9,-3.2 -2.7,0 -5.2,1.2 -6.9000002,3.2 -0.4,0.4 -0.3,1.1 0.1,1.4 0.4000002,0.4 1.1000002,0.3 1.4000002,-0.1 1.4,-1.6 3.3,-2.5 5.4,-2.5 2.1,0 4,0.9 5.4,2.5 0.2,0.2 0.5,0.4 0.8,0.4 0.2,0 0.5,-0.1 0.6,-0.2 0.4,-0.4 0.4,-1.1 0.1,-1.5 z"
+     id="path438" />
+  <g
+     fill="#616161"
+     id="g432-0"
+     transform="translate(3.7734817,-2.8790029)">
+    <rect
+       x="34.599998"
+       y="28.1"
+       transform="matrix(0.707,-0.707,0.707,0.707,-15.154,36.586)"
+       width="4"
+       height="17"
+       id="rect428-2"
+       style="fill:#979797;fill-opacity:1" />
+    <circle
+       cx="20"
+       cy="20"
+       r="16"
+       id="circle430-3"
+       style="fill:#979797;fill-opacity:1" />
+  </g>
+  <circle
+     fill="#64b5f6"
+     cx="23.773481"
+     cy="17.120995"
+     r="13"
+     id="circle436-5"
+     style="fill:#9dcff7;fill-opacity:1" />
+  <path
+     fill="#bbdefb"
+     d="m 30.673482,11.320997 c -1.7,-1.9999999 -4.2,-3.1999999 -6.9,-3.1999999 -2.7,0 -5.2,1.2 -6.9,3.1999999 -0.4,0.4 -0.3,1.1 0.1,1.4 0.4,0.4 1.1,0.3 1.4,-0.1 1.4,-1.6 3.3,-2.5 5.4,-2.5 2.1,0 4,0.9 5.4,2.5 0.2,0.2 0.5,0.4 0.8,0.4 0.2,0 0.5,-0.1 0.6,-0.2 0.4,-0.4 0.4,-1.1 0.1,-1.5 z"
+     id="path438-4" />
+  <ellipse
+     style="fill:#00ffff;fill-rule:evenodd"
+     id="path700"
+     cx="-16.167665"
+     cy="34.059879"
+     rx="0.11976048"
+     ry="0.095808387" />
+</svg>
diff --git a/bundles/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/search_in_area.svg b/bundles/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/search_in_area.svg
new file mode 100644
index 000000000000..8734b9c072ad
--- /dev/null
+++ b/bundles/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/search_in_area.svg
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   fill="currentColor"
+   version="1.1"
+   id="svg3470"
+   sodipodi:docname="diff.svg"
+   xml:space="preserve"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs3474" /><sodipodi:namedview
+     id="namedview3472"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     showguides="true"
+     inkscape:zoom="72.875"
+     inkscape:cx="7.9931389"
+     inkscape:cy="8"
+     inkscape:window-width="3440"
+     inkscape:window-height="1369"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg3470"><sodipodi:guide
+       position="2,18.390625"
+       orientation="1,0"
+       id="guide4442"
+       inkscape:locked="false" /><sodipodi:guide
+       position="14,17.734375"
+       orientation="1,0"
+       id="guide4444"
+       inkscape:locked="false" /><sodipodi:guide
+       position="-0.90625,13.015625"
+       orientation="0,-1"
+       id="guide4446"
+       inkscape:locked="false" /><sodipodi:guide
+       position="-2.015625,3"
+       orientation="0,-1"
+       id="guide4448"
+       inkscape:locked="false" /><inkscape:page
+       x="0"
+       y="0"
+       width="16"
+       height="16"
+       id="page4823"
+       inkscape:export-filename="Seite 1.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96" /><inkscape:page
+       x="26"
+       y="0"
+       width="16"
+       height="16"
+       id="page4825" /></sodipodi:namedview><path
+     id="path3468"
+     d="m 2.5201316,2.9835564 -0.5,0.5 v 9.0468756 l 0.5,0.5 H 13.501481 l 0.5,-0.5 V 3.4835564 l -0.5,-0.5 z m 0.5000005,1 H 13.001481 V 7.2344297 H 3.0201316 Z m 0,5.9375 H 13.001481 V 12.030432 H 3.0201316 Z"
+     sodipodi:nodetypes="ccccccccccccccccccc"
+     style="fill:#797979;fill-opacity:1" /></svg>
diff --git a/bundles/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/select_next.svg b/bundles/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/select_next.svg
new file mode 100644
index 000000000000..973c4eda7b61
--- /dev/null
+++ b/bundles/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/select_next.svg
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.0 r9654"
+   sodipodi:docname="next_nav.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4749">
+      <stop
+         style="stop-color:#ffffee;stop-opacity:1"
+         offset="0"
+         id="stop4751" />
+      <stop
+         style="stop-color:#fbdd83;stop-opacity:1"
+         offset="1"
+         id="stop4753" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4741">
+      <stop
+         style="stop-color:#bd8416;stop-opacity:1"
+         offset="0"
+         id="stop4743" />
+      <stop
+         style="stop-color:#a66b10;stop-opacity:1"
+         offset="1"
+         id="stop4745" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4741"
+       id="linearGradient4747"
+       x1="1.0625"
+       y1="1050.0809"
+       x2="15.565599"
+       y2="1050.0809"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,1,1,0,-1036.3626,1036.3626)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4749"
+       id="linearGradient4755"
+       x1="1.6861235"
+       y1="1040.7402"
+       x2="14.375154"
+       y2="1040.7402"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,1,1,0,-1036.3626,1036.3626)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="-7.4627612"
+     inkscape:cy="10.319471"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1164"
+     inkscape:window-height="982"
+     inkscape:window-x="104"
+     inkscape:window-y="89"
+     inkscape:window-maximized="0"
+     inkscape:snap-global="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3966" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline"
+     transform="translate(0,-1036.3622)">
+    <path
+       style="fill:url(#linearGradient4755);fill-opacity:1;stroke:url(#linearGradient4747);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       d="m 2.5,1044.8626 3,0 0,-5.7812 c 0,-0.6679 0.5509,-1.2188 1.2188,-1.2188 l 2.5625,0 c 0.6678,0 1.2187,0.5508 1.2187,1.2188 l 0,5.7812 3,0 0,1 -5.5,5.5 -5.5,-5.5 0,-1 z"
+       id="rect3968"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/bundles/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/select_prev.svg b/bundles/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/select_prev.svg
new file mode 100644
index 000000000000..1faf803af314
--- /dev/null
+++ b/bundles/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/select_prev.svg
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.0 r9654"
+   sodipodi:docname="prev_nav.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4749">
+      <stop
+         style="stop-color:#fbdd83;stop-opacity:1"
+         offset="0"
+         id="stop4751" />
+      <stop
+         style="stop-color:#fefdef;stop-opacity:1"
+         offset="1"
+         id="stop4753" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4741">
+      <stop
+         style="stop-color:#a66b10;stop-opacity:1"
+         offset="0"
+         id="stop4743" />
+      <stop
+         style="stop-color:#bd8416;stop-opacity:1"
+         offset="1"
+         id="stop4745" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4741"
+       id="linearGradient4747"
+       x1="1.0625"
+       y1="1050.0809"
+       x2="15.565599"
+       y2="1050.0809"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,-1,1,0,-1036.3626,1052.3618)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4749"
+       id="linearGradient4755"
+       x1="1.6861235"
+       y1="1040.7402"
+       x2="14.375154"
+       y2="1040.7402"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,-1,1,0,-1036.3626,1052.3618)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="-4.5683281"
+     inkscape:cy="9.6786205"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1164"
+     inkscape:window-height="982"
+     inkscape:window-x="104"
+     inkscape:window-y="89"
+     inkscape:window-maximized="0"
+     inkscape:snap-global="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3966" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline"
+     transform="translate(0,-1036.3622)">
+    <path
+       style="fill:url(#linearGradient4755);fill-opacity:1;stroke:url(#linearGradient4747);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       d="m 2.5,1043.8618 3,0 0,5.7812 c 0,0.6679 0.5509,1.2188 1.2188,1.2188 l 2.5625,0 c 0.6678,0 1.2187,-0.5508 1.2187,-1.2188 l 0,-5.7812 3,0 0,-1 -5.5,-5.5 -5.5,5.5 0,1 z"
+       id="rect3968"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/bundles/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/whole_word.svg b/bundles/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/whole_word.svg
new file mode 100644
index 000000000000..4cac75496150
--- /dev/null
+++ b/bundles/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/whole_word.svg
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   fill="currentColor"
+   version="1.1"
+   id="svg32"
+   sodipodi:docname="whole_word.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   inkscape:export-filename="whole_word.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs36" />
+  <sodipodi:namedview
+     id="namedview34"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="64.1875"
+     inkscape:cx="1.6202532"
+     inkscape:cy="7.9922103"
+     inkscape:window-width="3440"
+     inkscape:window-height="1369"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg32" />
+  <path
+     fill-rule="evenodd"
+     clip-rule="evenodd"
+     d="M0 11H1V13H15V11H16V14H15H1H0V11Z"
+     id="path26"
+     style="fill:#797979;fill-opacity:1" />
+  <path
+     d="M 6.84048,11 H 5.95963 V 10.1406 H 5.93814 c -0.38314,0.6589 -0.9471,0.9883 -1.69189,0.9883 -0.54786,0 -0.97754,-0.145 -1.28907,-0.4351 -0.30794,-0.29 -0.46191,-0.6749 -0.46191,-1.15474 0,-1.02767 0.60514,-1.62565 1.81543,-1.79394 L 5.95963,7.51416 c 0,-0.93457 -0.37777,-1.40186 -1.13331,-1.40186 -0.66243,0 -1.26041,0.22559 -1.79394,0.67676 V 5.88672 C 3.57307,5.54297 4.19612,5.37109 4.90152,5.37109 c 1.29264,0 1.93896,0.68392 1.93896,2.05176 z M 5.95963,8.21777 4.63297,8.40039 C 4.22476,8.45768 3.91682,8.55973 3.70914,8.70654 3.50145,8.84977 3.39761,9.10579 3.39761,9.47461 c 0,0.26855 0.09489,0.48877 0.28467,0.66069 0.19336,0.1682 0.44938,0.2524 0.76807,0.2524 0.43685,0 0.79671,-0.1522 1.07959,-0.45655 C 5.8164,9.62321 5.95963,9.2347 5.95963,8.76562 Z"
+     id="path28"
+     style="fill:#797979;image-rendering:auto;fill-opacity:1"
+     inkscape:highlight-color="#797979" />
+  <path
+     d="M9.3475 10.2051H9.32601V11H8.44515V2.85742H9.32601V6.4668H9.3475C9.78076 5.73633 10.4146 5.37109 11.2489 5.37109C11.9543 5.37109 12.5057 5.61816 12.9032 6.1123C13.3042 6.60286 13.5047 7.26172 13.5047 8.08887C13.5047 9.00911 13.2809 9.74674 12.8333 10.3018C12.3857 10.8532 11.7734 11.1289 10.9964 11.1289C10.2695 11.1289 9.71989 10.821 9.3475 10.2051ZM9.32601 7.98682V8.75488C9.32601 9.20964 9.47282 9.59635 9.76644 9.91504C10.0636 10.2301 10.4396 10.3877 10.8944 10.3877C11.4279 10.3877 11.8451 10.1836 12.1458 9.77539C12.4502 9.36719 12.6024 8.79964 12.6024 8.07275C12.6024 7.46045 12.4609 6.98063 12.1781 6.6333C11.8952 6.28597 11.512 6.1123 11.0286 6.1123C10.5166 6.1123 10.1048 6.29134 9.7933 6.64941C9.48177 7.00391 9.32601 7.44971 9.32601 7.98682Z"
+     id="path30"
+     style="fill:#797979;fill-opacity:1" />
+</svg>
diff --git a/bundles/org.eclipse.ui.workbench.texteditor/icons/full/etool16/block_selection_mode.svg b/bundles/org.eclipse.ui.workbench.texteditor/icons/full/etool16/block_selection_mode.svg
new file mode 100644
index 000000000000..f4ad8b15421e
--- /dev/null
+++ b/bundles/org.eclipse.ui.workbench.texteditor/icons/full/etool16/block_selection_mode.svg
@@ -0,0 +1,325 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="1.3 (0e150ed, 2023-07-21)"
+   sodipodi:docname="block_selection_mode.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient10351">
+      <stop
+         style="stop-color:#849abe;stop-opacity:1;"
+         offset="0"
+         id="stop10353" />
+      <stop
+         style="stop-color:#677da9;stop-opacity:1"
+         offset="1"
+         id="stop10355" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient10593">
+      <stop
+         style="stop-color:#1b639e;stop-opacity:1;"
+         offset="0"
+         id="stop10595" />
+      <stop
+         style="stop-color:#6f8db9;stop-opacity:1"
+         offset="1"
+         id="stop10597" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient9610">
+      <stop
+         style="stop-color:#c7b571;stop-opacity:1"
+         offset="0"
+         id="stop9612" />
+      <stop
+         id="stop9614"
+         offset="1"
+         style="stop-color:#9a9990;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9610"
+       id="linearGradient9568"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-7.930539,1.0094674)"
+       x1="8.0137892"
+       y1="1035.9741"
+       x2="8.0137892"
+       y2="1051.0103" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10593"
+       id="linearGradient10599"
+       x1="10"
+       y1="10"
+       x2="10"
+       y2="5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(1,1038.3622)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10351"
+       id="linearGradient10357"
+       x1="5"
+       y1="1037.8622"
+       x2="11"
+       y2="1037.8622"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,2)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient10351-2">
+      <stop
+         style="stop-color:#849abe;stop-opacity:1;"
+         offset="0"
+         id="stop10353-6" />
+      <stop
+         style="stop-color:#677da9;stop-opacity:1"
+         offset="1"
+         id="stop10355-9" />
+    </linearGradient>
+    <linearGradient
+       y2="1037.8622"
+       x2="11"
+       y1="1037.8622"
+       x1="5"
+       gradientTransform="translate(0,12)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient10490"
+       xlink:href="#linearGradient10351-2"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10593"
+       id="linearGradient10599-8"
+       x1="10"
+       y1="10"
+       x2="10"
+       y2="5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(1,1038.3622)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10351"
+       id="linearGradient10357-8"
+       x1="5"
+       y1="1037.8622"
+       x2="11"
+       y2="1037.8622"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,6.0000006)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10351"
+       id="linearGradient10357-8-1"
+       x1="5"
+       y1="1037.8622"
+       x2="11"
+       y2="1037.8622"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,7.9687501)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="31.999999"
+     inkscape:cx="5.4062502"
+     inkscape:cy="7.2031252"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1248"
+     inkscape:window-height="814"
+     inkscape:window-x="467"
+     inkscape:window-y="59"
+     inkscape:window-maximized="0"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-global="false"
+     inkscape:showpageshadow="2"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3999"
+       originx="0"
+       originy="0"
+       spacingy="1"
+       spacingx="1"
+       units="px"
+       visible="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline"
+     transform="translate(0,-1036.3622)">
+    <rect
+       y="1043.3622"
+       x="5"
+       height="1.0000174"
+       width="6"
+       id="rect18863-4-58"
+       style="display:inline;fill:url(#linearGradient10357-8);fill-opacity:1;stroke:none" />
+    <rect
+       style="display:inline;fill:none;stroke:url(#linearGradient9568);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3997-9"
+       width="13"
+       height="14"
+       x="1.5000001"
+       y="1037.8622"
+       rx="0"
+       ry="0" />
+    <rect
+       y="1039.3622"
+       x="3"
+       height="1"
+       width="1.0000002"
+       id="rect18863"
+       style="fill:#879cc0;fill-opacity:1;stroke:none;display:inline" />
+    <rect
+       y="1039.3622"
+       x="5"
+       height="1.0000174"
+       width="6"
+       id="rect18863-4"
+       style="fill:url(#linearGradient10357);fill-opacity:1;stroke:none;display:inline" />
+    <path
+       style="display:inline;fill:url(#linearGradient10599);fill-opacity:1;stroke:none"
+       d="m 5.0037913,1041.3622 0,7 1,0 3.9947402,0 0.9999995,0 0,-1 0,-6 -4.9947397,0 z m 1,1 3.9947402,0 0,5 -3.9947402,0 z"
+       id="rect18863-4-5"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccccccc" />
+    <rect
+       y="1041.3622"
+       x="3"
+       height="1"
+       width="1.0000002"
+       id="rect18863-7"
+       style="fill:#879cc0;fill-opacity:1;stroke:none;display:inline" />
+    <rect
+       y="1043.3622"
+       x="3"
+       height="1"
+       width="1.0000002"
+       id="rect18863-5"
+       style="fill:#879cc0;fill-opacity:1;stroke:none;display:inline" />
+    <rect
+       y="1045.3622"
+       x="3"
+       height="1"
+       width="1.0000002"
+       id="rect18863-70"
+       style="fill:#879cc0;fill-opacity:1;stroke:none;display:inline" />
+    <rect
+       y="1047.3622"
+       x="3"
+       height="1"
+       width="1.0000002"
+       id="rect18863-9"
+       style="fill:#879cc0;fill-opacity:1;stroke:none;display:inline" />
+    <rect
+       y="1049.3622"
+       x="3"
+       height="1"
+       width="1.0000002"
+       id="rect18863-9-2"
+       style="fill:#879cc0;fill-opacity:1;stroke:none;display:inline" />
+    <rect
+       y="1049.3622"
+       x="5"
+       height="1.0000174"
+       width="6"
+       id="rect18863-4-2"
+       style="fill:url(#linearGradient10490);fill-opacity:1;stroke:none;display:inline" />
+    <rect
+       y="1039.3622"
+       x="12.011048"
+       height="1"
+       width="1.0000002"
+       id="rect18863-2"
+       style="display:inline;fill:#879cc0;fill-opacity:1;stroke:none" />
+    <rect
+       y="1041.3622"
+       x="12.011048"
+       height="1"
+       width="1.0000002"
+       id="rect18863-7-8"
+       style="display:inline;fill:#879cc0;fill-opacity:1;stroke:none" />
+    <rect
+       y="1043.3622"
+       x="12.011048"
+       height="1"
+       width="1.0000002"
+       id="rect18863-5-4"
+       style="display:inline;fill:#879cc0;fill-opacity:1;stroke:none" />
+    <rect
+       y="1045.3622"
+       x="12.011048"
+       height="1"
+       width="1.0000002"
+       id="rect18863-70-9"
+       style="display:inline;fill:#879cc0;fill-opacity:1;stroke:none" />
+    <rect
+       y="1047.3622"
+       x="12.011048"
+       height="1"
+       width="1.0000002"
+       id="rect18863-9-23"
+       style="display:inline;fill:#879cc0;fill-opacity:1;stroke:none" />
+    <rect
+       y="1049.3622"
+       x="12.011048"
+       height="1"
+       width="1.0000002"
+       id="rect18863-9-2-9"
+       style="display:inline;fill:#879cc0;fill-opacity:1;stroke:none" />
+    <rect
+       y="1045.3309"
+       x="5"
+       height="1.0000174"
+       width="6"
+       id="rect18863-4-58-6"
+       style="display:inline;fill:url(#linearGradient10357-8-1);fill-opacity:1;stroke:none" />
+    <path
+       style="display:inline;fill:url(#linearGradient10599-8);fill-opacity:1;stroke:none"
+       d="m 5.0037913,1041.3622 0,7 1,0 3.9947402,0 0.9999995,0 0,-1 0,-6 -4.9947397,0 z m 1,1 3.9947402,0 0,5 -3.9947402,0 z"
+       id="rect18863-4-5-5"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccccccc" />
+  </g>
+</svg>
diff --git a/bundles/org.eclipse.ui.workbench.texteditor/icons/full/etool16/segment_edit.svg b/bundles/org.eclipse.ui.workbench.texteditor/icons/full/etool16/segment_edit.svg
new file mode 100644
index 000000000000..07f50c99ef9e
--- /dev/null
+++ b/bundles/org.eclipse.ui.workbench.texteditor/icons/full/etool16/segment_edit.svg
@@ -0,0 +1,357 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.0 r9654"
+   sodipodi:docname="segment_edit.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient10359">
+      <stop
+         style="stop-color:#4a77a8;stop-opacity:1;"
+         offset="0"
+         id="stop10361" />
+      <stop
+         style="stop-color:#2266a0;stop-opacity:1"
+         offset="1"
+         id="stop10363" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient10351">
+      <stop
+         style="stop-color:#849abe;stop-opacity:1;"
+         offset="0"
+         id="stop10353" />
+      <stop
+         style="stop-color:#677da9;stop-opacity:1"
+         offset="1"
+         id="stop10355" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient10593">
+      <stop
+         style="stop-color:#1b639e;stop-opacity:1;"
+         offset="0"
+         id="stop10595" />
+      <stop
+         style="stop-color:#6f8db9;stop-opacity:1"
+         offset="1"
+         id="stop10597" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient9610">
+      <stop
+         style="stop-color:#c7b571;stop-opacity:1"
+         offset="0"
+         id="stop9612" />
+      <stop
+         id="stop9614"
+         offset="1"
+         style="stop-color:#9a9990;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient15990"
+       inkscape:collect="always">
+      <stop
+         id="stop15992"
+         offset="0"
+         style="stop-color:#f9fafc;stop-opacity:1" />
+      <stop
+         id="stop15994"
+         offset="1"
+         style="stop-color:#e0eaf8;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9610"
+       id="linearGradient9568"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-7.930539,1.0094674)"
+       x1="8.0137892"
+       y1="1035.9741"
+       x2="8.0137892"
+       y2="1051.0103" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15990"
+       id="linearGradient9571"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0850786,0,0,1,13.244555,8.008525)"
+       x1="-3.1651151"
+       y1="1030.4418"
+       x2="-3.1651151"
+       y2="1041.0583" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10593"
+       id="linearGradient10599"
+       x1="10"
+       y1="10"
+       x2="10"
+       y2="5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(1,1038.3622)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient10653-6">
+      <stop
+         style="stop-color:#130d08;stop-opacity:1"
+         offset="0"
+         id="stop10655-1" />
+      <stop
+         style="stop-color:#654628;stop-opacity:0;"
+         offset="1"
+         id="stop10657-8" />
+    </linearGradient>
+    <linearGradient
+       y2="1038.3622"
+       x2="14"
+       y1="1041.3622"
+       x1="14"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient10676"
+       xlink:href="#linearGradient10653-6"
+       inkscape:collect="always"
+       gradientTransform="matrix(1,0,0,-1,-1.0312499,2089.7244)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10351"
+       id="linearGradient10357"
+       x1="5"
+       y1="1037.8622"
+       x2="11"
+       y2="1037.8622"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,2)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10359"
+       id="linearGradient10365"
+       x1="9"
+       y1="1043.8622"
+       x2="14"
+       y2="1043.8622"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       gradientTransform="translate(0,2)"
+       inkscape:collect="always"
+       xlink:href="#linearGradient10359-9"
+       id="linearGradient10365-7"
+       x1="9"
+       y1="1043.8622"
+       x2="14"
+       y2="1043.8622"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient10359-9">
+      <stop
+         style="stop-color:#4a77a8;stop-opacity:1;"
+         offset="0"
+         id="stop10361-8" />
+      <stop
+         style="stop-color:#2266a0;stop-opacity:1"
+         offset="1"
+         id="stop10363-6" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient10351-2">
+      <stop
+         style="stop-color:#849abe;stop-opacity:1;"
+         offset="0"
+         id="stop10353-6" />
+      <stop
+         style="stop-color:#677da9;stop-opacity:1"
+         offset="1"
+         id="stop10355-9" />
+    </linearGradient>
+    <linearGradient
+       y2="1037.8622"
+       x2="11"
+       y1="1037.8622"
+       x1="5"
+       gradientTransform="translate(0,12)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient10490"
+       xlink:href="#linearGradient10351-2"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.313708"
+     inkscape:cx="-0.46535304"
+     inkscape:cy="3.7490483"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1241"
+     inkscape:window-height="814"
+     inkscape:window-x="197"
+     inkscape:window-y="57"
+     inkscape:window-maximized="0"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-global="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3999" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline"
+     transform="translate(0,-1036.3622)">
+    <rect
+       style="fill:url(#linearGradient9571);fill-opacity:1;stroke:none;display:inline"
+       id="rect3997-9-2-7"
+       width="10.559891"
+       height="13.265991"
+       x="1.7710609"
+       y="1038.1497" />
+    <rect
+       style="fill:none;stroke:url(#linearGradient9568);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+       id="rect3997-9"
+       width="10.96875"
+       height="14.03125"
+       x="1.5000001"
+       y="1037.8622"
+       rx="0"
+       ry="0" />
+    <rect
+       y="1039.3622"
+       x="3"
+       height="1"
+       width="1.0000002"
+       id="rect18863"
+       style="fill:#879cc0;fill-opacity:1;stroke:none;display:inline" />
+    <rect
+       y="1039.3622"
+       x="5"
+       height="1.0000174"
+       width="6"
+       id="rect18863-4"
+       style="fill:url(#linearGradient10357);fill-opacity:1;stroke:none;display:inline" />
+    <path
+       style="fill:url(#linearGradient10599);fill-opacity:1;stroke:none;display:inline"
+       d="m 5.0037913,1041.3622 0,7 1,0 8.9962087,0 1,0 0,-1 0,-6 -9.9962087,0 z m 1,1 8.9962087,0 0,5 -8.9962087,0 z"
+       id="rect18863-4-5"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccccccc" />
+    <path
+       style="fill:#f2f5fb;fill-opacity:1;stroke:none;display:inline"
+       d="m 6.0037913,1042.3622 8.9962087,0 0,5 -8.9962087,0 z"
+       id="rect18863-4-5-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <rect
+       y="1043.3622"
+       x="7"
+       height="1"
+       width="1.0000002"
+       id="rect18863-4-8-1"
+       style="fill:#4a77a8;fill-opacity:1;stroke:none;display:inline" />
+    <path
+       inkscape:connector-curvature="0"
+       style="opacity:0.5;fill:url(#linearGradient10676);fill-opacity:1;stroke:none;display:inline"
+       d="m 11.96875,1051.3622 1,0 0,-3 -1,0 0,3 z"
+       id="rect18863-4-5-3-5-9" />
+    <rect
+       y="1043.3622"
+       x="9"
+       height="1.0000174"
+       width="5"
+       id="rect18863-4-8-1-4"
+       style="fill:url(#linearGradient10365);fill-opacity:1;stroke:none;display:inline" />
+    <rect
+       y="1045.3622"
+       x="7"
+       height="1"
+       width="1.0000002"
+       id="rect18863-4-8-1-40"
+       style="fill:#4a77a8;fill-opacity:1;stroke:none;display:inline" />
+    <rect
+       y="1045.3622"
+       x="9"
+       height="1.0000174"
+       width="5"
+       id="rect18863-4-8-1-4-7"
+       style="fill:url(#linearGradient10365-7);fill-opacity:1;stroke:none;display:inline" />
+    <rect
+       y="1041.3622"
+       x="3"
+       height="1"
+       width="1.0000002"
+       id="rect18863-7"
+       style="fill:#879cc0;fill-opacity:1;stroke:none;display:inline" />
+    <rect
+       y="1043.3622"
+       x="3"
+       height="1"
+       width="1.0000002"
+       id="rect18863-5"
+       style="fill:#879cc0;fill-opacity:1;stroke:none;display:inline" />
+    <rect
+       y="1045.3622"
+       x="3"
+       height="1"
+       width="1.0000002"
+       id="rect18863-70"
+       style="fill:#879cc0;fill-opacity:1;stroke:none;display:inline" />
+    <rect
+       y="1047.3622"
+       x="3"
+       height="1"
+       width="1.0000002"
+       id="rect18863-9"
+       style="fill:#879cc0;fill-opacity:1;stroke:none;display:inline" />
+    <rect
+       y="1049.3622"
+       x="3"
+       height="1"
+       width="1.0000002"
+       id="rect18863-9-2"
+       style="fill:#879cc0;fill-opacity:1;stroke:none;display:inline" />
+    <rect
+       y="1049.3622"
+       x="5"
+       height="1.0000174"
+       width="6"
+       id="rect18863-4-2"
+       style="fill:url(#linearGradient10490);fill-opacity:1;stroke:none;display:inline" />
+  </g>
+</svg>
diff --git a/bundles/org.eclipse.ui.workbench.texteditor/icons/full/etool16/show_whitespace_chars.svg b/bundles/org.eclipse.ui.workbench.texteditor/icons/full/etool16/show_whitespace_chars.svg
new file mode 100644
index 000000000000..a335a433d563
--- /dev/null
+++ b/bundles/org.eclipse.ui.workbench.texteditor/icons/full/etool16/show_whitespace_chars.svg
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="show_whitespace_chars.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4193">
+      <stop
+         style="stop-color:#6891be;stop-opacity:1;"
+         offset="0"
+         id="stop4195" />
+      <stop
+         style="stop-color:#2877aa;stop-opacity:1"
+         offset="1"
+         id="stop4197" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient9610">
+      <stop
+         style="stop-color:#c7b571;stop-opacity:1"
+         offset="0"
+         id="stop9612" />
+      <stop
+         id="stop9614"
+         offset="1"
+         style="stop-color:#9a9990;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4193"
+       id="linearGradient4199"
+       x1="7.4325085"
+       y1="1044.272"
+       x2="7.4325085"
+       y2="1048.9565"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,1.016466)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.313708"
+     inkscape:cx="-5.2771328"
+     inkscape:cy="-4.0651971"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1885"
+     inkscape:window-height="1025"
+     inkscape:window-x="35"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-global="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3999" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline"
+     transform="translate(0,-1036.3622)">
+    <path
+       style="fill:url(#linearGradient4199);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 12.014757,1040.3787 -5.0312496,0 c 0,0 -2.953125,-0.1719 -2.953125,1.875 0.04959,2.2225 -0.366731,3.3125 1.953125,3.3125 l 0,4.8125 2.0234372,0 -0.016181,-8.0117 0.9927427,0 0,8.0117 2.0274592,0 0.01105,-8 0.992743,0 z"
+       id="path4191"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccccc" />
+    <path
+       style="fill:#8eaac6;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 9.0110488,1041.3622 -2.0000001,0 0,9.0156 1.0156251,0 0,-8.0091 0.984375,0 z"
+       id="path4223"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       style="display:inline;fill:#8eaac6;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 12.005204,1041.3622 -2,0 0,9.0156 1.015625,0 0,-8.0312 0.984375,0 z"
+       id="path4223-4"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/bundles/org.eclipse.ui.workbench.texteditor/icons/full/etool16/toLower.svg b/bundles/org.eclipse.ui.workbench.texteditor/icons/full/etool16/toLower.svg
new file mode 100644
index 000000000000..10bcc26983a4
--- /dev/null
+++ b/bundles/org.eclipse.ui.workbench.texteditor/icons/full/etool16/toLower.svg
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="toLower.svg"
+   inkscape:export-filename="C:\Users\jmietling\Documents\rect3997-9-1.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient4738">
+      <stop
+         style="stop-color:#8cc861;stop-opacity:1"
+         offset="0"
+         id="stop4740" />
+      <stop
+         id="stop4746"
+         offset="0.43753415"
+         style="stop-color:#4aa766;stop-opacity:1" />
+      <stop
+         style="stop-color:#c2dd97;stop-opacity:1"
+         offset="1"
+         id="stop4742" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="27.637859"
+     inkscape:cx="6.2500005"
+     inkscape:cy="1.4297941"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-global="true"
+     inkscape:snap-nodes="false"
+     inkscape:snap-others="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3999"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline"
+     transform="translate(0,-1036.3622)">
+    <path
+       inkscape:connector-curvature="0"
+       id="path4719"
+       d="m 14.92273,1049.2202 c -0.344822,0 -0.638595,-0.1164 -0.881293,-0.3478 -0.266374,-0.2623 -0.408336,-0.6149 -0.425879,-1.0585 -0.393111,0.9273 -0.907663,1.3911 -1.543645,1.3911 -0.574705,0 -1.031961,-0.2317 -1.371781,-0.6955 -0.340056,-0.4739 -0.518626,-1.0939 -0.535705,-1.86 -0.02359,-1.0586 0.246345,-2.0112 0.809827,-2.8581 0.563471,-0.8468 1.239832,-1.2702 2.029078,-1.2702 0.758598,0 1.177984,0.4234 1.25817,1.2702 L 14.49,1042.5122 h 1.310057 c -0.19456,0.8973 -0.385284,1.9698 -0.572161,2.8669 -0.262646,1.2805 -0.389012,2.1424 -0.379123,2.586 0.01033,0.4637 0.14193,0.6956 0.394806,0.6956 m -1.347188,-4.7483 c -0.01102,-0.4939 -0.185101,-0.7409 -0.522249,-0.7409 -0.475083,0 -0.891267,0.5795 -1.248549,1.7389 -0.314906,0.9982 -0.464268,1.86 -0.448086,2.5859 0.0155,0.6956 0.230148,1.0434 0.643933,1.0434 0.413775,0 0.797837,-0.6452 1.152207,-1.9356 0.29711,-1.1089 0.438015,-2.0062 0.422744,-2.6917"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.05178356px;line-height:125%;font-family:AustralianFlyingCorpsStencil;-inkscape-font-specification:AustralianFlyingCorpsStencil;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#236298;fill-opacity:1;stroke:#236298;stroke-width:0.31768805;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       sodipodi:nodetypes="cccscssscccccccsccscc" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path7303"
+       style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:medium;line-height:125%;font-family:'DejaVu Serif';-inkscape-font-specification:'DejaVu Serif Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#236298;fill-opacity:1;stroke:none;stroke-width:1"
+       d="m 0.24061782,1049.3622 0.25938218,-1 h 0.3342643 l 3.3940204,-7 h 0.9784932 l 1.2118579,7 h 0.5813641 l -0.094165,1 H 4.0440496 l 0.2059504,-1 h 0.4 l -0.171974,-1 H 2.1 l -0.5,1 h 0.7 l -0.241596,1 H 0.24061782 m 2.23538608,-3 h 1.8955748 l -0.4871994,-2.9691"
+       sodipodi:nodetypes="cccccccccccccccccccc" />
+    <path
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0"
+       id="path3836"
+       d="m 7.0207947,1046.3622 2.9792,-2.4913 L 7,1041.3622 Z"
+       style="font-style:normal;font-weight:bold;font-size:medium;line-height:125%;font-family:Sans;-inkscape-font-specification:'DejaVu Serif Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#236298;fill-opacity:1;stroke:none" />
+  </g>
+</svg>
diff --git a/bundles/org.eclipse.ui.workbench.texteditor/icons/full/etool16/toUpper.svg b/bundles/org.eclipse.ui.workbench.texteditor/icons/full/etool16/toUpper.svg
new file mode 100644
index 000000000000..67cc2c1be0ce
--- /dev/null
+++ b/bundles/org.eclipse.ui.workbench.texteditor/icons/full/etool16/toUpper.svg
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="toUpper.svg"
+   inkscape:export-filename="C:\Users\jmietling\Documents\rect3997-9-1.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient4738">
+      <stop
+         id="stop4740"
+         offset="0"
+         style="stop-color:#8cc861;stop-opacity:1" />
+      <stop
+         style="stop-color:#4aa766;stop-opacity:1"
+         offset="0.43753415"
+         id="stop4746" />
+      <stop
+         id="stop4742"
+         offset="1"
+         style="stop-color:#c2dd97;stop-opacity:1" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="27.637859"
+     inkscape:cx="1.0043869"
+     inkscape:cy="7.4375007"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-global="true"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:object-nodes="false"
+     inkscape:snap-nodes="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3999"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline"
+     transform="translate(0,-1036.3622)">
+    <path
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0"
+       id="path3836"
+       d="M 8.0207947,1045.3622 10.999995,1042.8709 8,1040.3622 Z"
+       style="font-style:normal;font-weight:bold;font-size:medium;line-height:125%;font-family:Sans;-inkscape-font-specification:'DejaVu Serif Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#236298;fill-opacity:1;stroke:none" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path7303-9-7"
+       style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:medium;line-height:125%;font-family:'DejaVu Serif';-inkscape-font-specification:'DejaVu Serif Bold Italic';letter-spacing:0px;word-spacing:0px;display:inline;fill:#236298;fill-opacity:1;stroke:none;stroke-width:1"
+       d="m 9.240618,1048.3622 0.2593822,-1 h 0.3342643 l 3.3940205,-7 h 0.978493 l 1.211858,7 H 16 l -0.09417,1 h -2.86178 l 0.20595,-1 h 0.4 l -0.171974,-1 H 11.1 l -0.5,1 h 0.7 l -0.241596,1 H 9.240618 m 2.235386,-3 h 1.895575 l -0.487199,-2.9691"
+       sodipodi:nodetypes="cccccccccccccccccccc" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4719-8-2"
+       d="m 5.925696,1048.229 c -0.344822,0 -0.638595,-0.1164 -0.881293,-0.3478 -0.266374,-0.2623 -0.408336,-0.6149 -0.425879,-1.0585 -0.393111,0.9273 -0.907663,1.3911 -1.543645,1.3911 -0.574705,0 -1.031961,-0.2317 -1.371781,-0.6955 -0.340056,-0.4739 -0.5186258,-1.0939 -0.5357048,-1.86 -0.02359,-1.0586 0.2463448,-2.0112 0.8098268,-2.8581 0.563471,-0.8468 1.239832,-1.2702 2.029078,-1.2702 0.758598,0 1.177984,0.4234 1.25817,1.2702 l 0.228498,-1.2792 h 1.310057 c -0.19456,0.8973 -0.385284,1.9698 -0.572161,2.8669 -0.262646,1.2805 -0.389012,2.1424 -0.379123,2.586 0.01033,0.4637 0.14193,0.6956 0.394806,0.6956 m -1.347188,-4.7483 c -0.01102,-0.4939 -0.185101,-0.7409 -0.522249,-0.7409 -0.475083,0 -0.891267,0.5795 -1.248549,1.7389 -0.314906,0.9982 -0.464268,1.86 -0.448086,2.5859 0.0155,0.6956 0.230148,1.0434 0.643933,1.0434 0.413775,0 0.797837,-0.6452 1.152207,-1.9356 0.29711,-1.1089 0.438015,-2.0062 0.422744,-2.6917"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.05178356px;line-height:125%;font-family:AustralianFlyingCorpsStencil;-inkscape-font-specification:AustralianFlyingCorpsStencil;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#236298;fill-opacity:1;stroke:#236298;stroke-width:0.31768805;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       sodipodi:nodetypes="cccscssscccccccsccscc" />
+  </g>
+</svg>
diff --git a/bundles/org.eclipse.ui.workbench.texteditor/icons/full/etool16/wordwrap.svg b/bundles/org.eclipse.ui.workbench.texteditor/icons/full/etool16/wordwrap.svg
new file mode 100644
index 000000000000..d064ae2226d3
--- /dev/null
+++ b/bundles/org.eclipse.ui.workbench.texteditor/icons/full/etool16/wordwrap.svg
@@ -0,0 +1,427 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   version="1.1"
+   width="16"
+   height="16"
+   id="svg2"
+   inkscape:version="1.3 (0e150ed, 2023-07-21)"
+   sodipodi:docname="wordwrap.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1392"
+     inkscape:window-height="1027"
+     id="namedview71"
+     showgrid="true"
+     inkscape:zoom="14.75"
+     inkscape:cx="3.7966102"
+     inkscape:cy="-1.8305085"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"
+     inkscape:showpageshadow="2"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4199"
+       originx="0"
+       originy="0"
+       spacingy="1"
+       spacingx="1"
+       units="px"
+       visible="true" />
+  </sodipodi:namedview>
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient5147">
+      <stop
+         id="stop5149"
+         style="stop-color:#91a5c7;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5151"
+         style="stop-color:#637aa7;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5141">
+      <stop
+         id="stop5143"
+         style="stop-color:#91a5c7;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5145"
+         style="stop-color:#637aa7;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5135">
+      <stop
+         id="stop5137"
+         style="stop-color:#91a5c7;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5139"
+         style="stop-color:#637aa7;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4994">
+      <stop
+         id="stop4996"
+         style="stop-color:#f9fafc;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4998"
+         style="stop-color:#dce7f7;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4902">
+      <stop
+         id="stop4904"
+         style="stop-color:#c7b571;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4906"
+         style="stop-color:#9a9a8f;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4894">
+      <stop
+         id="stop4896"
+         style="stop-color:#e0c88f;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4898"
+         style="stop-color:#d5b269;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4877">
+      <stop
+         id="stop4879"
+         style="stop-color:#91a5c7;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4881"
+         style="stop-color:#5e76a3;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4861">
+      <stop
+         id="stop4863"
+         style="stop-color:#91a5c7;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4865"
+         style="stop-color:#637aa7;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="7.0070496"
+       y1="1043.8571"
+       x2="11"
+       y2="1043.8571"
+       id="linearGradient4867"
+       xlink:href="#linearGradient4877"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5574967,0,0,0.98973058,-7.9134566,6.7250342)" />
+    <linearGradient
+       x1="7.0070496"
+       y1="1045.8571"
+       x2="14"
+       y2="1045.8571"
+       id="linearGradient4869"
+       xlink:href="#linearGradient4861"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.67472995,0,0,0.98973058,-1.7278662,6.7455722)" />
+    <linearGradient
+       x1="7.0070496"
+       y1="1047.8571"
+       x2="14"
+       y2="1047.8571"
+       id="linearGradient4871"
+       xlink:href="#linearGradient5147"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.52052288,0,0,0.98973058,-0.64732963,6.7661112)" />
+    <linearGradient
+       x1="7.0070496"
+       y1="1051.8571"
+       x2="12.016466"
+       y2="1051.8571"
+       id="linearGradient4873"
+       xlink:href="#linearGradient5135"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.49069121,0,0,0.98973058,-0.43829777,6.8071892)" />
+    <linearGradient
+       x1="7.0070496"
+       y1="1049.8571"
+       x2="14"
+       y2="1049.8571"
+       id="linearGradient4875"
+       xlink:href="#linearGradient5141"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.35202605,0,0,1,0.5403856,-3.9999613)" />
+    <linearGradient
+       x1="7.9987183"
+       y1="1042.2307"
+       x2="9.9874563"
+       y2="1040.3303"
+       id="linearGradient4900"
+       xlink:href="#linearGradient4894"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-2)" />
+    <linearGradient
+       x1="10.544736"
+       y1="1038.5779"
+       x2="10.544736"
+       y2="1052.3228"
+       id="linearGradient4908"
+       xlink:href="#linearGradient4902"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.0729393,-3.9972825,-76.818456)" />
+    <linearGradient
+       x1="9.8946028"
+       y1="1039.153"
+       x2="9.8946028"
+       y2="1051.8378"
+       id="linearGradient5000"
+       xlink:href="#linearGradient4994"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-4,-2)" />
+    <linearGradient
+       id="linearGradient4852-7-8">
+      <stop
+         id="stop4854-4-1"
+         style="stop-color:#707070;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4856-0-2"
+         style="stop-color:#a0a0a0;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4844-4-1">
+      <stop
+         id="stop4846-8-4"
+         style="stop-color:#606060;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4848-8-9"
+         style="stop-color:#787878;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="4.7528968"
+       y1="1051.0466"
+       x2="4.7528968"
+       y2="1038.5814"
+       id="linearGradient6120"
+       xlink:href="#linearGradient4852-7-8"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(1.9961442e-6,-9.9830355e-5)" />
+    <linearGradient
+       x1="8.6566515"
+       y1="1050.7386"
+       x2="8.6566515"
+       y2="1037.7"
+       id="linearGradient6122"
+       xlink:href="#linearGradient4844-4-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(1.9961442e-6,-9.9830355e-5)" />
+    <mask
+       id="mask6204">
+      <path
+         d="m 1,1036.3935 0,0.5 0,12.9687 0,0.5 0.5,0 10.0625,0 0.5,0 0,-0.5 0,-9.9687 0,-0.2188 -0.15625,-0.125 -3.0625,-3 -0.125,-0.1562 -0.21875,0 -7,0 -0.5,0 z"
+         id="path6206"
+         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+    </mask>
+    <filter
+       x="-0.39259922"
+       y="-0.39254196"
+       width="1.78503"
+       height="1.78508"
+       color-interpolation-filters="sRGB"
+       id="filter6988">
+      <feGaussianBlur
+         id="feGaussianBlur6990"
+         stdDeviation="1.2049008" />
+    </filter>
+    <linearGradient
+       x1="1.1375329"
+       y1="1045.2078"
+       x2="10.472837"
+       y2="1045.2078"
+       id="linearGradient7074"
+       xlink:href="#linearGradient7084"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,0.58432111,0.58432111,0,-601.73696,1040.3056)" />
+    <linearGradient
+       id="linearGradient7084">
+      <stop
+         id="stop7086"
+         style="stop-color:#fefaef;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop7088"
+         style="stop-color:#fce5a7;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="32"
+       y1="1050.3622"
+       x2="32"
+       y2="1037.3622"
+       id="linearGradient7082"
+       xlink:href="#linearGradient7076"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-19,-0.93755)" />
+    <linearGradient
+       id="linearGradient7076">
+      <stop
+         id="stop7078"
+         style="stop-color:#956413;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop7080"
+         style="stop-color:#c38b1d;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="1.1375329"
+       y1="1045.2078"
+       x2="10.472837"
+       y2="1045.2078"
+       id="linearGradient3026"
+       xlink:href="#linearGradient7084"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.58432111,0,0,0.58432111,15.079637,436.72927)" />
+    <linearGradient
+       x1="32"
+       y1="1050.3622"
+       x2="32"
+       y2="1037.3622"
+       id="linearGradient3028"
+       xlink:href="#linearGradient7076"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="rotate(90,18.428259,1037.8945)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5147"
+       id="linearGradient1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.52052288,0,0,0.98973058,-0.64732999,12.766129)"
+       x1="7.0070496"
+       y1="1047.8571"
+       x2="14"
+       y2="1047.8571" />
+  </defs>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(0,-1036.3622)"
+     id="layer1"
+     style="display:inline"
+     sodipodi:insensitive="true">
+    <path
+       d="m 1.5,1037.8622 h 7.0096685 l 3.0141185,3.2259 v 10.7741 H 1.5 Z"
+       id="rect4001"
+       style="fill:none;stroke:url(#linearGradient4908);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccc" />
+    <rect
+       width="6"
+       height="1"
+       x="3"
+       y="1039.3622"
+       id="rect4001-1"
+       style="display:inline;fill:url(#linearGradient4867);fill-opacity:1;stroke:none;stroke-width:0.999995" />
+    <rect
+       width="5"
+       height="1"
+       x="3"
+       y="1041.3622"
+       id="rect4001-1-7"
+       style="display:inline;fill:url(#linearGradient4869);fill-opacity:1;stroke:none;stroke-width:0.999995" />
+    <rect
+       width="4"
+       height="1"
+       x="3"
+       y="1043.3622"
+       id="rect4001-1-7-4"
+       style="display:inline;fill:url(#linearGradient4871);fill-opacity:1;stroke:none;stroke-width:0.999995" />
+    <rect
+       width="2"
+       height="0.9999826"
+       x="3"
+       y="1045.3622"
+       id="rect4001-1-7-4-0"
+       style="display:inline;fill:url(#linearGradient4875);fill-opacity:1;stroke:none" />
+    <rect
+       width="1.9999999"
+       height="1"
+       x="2.9999998"
+       y="1047.3622"
+       id="rect4001-1-7-4-0-9"
+       style="display:inline;fill:url(#linearGradient4873);fill-opacity:1;stroke:none;stroke-width:0.999995" />
+    <g
+       mask="url(#mask6204)"
+       id="g6200"
+       transform="translate(0.0027175,0.9585)">
+      <g
+         transform="matrix(0.53947849,0,0,0.53947849,7.846281,484.46953)"
+         id="layer1-8"
+         style="display:inline;opacity:0.75;fill:#ffffff;stroke:#ffffff;stroke-width:3.70728;stroke-miterlimit:4;stroke-dasharray:none;filter:url(#filter6988)">
+        <path
+           d="m 13.419292,1038.6553 c -0.468185,-0.4682 -1.221974,-0.4682 -1.690135,-10e-5 l -3.1127968,3.1129 -3.1127723,-3.1128 c -0.4681138,-0.4682 -1.221974,-0.4682 -1.690134,0 l -0.8600555,0.8601 c -0.4681391,0.468 -0.4681272,1.2218 3.66e-5,1.6901 l 3.1127223,3.1128 -3.1127269,3.1127 c -0.4682099,0.4682 -0.468198,1.222 -1.34e-5,1.6902 l 0.8601016,0.8601 c 0.4681344,0.4681 1.2219244,0.4681 1.6901337,0 l 3.1127774,-3.1128 3.1344053,3.1344 c 0.468135,0.4682 1.221925,0.4682 1.690135,0 l 0.860055,-0.86 c 0.46816,-0.4682 0.463458,-1.2173 -3.7e-5,-1.6902 l -3.134406,-3.1344 3.112777,-3.1127 c 0.468181,-0.4683 0.468169,-1.2221 3.4e-5,-1.6902 z"
+           id="rect4043"
+           style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:3.70728;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      </g>
+    </g>
+    <path
+       d="m 15.522638,1046.4194 v -5.8469 c 0,-0.3903 -0.2972,-0.7187 -0.6875,-0.7187 h -0.579139 c -0.3903,0 -0.7188,0.3284 -0.7188,0.7187 v 5.2573 l -3.014561,-0.017 v -2.0145 l -0.9999998,0.017 -3.0323593,3.0323 3.0323593,2.9613 h 0.9999998 v -1.9985 h 3.4687 c 0.9367,0 1.5313,-0.2837 1.5313,-1.3911 z"
+       id="rect3968"
+       style="display:inline;fill:url(#linearGradient3026);fill-opacity:1;stroke:url(#linearGradient3028);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="sssssccccccccss" />
+    <rect
+       width="4"
+       height="1"
+       x="2.9999995"
+       y="1049.3622"
+       id="rect4001-1-7-4-4"
+       style="display:inline;fill:url(#linearGradient1);fill-opacity:1;stroke:none;stroke-width:0.999995" />
+  </g>
+</svg>
diff --git a/bundles/org.eclipse.ui.workbench.texteditor/icons/full/etool16/zoomIn.svg b/bundles/org.eclipse.ui.workbench.texteditor/icons/full/etool16/zoomIn.svg
new file mode 100644
index 000000000000..e4dc8dc2049a
--- /dev/null
+++ b/bundles/org.eclipse.ui.workbench.texteditor/icons/full/etool16/zoomIn.svg
@@ -0,0 +1,226 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="zoomIn.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient4981">
+      <stop
+         style="stop-color:#359b58;stop-opacity:1"
+         offset="0"
+         id="stop4983" />
+      <stop
+         id="stop4991"
+         offset="0.39414415"
+         style="stop-color:#72b649;stop-opacity:1" />
+      <stop
+         id="stop4989"
+         offset="0.5"
+         style="stop-color:#72b649;stop-opacity:1" />
+      <stop
+         style="stop-color:#359b58;stop-opacity:1"
+         offset="1"
+         id="stop4985" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4082">
+      <stop
+         style="stop-color:#4476aa;stop-opacity:1"
+         offset="0"
+         id="stop4084" />
+      <stop
+         id="stop4864"
+         offset="0.5"
+         style="stop-color:#5a9ccc;stop-opacity:1" />
+      <stop
+         style="stop-color:#4476aa;stop-opacity:1"
+         offset="1"
+         id="stop4086" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask5241">
+      <path
+         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+         d="m 2,1041.3622 0,0.5 0,9.0313 0,0.5 0.5,0 12,0 0.5,0 0,-0.5 0,-9.0313 0,-0.5 -0.5,0 -12,0 -0.5,0 z"
+         id="path5243"
+         inkscape:connector-curvature="0" />
+    </mask>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4217"
+       id="linearGradient4223"
+       x1="7.421936"
+       y1="1037.5259"
+       x2="7.421936"
+       y2="1048.2209"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.99602473,0,0,0.99543561,0.01881768,4.7460957)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4217">
+      <stop
+         style="stop-color:#a48944;stop-opacity:1"
+         offset="0"
+         id="stop4219" />
+      <stop
+         style="stop-color:#8b877b;stop-opacity:1"
+         offset="1"
+         id="stop4221" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4281"
+       id="linearGradient4287"
+       x1="10.915962"
+       y1="1046.2192"
+       x2="14.274718"
+       y2="1049.5337"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.117023,0,0,1.1994714,-1.3808519,-209.00036)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4281">
+      <stop
+         style="stop-color:#87877d;stop-opacity:1"
+         offset="0"
+         id="stop4283" />
+      <stop
+         style="stop-color:#71706b;stop-opacity:1"
+         offset="1"
+         id="stop4285" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4384"
+       id="linearGradient4390"
+       x1="13.162096"
+       y1="1048.3848"
+       x2="10.791148"
+       y2="1046.0867"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4384">
+      <stop
+         style="stop-color:#855831;stop-opacity:1;"
+         offset="0"
+         id="stop4386" />
+      <stop
+         id="stop4178"
+         offset="0.41498923"
+         style="stop-color:#855831;stop-opacity:1;" />
+      <stop
+         id="stop4392"
+         offset="0.48587924"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop4388" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627417"
+     inkscape:cx="11.920969"
+     inkscape:cy="4.5591249"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1241"
+     inkscape:window-height="1023"
+     inkscape:window-x="919"
+     inkscape:window-y="529"
+     inkscape:window-maximized="0"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-global="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3999" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline"
+     transform="translate(0,-1036.3622)">
+    <g
+       style="display:inline"
+       id="g4184">
+      <ellipse
+         ry="4.9986653"
+         rx="5.0016232"
+         style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:url(#linearGradient4223);stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path4200"
+         cx="7.5019612"
+         cy="1042.8594" />
+      <path
+         sodipodi:nodetypes="cccccc"
+         style="display:inline;fill:url(#linearGradient4287);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 11.404214,1045.3686 3.604416,3.7747 0,1.2191 -1.283513,0 -3.704558,-3.6687 z"
+         id="path4271"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path4382"
+         d="m 11.032594,1046.369 c 1.096921,1.1702 2.44269,2.4033 3.606727,3.5957"
+         style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient4390);stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+    <g
+       style="display:inline"
+       id="g4289">
+      <ellipse
+         ry="2.0473247"
+         rx="2.0395122"
+         cy="1042.87"
+         cx="7.5000005"
+         id="path4267"
+         style="opacity:1;fill:#a9bad6;fill-opacity:1;stroke:#aab9d6;stroke-width:0.92097563;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4227"
+         d="m 7.0136719,1040.3731 0,5.0175 1,0 0,-5.0175 -1,0 z"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#293dad;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4227-4"
+         d="m 10.004926,1042.3662 -5.0175497,0 0,1 5.0175497,0 0,-1 z"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#293dad;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+    </g>
+  </g>
+</svg>
diff --git a/bundles/org.eclipse.ui.workbench.texteditor/icons/full/etool16/zoomOut.svg b/bundles/org.eclipse.ui.workbench.texteditor/icons/full/etool16/zoomOut.svg
new file mode 100644
index 000000000000..76ee0b5ae14e
--- /dev/null
+++ b/bundles/org.eclipse.ui.workbench.texteditor/icons/full/etool16/zoomOut.svg
@@ -0,0 +1,222 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="zoomOut.svg"
+   inkscape:export-filename="/home/tmccrary/zoomIn.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4384">
+      <stop
+         style="stop-color:#855831;stop-opacity:1;"
+         offset="0"
+         id="stop4386" />
+      <stop
+         id="stop4178"
+         offset="0.41498923"
+         style="stop-color:#855831;stop-opacity:1;" />
+      <stop
+         id="stop4392"
+         offset="0.48587924"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop4388" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4981">
+      <stop
+         style="stop-color:#359b58;stop-opacity:1"
+         offset="0"
+         id="stop4983" />
+      <stop
+         id="stop4991"
+         offset="0.39414415"
+         style="stop-color:#72b649;stop-opacity:1" />
+      <stop
+         id="stop4989"
+         offset="0.5"
+         style="stop-color:#72b649;stop-opacity:1" />
+      <stop
+         style="stop-color:#359b58;stop-opacity:1"
+         offset="1"
+         id="stop4985" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4082">
+      <stop
+         style="stop-color:#4476aa;stop-opacity:1"
+         offset="0"
+         id="stop4084" />
+      <stop
+         id="stop4864"
+         offset="0.5"
+         style="stop-color:#5a9ccc;stop-opacity:1" />
+      <stop
+         style="stop-color:#4476aa;stop-opacity:1"
+         offset="1"
+         id="stop4086" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask5241">
+      <path
+         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+         d="m 2,1041.3622 0,0.5 0,9.0313 0,0.5 0.5,0 12,0 0.5,0 0,-0.5 0,-9.0313 0,-0.5 -0.5,0 -12,0 -0.5,0 z"
+         id="path5243"
+         inkscape:connector-curvature="0" />
+    </mask>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4217"
+       id="linearGradient4223"
+       x1="7.421936"
+       y1="1037.5259"
+       x2="7.421936"
+       y2="1048.2209"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.99602473,0,0,0.99543561,0.01881768,4.7460957)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4217">
+      <stop
+         style="stop-color:#a48944;stop-opacity:1"
+         offset="0"
+         id="stop4219" />
+      <stop
+         style="stop-color:#8b877b;stop-opacity:1"
+         offset="1"
+         id="stop4221" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4281"
+       id="linearGradient4287"
+       x1="10.915962"
+       y1="1046.2192"
+       x2="14.274718"
+       y2="1049.5337"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.117023,0,0,1.1994714,-1.3808519,-209.00036)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4281">
+      <stop
+         style="stop-color:#87877d;stop-opacity:1"
+         offset="0"
+         id="stop4283" />
+      <stop
+         style="stop-color:#71706b;stop-opacity:1"
+         offset="1"
+         id="stop4285" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4384"
+       id="linearGradient4390"
+       x1="13.162096"
+       y1="1048.3848"
+       x2="10.791148"
+       y2="1046.0867"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="181.01934"
+     inkscape:cx="6.9928423"
+     inkscape:cy="3.5317058"
+     inkscape:document-units="px"
+     inkscape:current-layer="g4184"
+     showgrid="true"
+     inkscape:window-width="1241"
+     inkscape:window-height="1023"
+     inkscape:window-x="573"
+     inkscape:window-y="465"
+     inkscape:window-maximized="0"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-global="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3999" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline"
+     transform="translate(0,-1036.3622)">
+    <g
+       style="display:inline"
+       id="g4289" />
+    <g
+       id="g4184">
+      <ellipse
+         ry="4.9986653"
+         rx="5.0016232"
+         style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:url(#linearGradient4223);stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path4200"
+         cx="7.5019612"
+         cy="1042.8594" />
+      <rect
+         y="1041.3622"
+         x="5"
+         height="3"
+         width="5"
+         id="rect4165"
+         style="display:inline;opacity:1;fill:#a9bad6;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         style="display:inline;color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#293dad;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m 10.004926,1042.3662 -5.0175497,0 0,1 5.0175497,0 0,-1 z"
+         id="path4227-4"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="cccccc"
+         style="display:inline;fill:url(#linearGradient4287);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 11.404214,1045.3686 3.604416,3.7747 0,1.2191 -1.283513,0 -3.704558,-3.6687 z"
+         id="path4271"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path4382"
+         d="m 11.032594,1046.369 c 1.096921,1.1702 2.44269,2.4033 3.606727,3.5957"
+         style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient4390);stroke-width:0.75;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>
diff --git a/bundles/org.eclipse.ui.workbench.texteditor/icons/full/eview16/minimap.svg b/bundles/org.eclipse.ui.workbench.texteditor/icons/full/eview16/minimap.svg
new file mode 100644
index 000000000000..b3cd89f3d398
--- /dev/null
+++ b/bundles/org.eclipse.ui.workbench.texteditor/icons/full/eview16/minimap.svg
@@ -0,0 +1,583 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="minimap.svg"
+   inkscape:export-filename="/Users/d021678/Desktop/minimap.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient12028">
+      <stop
+         style="stop-color:#bb8f32;stop-opacity:1;"
+         offset="0"
+         id="stop12030" />
+      <stop
+         style="stop-color:#b77a27;stop-opacity:1"
+         offset="1"
+         id="stop12032" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.86250495,0,0,0.96864481,-3.2873374,30.478462)"
+       inkscape:collect="always"
+       xlink:href="#linearGradient4994-6"
+       id="linearGradient4101"
+       gradientUnits="userSpaceOnUse"
+       x1="9.8946028"
+       y1="1039.153"
+       x2="9.8946028"
+       y2="1051.8378" />
+    <linearGradient
+       id="linearGradient4994-6"
+       inkscape:collect="always">
+      <stop
+         id="stop4996-1"
+         offset="0"
+         style="stop-color:#f9fafc;stop-opacity:1;" />
+      <stop
+         id="stop4998-89"
+         offset="1"
+         style="stop-color:#dce7f7;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4894-6"
+       inkscape:collect="always">
+      <stop
+         id="stop4896-8"
+         offset="0"
+         style="stop-color:#e0c88f;stop-opacity:1" />
+      <stop
+         id="stop4898-5"
+         offset="1"
+         style="stop-color:#d5b269;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.86250495,0,0,0.86250495,0.16268241,140.74758)"
+       gradientUnits="userSpaceOnUse"
+       y2="1041.0148"
+       x2="8.7278719"
+       y1="1042.6919"
+       x1="7.0507908"
+       id="linearGradient4900-1"
+       xlink:href="#linearGradient4894-6"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient4902-3"
+       inkscape:collect="always">
+      <stop
+         id="stop4904-2"
+         offset="0"
+         style="stop-color:#bb9033;stop-opacity:1" />
+      <stop
+         id="stop4906-2"
+         offset="1"
+         style="stop-color:#8f7941;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.84824519,0,0,1.0029888,-3.1630438,-5.1468999)"
+       gradientUnits="userSpaceOnUse"
+       y2="1052.3228"
+       x2="10.544736"
+       y1="1038.5779"
+       x1="10.544736"
+       id="linearGradient4908-2"
+       xlink:href="#linearGradient4902-3"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4877-6">
+      <stop
+         style="stop-color:#91a5c7;stop-opacity:1;"
+         offset="0"
+         id="stop4879-1" />
+      <stop
+         style="stop-color:#5e76a3;stop-opacity:1"
+         offset="1"
+         id="stop4881-4" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.50088261,0,0,0.98969105,-0.5097092,6.7665427)"
+       gradientUnits="userSpaceOnUse"
+       y2="1043.8571"
+       x2="11"
+       y1="1043.8571"
+       x1="7.0070496"
+       id="linearGradient4867-7"
+       xlink:href="#linearGradient4877-6"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient4861-1"
+       inkscape:collect="always">
+      <stop
+         id="stop4863-1"
+         offset="0"
+         style="stop-color:#91a5c7;stop-opacity:1;" />
+      <stop
+         id="stop4865-52"
+         offset="1"
+         style="stop-color:#637aa7;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.71500571,0,0,0.98967363,-2.0100797,6.8052864)"
+       gradientUnits="userSpaceOnUse"
+       y2="1045.8571"
+       x2="14"
+       y1="1045.8571"
+       x1="7.0070496"
+       id="linearGradient4869-17"
+       xlink:href="#linearGradient4861-1"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5141-4">
+      <stop
+         style="stop-color:#91a5c7;stop-opacity:1;"
+         offset="0"
+         id="stop5143-8" />
+      <stop
+         style="stop-color:#637aa7;stop-opacity:1"
+         offset="1"
+         id="stop5145-8" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.71950371,0,0,0.9897604,-2.073052,4.7555175)"
+       gradientUnits="userSpaceOnUse"
+       y2="1049.8571"
+       x2="14"
+       y1="1049.8571"
+       x1="7.0070496"
+       id="linearGradient4875-9"
+       xlink:href="#linearGradient5141-4"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5135-7">
+      <stop
+         style="stop-color:#91a5c7;stop-opacity:1;"
+         offset="0"
+         id="stop5137-4" />
+      <stop
+         style="stop-color:#637aa7;stop-opacity:1"
+         offset="1"
+         id="stop5139-0" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.99812023,0,0,0.98974306,-3.9938773,4.7943389)"
+       gradientUnits="userSpaceOnUse"
+       y2="1051.8571"
+       x2="12.016466"
+       y1="1051.8571"
+       x1="7.0070496"
+       id="linearGradient4873-1"
+       xlink:href="#linearGradient5135-7"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="7.549418"
+       x2="0.9375"
+       y1="4.8437853"
+       x1="0.9375"
+       gradientTransform="matrix(2.1496154,0,0,2.1496154,9.895319,1035.5341)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient6273-3"
+       xlink:href="#linearGradient6281-8"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient6281-8">
+      <stop
+         style="stop-color:#f7f9fb;stop-opacity:1"
+         offset="0"
+         id="stop6283-0" />
+      <stop
+         style="stop-color:#ffd680;stop-opacity:1"
+         offset="1"
+         id="stop6285-5" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask18836">
+      <path
+         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.86250496;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+         d="m 1.03125,1036.3622 0,0.4375 0,11.1875 0,0.4063 0.4375,0 8.125,0 0.4375,0 0,-0.4063 0,-8.1875 0,-0.1875 -0.15625,-0.125 -3.125,-3 -0.125,-0.125 -0.15625,0 -5,0 -0.4375,0 z"
+         id="path18838"
+         inkscape:connector-curvature="0" />
+    </mask>
+    <linearGradient
+       id="linearGradient3955-1">
+      <stop
+         style="stop-color:#c38536;stop-opacity:1"
+         offset="0"
+         id="stop3957-5" />
+      <stop
+         id="stop3959-27"
+         offset="0.15381166"
+         style="stop-color:#f2dc91;stop-opacity:1" />
+      <stop
+         id="stop3961-61"
+         offset="0.5"
+         style="stop-color:#fbdc8b;stop-opacity:1" />
+      <stop
+         style="stop-color:#e6bd7a;stop-opacity:1"
+         offset="0.75"
+         id="stop3963-4" />
+      <stop
+         style="stop-color:#ba772f;stop-opacity:1"
+         offset="1"
+         id="stop3965-2" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient12028"
+       id="linearGradient12022"
+       gradientUnits="userSpaceOnUse"
+       x1="13"
+       y1="1046.3622"
+       x2="13"
+       y2="1051.3622" />
+    <linearGradient
+       y2="6.9843998"
+       x2="10.007812"
+       y1="5"
+       x1="10"
+       gradientTransform="translate(-15.015625,1046.6356)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient6323"
+       xlink:href="#linearGradient5068-6"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient5068-6"
+       inkscape:collect="always">
+      <stop
+         id="stop5070-8"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop5072-3"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(-15.015625,10.2734)"
+       gradientUnits="userSpaceOnUse"
+       y2="1045.3466"
+       x2="12"
+       y1="1043.3622"
+       x1="12"
+       id="linearGradient5084-3"
+       xlink:href="#linearGradient5068-6"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="translate(-15.015625,10.2734)"
+       gradientUnits="userSpaceOnUse"
+       y2="1043.3466"
+       x2="15.007812"
+       y1="1043.3622"
+       x1="13"
+       id="linearGradient5086-8"
+       xlink:href="#linearGradient5068-6"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="translate(-15.015625,10.2734)"
+       gradientUnits="userSpaceOnUse"
+       y2="1042.3622"
+       x2="10.007812"
+       y1="1042.3622"
+       x1="12"
+       id="linearGradient5082-1"
+       xlink:href="#linearGradient5068-6"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="translate(-15.015625,10.2734)"
+       gradientUnits="userSpaceOnUse"
+       y2="1041.3466"
+       x2="8.0078125"
+       y1="1041.3622"
+       x1="10"
+       id="linearGradient5078-8"
+       xlink:href="#linearGradient5068-6"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="translate(-15.015625,10.2734)"
+       gradientUnits="userSpaceOnUse"
+       y2="1038.3466"
+       x2="10.007812"
+       y1="1040.3622"
+       x1="10"
+       id="linearGradient5076-5"
+       xlink:href="#linearGradient5068-6"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="translate(-15.015625,10.2734)"
+       gradientUnits="userSpaceOnUse"
+       y2="1038.3466"
+       x2="10.007812"
+       y1="1038.3622"
+       x1="12"
+       id="linearGradient5074-2"
+       xlink:href="#linearGradient5068-6"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="translate(-15.015625,10.2734)"
+       gradientUnits="userSpaceOnUse"
+       y2="1043.3466"
+       x2="14"
+       y1="1041.3622"
+       x1="14"
+       id="linearGradient5088-1"
+       xlink:href="#linearGradient5068-6"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4528-9-5-7"
+       id="radialGradient3091-1-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.8508179,-8.813921e-6,8.4531434e-6,1.7750589,644.24981,572.63612)"
+       cx="-757.20496"
+       cy="-738.83777"
+       fx="-757.20496"
+       fy="-738.83777"
+       r="3.4803574" />
+    <linearGradient
+       id="linearGradient4528-9-5-7">
+      <stop
+         style="stop-color:#e0c576;stop-opacity:1;"
+         offset="0"
+         id="stop4530-0-5-0" />
+      <stop
+         style="stop-color:#9e7916;stop-opacity:1"
+         offset="1"
+         id="stop4532-7-9-3" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6281-8-0-1-6-6-4"
+       id="linearGradient3093-5-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.3199889,0,0,2.3199889,10.199693,1043.1852)"
+       x1="0.9375"
+       y1="4.8437853"
+       x2="0.9375"
+       y2="7.549418" />
+    <linearGradient
+       id="linearGradient6281-8-0-1-6-6-4">
+      <stop
+         id="stop6283-0-2-2-1-2-0"
+         offset="0"
+         style="stop-color:#f7f9fb;stop-opacity:1" />
+      <stop
+         id="stop6285-5-0-9-7-6-9"
+         offset="1"
+         style="stop-color:#ffd680;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4528-9-5-7-0">
+      <stop
+         style="stop-color:#e0c576;stop-opacity:1;"
+         offset="0"
+         id="stop4530-0-5-0-1" />
+      <stop
+         style="stop-color:#9e7916;stop-opacity:1"
+         offset="1"
+         id="stop4532-7-9-3-0" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6281-8-0-1-6-6-4-6">
+      <stop
+         id="stop6283-0-2-2-1-2-0-8"
+         offset="0"
+         style="stop-color:#f7f9fb;stop-opacity:1" />
+      <stop
+         id="stop6285-5-0-9-7-6-9-9"
+         offset="1"
+         style="stop-color:#ffd680;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.53015325,0,0,0.46291517,7.5855976,555.93776)"
+       gradientUnits="userSpaceOnUse"
+       y2="1052.3228"
+       x2="10.544736"
+       y1="1038.5779"
+       x1="10.544736"
+       id="linearGradient4908-2-5"
+       xlink:href="#linearGradient4902-3"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="matrix(0.54525146,0,0,0.44864202,7.4368407,570.80642)"
+       inkscape:collect="always"
+       xlink:href="#linearGradient4994-6"
+       id="linearGradient4101-4"
+       gradientUnits="userSpaceOnUse"
+       x1="9.8946028"
+       y1="1039.153"
+       x2="9.8946028"
+       y2="1051.8378" />
+    <linearGradient
+       gradientTransform="matrix(0.50088261,0,0,0.98969105,8.4902917,5.7665834)"
+       gradientUnits="userSpaceOnUse"
+       y2="1043.8571"
+       x2="11"
+       y1="1043.8571"
+       x1="7.0070496"
+       id="linearGradient4867-7-7"
+       xlink:href="#linearGradient4877-6"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="matrix(0.50088261,0,0,0.98969105,8.490292,7.7666178)"
+       gradientUnits="userSpaceOnUse"
+       y2="1043.8571"
+       x2="11"
+       y1="1043.8571"
+       x1="7.0070496"
+       id="linearGradient4867-7-7-5"
+       xlink:href="#linearGradient4877-6"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="matrix(0.99812023,0,0,0.98974306,-3.9938773,6.7944)"
+       gradientUnits="userSpaceOnUse"
+       y2="1051.8571"
+       x2="12.016466"
+       y1="1051.8571"
+       x1="7.0070496"
+       id="linearGradient4873-1-4"
+       xlink:href="#linearGradient4861-1"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="39.148716"
+     inkscape:cx="8.8482909"
+     inkscape:cy="6.8635388"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1541"
+     inkscape:window-height="1257"
+     inkscape:window-x="281"
+     inkscape:window-y="51"
+     inkscape:window-maximized="0"
+     inkscape:snap-global="true"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3939" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline"
+     transform="translate(0,-1036.3622)">
+    <path
+       style="display:inline;fill:url(#linearGradient4101);fill-opacity:1;stroke:none"
+       d="m 1.4540964,1036.8074 4.8526314,0 2.9945933,2.9123 0,9.6425 -7.8472247,0 z"
+       id="rect4001-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccc" />
+    <path
+       sodipodi:nodetypes="cccc"
+       style="display:inline;fill:url(#linearGradient4900-1);fill-opacity:1;stroke:none"
+       d="m 6.0039946,1036.4083 0,3.97 3.7178572,0 z"
+       id="path4884"
+       inkscape:connector-curvature="0" />
+    <path
+       style="display:inline;fill:none;stroke:url(#linearGradient4908-2);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 1.5,1036.8622 4.9245256,0 3.0754744,3.4781 0,9.5219 -8,0 z"
+       id="rect4001"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccc" />
+    <rect
+       style="display:inline;fill:url(#linearGradient4867-7);fill-opacity:1;stroke:none"
+       id="rect4001-1"
+       width="1.9999995"
+       height="0.99997723"
+       x="3.0000007"
+       y="1039.3622" />
+    <rect
+       style="display:inline;fill:url(#linearGradient4869-17);fill-opacity:1;stroke:none"
+       id="rect4001-1-7"
+       width="4.9999995"
+       height="0.99995965"
+       x="3.0000007"
+       y="1041.3622" />
+    <rect
+       style="display:inline;fill:url(#linearGradient4875-9);fill-opacity:1;stroke:none"
+       id="rect4001-1-7-4-0"
+       width="5.0314536"
+       height="1.0000473"
+       x="2.9685464"
+       y="1043.3622" />
+    <rect
+       style="display:inline;fill:url(#linearGradient4873-1);fill-opacity:1;stroke:none"
+       id="rect4001-1-7-4-0-9"
+       width="5"
+       height="1.0000298"
+       x="3.0000007"
+       y="1045.3622" />
+    <path
+       style="display:inline;fill:url(#linearGradient4101-4);fill-opacity:1;stroke:none"
+       d="m 10.434242,1036.9024 3.067698,0 1.893098,1.3489 0,4.466 -4.960796,0 z"
+       id="rect4001-3-2"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccc" />
+    <path
+       style="display:inline;fill:none;stroke:url(#linearGradient4908-2-5);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 10.5,1036.8622 3.077829,0 1.922171,1.6053 0,4.3947 -5,0 z"
+       id="rect4001-0"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccc" />
+    <rect
+       style="display:inline;fill:url(#linearGradient4867-7-7);fill-opacity:1;stroke:none"
+       id="rect4001-1-2"
+       width="1.9999995"
+       height="0.99997723"
+       x="12"
+       y="1038.3622" />
+    <rect
+       style="display:inline;fill:url(#linearGradient4867-7-7-5);fill-opacity:1;stroke:none"
+       id="rect4001-1-2-8"
+       width="1.9999995"
+       height="0.99997723"
+       x="12"
+       y="1040.3622" />
+    <rect
+       style="display:inline;fill:url(#linearGradient4873-1-4);fill-opacity:1;stroke:none"
+       id="rect4001-1-7-4-0-9-8"
+       width="5"
+       height="1.0000298"
+       x="3.0000007"
+       y="1047.3622" />
+  </g>
+</svg>
diff --git a/bundles/org.eclipse.ui.workbench.texteditor/icons/full/eview16/templates.svg b/bundles/org.eclipse.ui.workbench.texteditor/icons/full/eview16/templates.svg
new file mode 100644
index 000000000000..189efc2b84c7
--- /dev/null
+++ b/bundles/org.eclipse.ui.workbench.texteditor/icons/full/eview16/templates.svg
@@ -0,0 +1,308 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.0 r9654"
+   sodipodi:docname="templates.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient4092"
+       inkscape:collect="always">
+      <stop
+         id="stop4094"
+         offset="0"
+         style="stop-color:#b4d29d;stop-opacity:1" />
+      <stop
+         id="stop4096"
+         offset="1"
+         style="stop-color:#31955e;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4086"
+       inkscape:collect="always">
+      <stop
+         id="stop4088"
+         offset="0"
+         style="stop-color:#f9fafc;stop-opacity:1" />
+      <stop
+         id="stop4090"
+         offset="1"
+         style="stop-color:#f1f5fa;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4080"
+       inkscape:collect="always">
+      <stop
+         id="stop4082"
+         offset="0"
+         style="stop-color:#6f8db9;stop-opacity:1" />
+      <stop
+         id="stop4084"
+         offset="1"
+         style="stop-color:#2c6ba3;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4723">
+      <stop
+         style="stop-color:#ff7f7f;stop-opacity:1"
+         offset="0"
+         id="stop4725" />
+      <stop
+         style="stop-color:#e5555f;stop-opacity:1"
+         offset="1"
+         id="stop4727" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4713">
+      <stop
+         style="stop-color:#bfb688;stop-opacity:1"
+         offset="0"
+         id="stop4715" />
+      <stop
+         style="stop-color:#8995ac;stop-opacity:1"
+         offset="1"
+         id="stop4717" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4705">
+      <stop
+         style="stop-color:#f9fafc;stop-opacity:1"
+         offset="0"
+         id="stop4707" />
+      <stop
+         style="stop-color:#e3ecf9;stop-opacity:1"
+         offset="1"
+         id="stop4709" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4705"
+       id="linearGradient4711"
+       x1="-13"
+       y1="1038.3622"
+       x2="-13"
+       y2="1050.3622"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.81818182,0,0,1,16.909091,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4713"
+       id="linearGradient4719"
+       x1="-11"
+       y1="1037.3622"
+       x2="-11"
+       y2="1051.3622"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.84615385,0,0,1,17.230769,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4723"
+       id="linearGradient4729"
+       x1="-16"
+       y1="1041.8622"
+       x2="-11"
+       y2="1041.8622"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(24,4.0000174)" />
+    <linearGradient
+       y2="1041.8622"
+       x2="-11"
+       y1="1041.8622"
+       x1="-16"
+       gradientTransform="translate(24,6)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3944"
+       xlink:href="#linearGradient4092"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="1051.3622"
+       x2="-11"
+       y1="1037.3622"
+       x1="-11"
+       gradientTransform="matrix(0.84615385,0,0,0.50000123,19.230769,524.67985)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4027"
+       xlink:href="#linearGradient4080"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="1051.3622"
+       x2="-11"
+       y1="1037.3622"
+       x1="-11"
+       gradientTransform="matrix(0.69230769,0,0,0.35714161,17.461539,673.87708)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4061"
+       xlink:href="#linearGradient4086"
+       inkscape:collect="always" />
+    <filter
+       inkscape:collect="always"
+       id="filter4897"
+       x="-0.24000112"
+       width="1.4800022"
+       y="-0.23999888"
+       height="1.4799978">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.5343775"
+         id="feGaussianBlur4899" />
+    </filter>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask4972">
+      <rect
+         style="fill:#ffffff;fill-opacity:1;stroke:none;display:inline"
+         id="rect4974"
+         width="11"
+         height="14"
+         x="22"
+         y="1037.3622" />
+    </mask>
+    <filter
+       inkscape:collect="always"
+       id="filter4980"
+       x="-0.19636382"
+       width="1.3927276"
+       y="-0.30857097"
+       height="1.6171419">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.90000086"
+         id="feGaussianBlur4982" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627417"
+     inkscape:cx="16.348203"
+     inkscape:cy="7.8322019"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="469"
+     inkscape:window-height="455"
+     inkscape:window-x="50"
+     inkscape:window-y="50"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3931" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline"
+     transform="translate(0,-1036.3622)">
+    <rect
+       style="fill:url(#linearGradient4719);fill-opacity:1;stroke:none"
+       id="rect3933"
+       width="11"
+       height="14"
+       x="2"
+       y="1037.3622" />
+    <rect
+       style="fill:url(#linearGradient4711);fill-opacity:1;stroke:none"
+       id="rect3935"
+       width="9"
+       height="12"
+       x="3"
+       y="1038.3622" />
+    <g
+       id="g4969"
+       mask="url(#mask4972)"
+       transform="translate(-20,0)">
+      <rect
+         y="1043.3622"
+         x="24"
+         height="7.0000172"
+         width="11"
+         id="rect3933-6-8"
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;display:inline;filter:url(#filter4980)" />
+    </g>
+    <rect
+       style="fill:url(#linearGradient4027);fill-opacity:1;stroke:none;display:inline"
+       id="rect3933-6"
+       width="11"
+       height="7.0000172"
+       x="4"
+       y="1043.3622" />
+    <rect
+       style="fill:url(#linearGradient4061);fill-opacity:1;stroke:none;display:inline"
+       id="rect3933-6-2"
+       width="9"
+       height="4.9999828"
+       x="5"
+       y="1044.3622" />
+    <rect
+       style="fill:url(#linearGradient4729);fill-opacity:1;stroke:none"
+       id="rect4721"
+       width="5"
+       height="1"
+       x="8"
+       y="1045.3622" />
+    <rect
+       style="fill:url(#linearGradient3944);fill-opacity:1;stroke:none;display:inline"
+       id="rect4721-9"
+       width="5"
+       height="1"
+       x="8"
+       y="1047.3622" />
+    <rect
+       style="fill:#e04e59;fill-opacity:1;stroke:none;display:inline"
+       id="rect4721-7"
+       width="1"
+       height="1"
+       x="6"
+       y="1045.3622" />
+    <rect
+       style="fill:#1a8b53;fill-opacity:1;stroke:none;display:inline"
+       id="rect4721-9-1"
+       width="1"
+       height="1"
+       x="6"
+       y="1047.3622" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;display:inline;filter:url(#filter4897)"
+       d="m 4,1039.3622 0,3 1.15625,-1.1562 3.5,3.5 0.6875,-0.7188 -3.46875,-3.5 1.125,-1.125 -3,0 z"
+       id="path4098-8" />
+    <path
+       style="fill:#17325d;fill-opacity:1;stroke:none"
+       d="m 4,1039.3622 0,3 1.15625,-1.1562 3.5,3.5 0.6875,-0.7188 -3.46875,-3.5 1.125,-1.125 -3,0 z"
+       id="path4098"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/bundles/org.eclipse.ui.workbench.texteditor/icons/full/obj16/context.svg b/bundles/org.eclipse.ui.workbench.texteditor/icons/full/obj16/context.svg
new file mode 100644
index 000000000000..9b09e9b18488
--- /dev/null
+++ b/bundles/org.eclipse.ui.workbench.texteditor/icons/full/obj16/context.svg
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="toc_topic_obj.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4446">
+      <stop
+         style="stop-color:#d1d6dd;stop-opacity:1"
+         offset="0"
+         id="stop4448" />
+      <stop
+         style="stop-color:#bfc9d6;stop-opacity:1"
+         offset="1"
+         id="stop4450" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4289">
+      <stop
+         style="stop-color:#bfc9d6;stop-opacity:1"
+         offset="0"
+         id="stop4291" />
+      <stop
+         style="stop-color:#cbd2db;stop-opacity:1"
+         offset="1"
+         id="stop4293" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4209">
+      <stop
+         style="stop-color:#eef6ff;stop-opacity:1"
+         offset="0"
+         id="stop4211" />
+      <stop
+         style="stop-color:#fdfeff;stop-opacity:1"
+         offset="1"
+         id="stop4213" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4201">
+      <stop
+         style="stop-color:#717883;stop-opacity:1"
+         offset="0"
+         id="stop4203" />
+      <stop
+         style="stop-color:#81733e;stop-opacity:1"
+         offset="1"
+         id="stop4205" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4179">
+      <stop
+         style="stop-color:#d6e0e6;stop-opacity:1;"
+         offset="0"
+         id="stop4181" />
+      <stop
+         style="stop-color:#d6e0e6;stop-opacity:0;"
+         offset="1"
+         id="stop4183" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4201"
+       id="linearGradient4207"
+       x1="21.948286"
+       y1="1035.7197"
+       x2="21.948286"
+       y2="1028.4276"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-14.203124,22.029685)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4209"
+       id="linearGradient4215"
+       x1="20.93182"
+       y1="1036.2058"
+       x2="20.93182"
+       y2="1030.549"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-14.203124,22.029685)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4289"
+       id="linearGradient4295"
+       x1="23.191113"
+       y1="1022.8389"
+       x2="26.21289"
+       y2="1022.8389"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       gradientTransform="translate(-5.4632568e-7,-2.0000302)"
+       inkscape:collect="always"
+       xlink:href="#linearGradient4289"
+       id="linearGradient4295-6"
+       x1="23.191113"
+       y1="1022.8389"
+       x2="26.212891"
+       y2="1022.8389"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       gradientTransform="translate(-5.4632568e-7,-3.9844052)"
+       inkscape:collect="always"
+       xlink:href="#linearGradient4289"
+       id="linearGradient4295-6-2"
+       x1="23.191113"
+       y1="1022.8389"
+       x2="26.212891"
+       y2="1022.8389"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4179"
+       id="linearGradient4374"
+       gradientUnits="userSpaceOnUse"
+       x1="15.156249"
+       y1="1043.7998"
+       x2="28.135472"
+       y2="1043.7998" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4446"
+       id="linearGradient4452"
+       x1="17.205662"
+       y1="1020.3426"
+       x2="21.227332"
+       y2="1020.3426"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-14.203124,34.030335)" />
+    <linearGradient
+       gradientTransform="translate(-14.203124,36.037394)"
+       inkscape:collect="always"
+       xlink:href="#linearGradient4446"
+       id="linearGradient4452-6"
+       x1="17.205662"
+       y1="1020.3426"
+       x2="21.227331"
+       y2="1020.3426"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.6568542"
+     inkscape:cx="16.491742"
+     inkscape:cy="3.3705216"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="964"
+     inkscape:window-height="972"
+     inkscape:window-x="1353"
+     inkscape:window-y="422"
+     inkscape:window-maximized="0"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-global="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3999" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline"
+     transform="translate(0,-1036.3622)">
+    <g
+       id="g4580"
+       transform="translate(0,-11.992529)">
+      <g
+         id="g4571">
+        <rect
+           y="1051.3237"
+           x="8.2643099"
+           height="8.5930243"
+           width="6.248764"
+           id="rect4217"
+           style="opacity:1;fill:#3d4b65;fill-opacity:1;stroke:#3d4b65;stroke-width:1;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           sodipodi:nodetypes="cssccssccscccs"
+           inkscape:connector-curvature="0"
+           d="m 7.535109,1056.0246 -2.209709,0 c -0.369764,0 -0.359452,-1.0385 -0.795495,-1.0385 l -3.071495,0 0,4.9497 2.452777,0 c 0.637939,0 0.201444,1.0469 0.60439,1.0469 l 3.019532,0 z m -0.0221,0.044 c 0,-0.4897 1.06066,-1.0164 1.06066,-1.0164 l -0.132583,4.9939 -0.883883,0.8839 c 0,0 -0.04419,-2.1102 -0.04419,-4.8614 z"
+           style="display:inline;fill:#3d4b65;fill-opacity:1;fill-rule:evenodd;stroke:#3d4b65;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           id="path4192-8" />
+        <path
+           inkscape:connector-curvature="0"
+           d="m 7.57662,1051.91 -2.209709,0 c -0.369764,0 -0.359452,-1.0385 -0.795495,-1.0385 l -3.071495,0 0,8.0433 2.452777,0 c 0.637939,0 0.201444,1.0469 0.60439,1.0469 l 3.019532,0 z m -0.0221,0.044 c 0,-0.4897 0.570981,-1.0164 1.06066,-1.0164 l 4.905553,0 0,8.0875 c 0,0 -3.574259,0 -5.038136,0 -0.350397,0 -0.883883,0.8839 -0.883883,0.8839 0,0 -0.04419,-5.2038 -0.04419,-7.955 z"
+           style="fill:url(#linearGradient4215);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4207);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           id="path4192" />
+        <g
+           transform="translate(-14.171874,34.029685)"
+           style="stroke:url(#linearGradient4374)"
+           id="g4369">
+          <rect
+             style="opacity:1;fill:url(#linearGradient4295);fill-opacity:1;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             id="rect4287"
+             width="3.0217779"
+             height="1.0109552"
+             x="23.191113"
+             y="1022.3334" />
+          <rect
+             style="display:inline;opacity:1;fill:url(#linearGradient4295-6);fill-opacity:1;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             id="rect4287-1"
+             width="3.0217779"
+             height="1.0109552"
+             x="23.191113"
+             y="1020.3334" />
+          <rect
+             style="display:inline;opacity:1;fill:url(#linearGradient4295-6-2);fill-opacity:1;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             id="rect4287-1-6"
+             width="3.0217779"
+             height="1.0109552"
+             x="23.191113"
+             y="1018.349" />
+        </g>
+      </g>
+      <path
+         id="path4192-1"
+         style="display:inline;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4452);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 7.024208,1054.8923 -1.325826,0 c -0.369764,0 -0.359452,-1.0385 -0.795495,-1.0385 l -1.900349,0"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cssc" />
+      <path
+         id="path4192-1-0"
+         style="display:inline;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4452-6);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 7.024208,1056.8993 -1.325826,0 c -0.369764,0 -0.359452,-1.0385 -0.795495,-1.0385 l -1.900349,0"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cssc" />
+    </g>
+  </g>
+</svg>
diff --git a/bundles/org.eclipse.ui.workbench.texteditor/icons/full/obj16/preview.svg b/bundles/org.eclipse.ui.workbench.texteditor/icons/full/obj16/preview.svg
new file mode 100644
index 000000000000..93aba6a8ecec
--- /dev/null
+++ b/bundles/org.eclipse.ui.workbench.texteditor/icons/full/obj16/preview.svg
@@ -0,0 +1,210 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="preview.svg"
+   inkscape:export-filename="/home/tmccrary/zoomIn.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4384">
+      <stop
+         style="stop-color:#855831;stop-opacity:1;"
+         offset="0"
+         id="stop4386" />
+      <stop
+         id="stop4178"
+         offset="0.41498923"
+         style="stop-color:#855831;stop-opacity:1;" />
+      <stop
+         id="stop4392"
+         offset="0.48587924"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop4388" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4981">
+      <stop
+         style="stop-color:#359b58;stop-opacity:1"
+         offset="0"
+         id="stop4983" />
+      <stop
+         id="stop4991"
+         offset="0.39414415"
+         style="stop-color:#72b649;stop-opacity:1" />
+      <stop
+         id="stop4989"
+         offset="0.5"
+         style="stop-color:#72b649;stop-opacity:1" />
+      <stop
+         style="stop-color:#359b58;stop-opacity:1"
+         offset="1"
+         id="stop4985" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4082">
+      <stop
+         style="stop-color:#4476aa;stop-opacity:1"
+         offset="0"
+         id="stop4084" />
+      <stop
+         id="stop4864"
+         offset="0.5"
+         style="stop-color:#5a9ccc;stop-opacity:1" />
+      <stop
+         style="stop-color:#4476aa;stop-opacity:1"
+         offset="1"
+         id="stop4086" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask5241">
+      <path
+         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+         d="m 2,1041.3622 0,0.5 0,9.0313 0,0.5 0.5,0 12,0 0.5,0 0,-0.5 0,-9.0313 0,-0.5 -0.5,0 -12,0 -0.5,0 z"
+         id="path5243"
+         inkscape:connector-curvature="0" />
+    </mask>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4217"
+       id="linearGradient4223"
+       x1="7.421936"
+       y1="1037.5259"
+       x2="7.421936"
+       y2="1048.2209"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.99602473,0,0,0.99543561,0.01881768,4.7460957)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4217">
+      <stop
+         style="stop-color:#a48944;stop-opacity:1"
+         offset="0"
+         id="stop4219" />
+      <stop
+         style="stop-color:#8b877b;stop-opacity:1"
+         offset="1"
+         id="stop4221" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4281"
+       id="linearGradient4287"
+       x1="10.915962"
+       y1="1046.2192"
+       x2="14.274718"
+       y2="1049.5337"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.117023,0,0,1.1994714,-1.3808519,-209.00036)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4281">
+      <stop
+         style="stop-color:#87877d;stop-opacity:1"
+         offset="0"
+         id="stop4283" />
+      <stop
+         style="stop-color:#71706b;stop-opacity:1"
+         offset="1"
+         id="stop4285" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4384"
+       id="linearGradient4390"
+       x1="13.162096"
+       y1="1048.3848"
+       x2="10.791148"
+       y2="1046.0867"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="45.254835"
+     inkscape:cx="3.7142439"
+     inkscape:cy="4.9493659"
+     inkscape:document-units="px"
+     inkscape:current-layer="g4184"
+     showgrid="true"
+     inkscape:window-width="1241"
+     inkscape:window-height="1023"
+     inkscape:window-x="573"
+     inkscape:window-y="465"
+     inkscape:window-maximized="0"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-global="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3999" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline"
+     transform="translate(0,-1036.3622)">
+    <g
+       style="display:inline"
+       id="g4289" />
+    <g
+       id="g4184">
+      <ellipse
+         ry="4.9986653"
+         rx="5.0016232"
+         style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:url(#linearGradient4223);stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path4200"
+         cx="7.5019612"
+         cy="1042.8594" />
+      <path
+         sodipodi:nodetypes="cccccc"
+         style="display:inline;fill:url(#linearGradient4287);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 11.404214,1045.3686 3.604416,3.7747 0,1.2191 -1.283513,0 -3.704558,-3.6687 z"
+         id="path4271"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path4382"
+         d="m 11.032594,1046.369 c 1.096921,1.1702 2.44269,2.4033 3.606727,3.5957"
+         style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient4390);stroke-width:0.75;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>
diff --git a/bundles/org.eclipse.ui.workbench.texteditor/icons/full/obj16/template_obj.svg b/bundles/org.eclipse.ui.workbench.texteditor/icons/full/obj16/template_obj.svg
new file mode 100644
index 000000000000..6a2a32964f01
--- /dev/null
+++ b/bundles/org.eclipse.ui.workbench.texteditor/icons/full/obj16/template_obj.svg
@@ -0,0 +1,285 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="template_obj.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient4972">
+      <stop
+         style="stop-color:#c7e3e7;stop-opacity:1;"
+         offset="0"
+         id="stop4974" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop4976" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4894">
+      <stop
+         style="stop-color:#7e707a;stop-opacity:1;"
+         offset="0"
+         id="stop4896" />
+      <stop
+         style="stop-color:#8a5e8d;stop-opacity:1"
+         offset="1"
+         id="stop4898" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4894"
+       id="linearGradient4900"
+       x1="7.3804269"
+       y1="2.7417479"
+       x2="0.044194315"
+       y2="2.7859421"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1295495,0,0,1.2357023,3.4694144,1036.4202)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4972"
+       id="linearGradient4978"
+       x1="5.1146582"
+       y1="1044.7372"
+       x2="12.520393"
+       y2="1044.7372"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4972-5"
+       id="linearGradient5138-5"
+       gradientUnits="userSpaceOnUse"
+       x1="5.1146584"
+       y1="1044.7372"
+       x2="12.520393"
+       y2="1044.7372" />
+    <linearGradient
+       id="linearGradient4972-5">
+      <stop
+         style="stop-color:#85c2cb;stop-opacity:1;"
+         offset="0"
+         id="stop4974-7" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop4976-1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4972-4-1">
+      <stop
+         style="stop-color:#daedef;stop-opacity:1;"
+         offset="0"
+         id="stop4974-6-9" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop4976-2-4" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6799-4-3">
+      <stop
+         style="stop-color:#a6bacf;stop-opacity:1;"
+         offset="0"
+         id="stop6801-4-0" />
+      <stop
+         style="stop-color:#798da2;stop-opacity:1;"
+         offset="1"
+         id="stop6803-5-7" />
+    </linearGradient>
+    <linearGradient
+       y2="1044.7372"
+       x2="12.520393"
+       y1="1044.7372"
+       x1="5.1146584"
+       gradientTransform="matrix(1.0469997,0,0,1.0188679,1.9141168,-19.251887)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5417"
+       xlink:href="#linearGradient4972-4-1"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="1047.6122"
+       x2="6.0002952"
+       y1="1047.6122"
+       x1="5.1146584"
+       gradientTransform="matrix(1.0469997,0,0,1.0188679,1.9141168,-22.404012)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5419"
+       xlink:href="#linearGradient6799-4-3"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient6799-4-3-8">
+      <stop
+         style="stop-color:#a6bacf;stop-opacity:1;"
+         offset="0"
+         id="stop6801-4-0-5" />
+      <stop
+         style="stop-color:#798da2;stop-opacity:1;"
+         offset="1"
+         id="stop6803-5-7-2" />
+    </linearGradient>
+    <linearGradient
+       y2="1044.7372"
+       x2="12.520393"
+       y1="1044.7372"
+       x1="5.1146584"
+       gradientTransform="matrix(1.163235,0,0,0.88082597,-1.3209316,125.71553)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4891-29"
+       xlink:href="#linearGradient6799-4-3-9-9"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient6799-4-3-9-9">
+      <stop
+         style="stop-color:#a6bacf;stop-opacity:1;"
+         offset="0"
+         id="stop6801-4-0-1-4" />
+      <stop
+         style="stop-color:#798da2;stop-opacity:1;"
+         offset="1"
+         id="stop6803-5-7-1-4" />
+    </linearGradient>
+    <linearGradient
+       y2="1044.7372"
+       x2="12.520393"
+       y1="1044.7372"
+       x1="5.1146584"
+       gradientTransform="matrix(0.72702183,0,0,0.88079591,1.4861494,126.97218)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4925-6"
+       xlink:href="#linearGradient6799-4-3-9-0-0"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient6799-4-3-9-0-0">
+      <stop
+         style="stop-color:#a6bacf;stop-opacity:1;"
+         offset="0"
+         id="stop6801-4-0-1-3-2" />
+      <stop
+         style="stop-color:#798da2;stop-opacity:1;"
+         offset="1"
+         id="stop6803-5-7-1-5-1" />
+    </linearGradient>
+    <linearGradient
+       y2="1044.7372"
+       x2="12.520393"
+       y1="1044.7372"
+       x1="5.1146584"
+       gradientTransform="matrix(1.163235,0,0,0.88085603,-1.3209316,124.45888)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4969"
+       xlink:href="#linearGradient6799-4-3-8"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="6.1487591"
+     inkscape:cy="4.5666429"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1171"
+     inkscape:window-height="959"
+     inkscape:window-x="1384"
+     inkscape:window-y="24"
+     inkscape:window-maximized="0"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-global="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3022" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline"
+     transform="translate(0,-1036.3622)">
+    <g
+       id="g4087"
+       transform="matrix(1.6322255,0,0,1.6585351,-10.172103,-689.24457)"
+       style="fill:url(#linearGradient4978);fill-opacity:1">
+      <rect
+         ry="0"
+         y="1041.3597"
+         x="7.7534022"
+         height="7.6753397"
+         width="6.7853222"
+         id="rect6795"
+         style="color:#000000;fill:url(#linearGradient5417);fill-opacity:1;stroke:url(#linearGradient5419);stroke-width:0.63910681;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    </g>
+    <rect
+       y="1038.0304"
+       x="2.6822987"
+       height="2.6134865"
+       width="10.725135"
+       id="rect6891"
+       style="opacity:0.77310947;color:#000000;fill:#fef17a;fill-opacity:1;stroke:#c89840;stroke-width:1.36659169;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient4900);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect4892"
+       width="7.9871211"
+       height="0.98299515"
+       x="4.0185289"
+       y="1039.3713" />
+    <g
+       id="g6750"
+       style="fill:url(#linearGradient5138-5);fill-opacity:1;display:inline"
+       transform="matrix(1.6322255,0,0,1.6322255,-6.0620452,-660.70836)">
+      <rect
+         y="1044.0166"
+         x="6.1646171"
+         height="0.61263388"
+         width="4.9012837"
+         id="rect6891-5-7-3-9"
+         style="color:#000000;fill:url(#linearGradient4969);fill-opacity:1;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         y="1045.2419"
+         x="6.1646171"
+         height="0.61261296"
+         width="4.9012837"
+         id="rect6891-5-7-3-9-7"
+         style="color:#000000;fill:url(#linearGradient4891-29);fill-opacity:1;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         y="1046.4673"
+         x="6.1646171"
+         height="0.61259204"
+         width="3.063302"
+         id="rect6891-5-7-3-9-7-4"
+         style="color:#000000;fill:url(#linearGradient4925-6);fill-opacity:1;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    </g>
+  </g>
+</svg>
diff --git a/bundles/org.eclipse.ui.workbench.texteditor/plugin.xml b/bundles/org.eclipse.ui.workbench.texteditor/plugin.xml
index 9c861c23c221..e2ef210299f6 100644
--- a/bundles/org.eclipse.ui.workbench.texteditor/plugin.xml
+++ b/bundles/org.eclipse.ui.workbench.texteditor/plugin.xml
@@ -513,36 +513,31 @@
 	<extension point="org.eclipse.ui.commandImages">
 		<image
 			commandId="org.eclipse.ui.edit.text.zoomIn"
-			icon="$nl$/icons/full/etool16/zoomIn.png">
+			icon="$nl$/icons/full/etool16/zoomIn.svg">
 		</image>
 		<image
 			commandId="org.eclipse.ui.edit.text.zoomOut"
-			icon="$nl$/icons/full/etool16/zoomOut.png">
+			icon="$nl$/icons/full/etool16/zoomOut.svg">
 		</image>
   <image
         commandId="org.eclipse.ui.edit.text.toggleShowWhitespaceCharacters"
-        disabledIcon="$nl$/icons/full/dtool16/show_whitespace_chars.png"
-        icon="$nl$/icons/full/etool16/show_whitespace_chars.png">
+        icon="$nl$/icons/full/etool16/show_whitespace_chars.svg">
   </image>
   <image
         commandId="org.eclipse.ui.edit.text.toggleWordWrap"
-        disabledIcon="$nl$/icons/full/dtool16/wordwrap.png"
-        icon="$nl$/icons/full/etool16/wordwrap.png">
+        icon="$nl$/icons/full/etool16/wordwrap.svg">
   </image>
   <image
         commandId="org.eclipse.ui.edit.text.toggleBlockSelectionMode"
-        disabledIcon="$nl$/icons/full/dtool16/block_selection_mode.png"
-        icon="$nl$/icons/full/etool16/block_selection_mode.png">
+        icon="$nl$/icons/full/etool16/block_selection_mode.svg">
   </image>
   <image
         commandId="org.eclipse.ui.edit.text.upperCase"
-        disabledIcon="icons/full/dtool16/toUpper.png"
-        icon="icons/full/etool16/toUpper.png">
+        icon="icons/full/etool16/toUpper.svg">
   </image>
   <image
         commandId="org.eclipse.ui.edit.text.lowerCase"
-        disabledIcon="icons/full/dtool16/toLower.png"
-        icon="icons/full/etool16/toLower.png">
+        icon="icons/full/etool16/toLower.svg">
   </image>
 	</extension>
    
@@ -1294,8 +1289,7 @@
                toolbarPath="Normal/Presentation"
                id="org.eclipse.ui.edit.text.toggleShowSelectedElementOnly"
                definitionId="org.eclipse.ui.edit.text.toggleShowSelectedElementOnly"
-               disabledIcon="$nl$/icons/full/dtool16/segment_edit.png"
-               icon="$nl$/icons/full/etool16/segment_edit.png"
+               icon="$nl$/icons/full/etool16/segment_edit.svg"
                helpContextId="org.eclipse.ui.only_show_selected_element_action_context"
                label="%onlyShowSelectedElement.label"
                retarget="true"
@@ -1304,9 +1298,8 @@
          <action
                allowLabelUpdate="true"
                definitionId="org.eclipse.ui.edit.text.toggleShowWhitespaceCharacters"
-               disabledIcon="$nl$/icons/full/dtool16/show_whitespace_chars.png"
                helpContextId="org.eclipse.ui.show_whitespace_characters_action_context"
-               icon="$nl$/icons/full/etool16/show_whitespace_chars.png"
+               icon="$nl$/icons/full/etool16/show_whitespace_chars.svg"
                id="org.eclipse.ui.edit.text.toggleShowWhitespaceCharacters"
                label="%showWhitespaceCharacters.label"
                retarget="true"
@@ -1317,9 +1310,8 @@
          <action
                allowLabelUpdate="true"
                definitionId="org.eclipse.ui.edit.text.toggleBlockSelectionMode"
-               disabledIcon="$nl$/icons/full/dtool16/block_selection_mode.png"
                helpContextId="org.eclipse.ui.block_selection_mode_action_context"
-               icon="$nl$/icons/full/etool16/block_selection_mode.png"
+               icon="$nl$/icons/full/etool16/block_selection_mode.svg"
                id="org.eclipse.ui.edit.text.toggleBlockSelectionMode"
                label="%toggleBlockSelectionMode.label"
                retarget="true"
@@ -1330,9 +1322,8 @@
          <action
                allowLabelUpdate="true"
                definitionId="org.eclipse.ui.edit.text.toggleWordWrap"
-               disabledIcon="$nl$/icons/full/dtool16/wordwrap.png"
                helpContextId="org.eclipse.ui.word_wrap_toggle_action_context"
-               icon="$nl$/icons/full/etool16/wordwrap.png"
+               icon="$nl$/icons/full/etool16/wordwrap.svg"
                id="org.eclipse.ui.edit.text.toggleWordWrap"
                label="%toggleWordWrap.label"
                retarget="true"
@@ -1480,7 +1471,7 @@
       <view
             category="org.eclipse.ui"
             class="org.eclipse.ui.internal.views.minimap.MinimapView"
-            icon="icons/full/eview16/minimap.png"
+            icon="icons/full/eview16/minimap.svg"
             id="org.eclipse.ui.views.minimap.MinimapView"
             name="%MinimapView.name"
             allowMultiple="false"
diff --git a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/findandreplace/overlay/FindReplaceOverlayImages.java b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/findandreplace/overlay/FindReplaceOverlayImages.java
index e94c58d58687..cab6633efdbe 100644
--- a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/findandreplace/overlay/FindReplaceOverlayImages.java
+++ b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/findandreplace/overlay/FindReplaceOverlayImages.java
@@ -61,18 +61,18 @@ class FindReplaceOverlayImages {
 	 * Declare all images
 	 */
 	private static void declareImages() {
-		declareRegistryImage(KEY_CLOSE, ELCL + "close.png"); //$NON-NLS-1$
-		declareRegistryImage(KEY_FIND_NEXT, ELCL + "select_next.png"); //$NON-NLS-1$
-		declareRegistryImage(KEY_FIND_PREV, ELCL + "select_prev.png"); //$NON-NLS-1$
-		declareRegistryImage(KEY_FIND_REGEX, ELCL + "regex.png"); //$NON-NLS-1$
-		declareRegistryImage(KEY_REPLACE_ALL, ELCL + "replace_all.png"); //$NON-NLS-1$
-		declareRegistryImage(KEY_REPLACE, ELCL + "replace.png"); //$NON-NLS-1$
-		declareRegistryImage(KEY_WHOLE_WORD, ELCL + "whole_word.png"); //$NON-NLS-1$
-		declareRegistryImage(KEY_CASE_SENSITIVE, ELCL + "case_sensitive.png"); //$NON-NLS-1$
-		declareRegistryImage(KEY_SEARCH_ALL, ELCL + "search_all.png"); //$NON-NLS-1$
-		declareRegistryImage(KEY_SEARCH_IN_AREA, ELCL + "search_in_area.png"); //$NON-NLS-1$
-		declareRegistryImage(KEY_OPEN_REPLACE_AREA, ELCL + "open_replace.png"); //$NON-NLS-1$
-		declareRegistryImage(KEY_CLOSE_REPLACE_AREA, ELCL + "close_replace.png"); //$NON-NLS-1$
+		declareRegistryImage(KEY_CLOSE, ELCL + "close.svg"); //$NON-NLS-1$
+		declareRegistryImage(KEY_FIND_NEXT, ELCL + "select_next.svg"); //$NON-NLS-1$
+		declareRegistryImage(KEY_FIND_PREV, ELCL + "select_prev.svg"); //$NON-NLS-1$
+		declareRegistryImage(KEY_FIND_REGEX, ELCL + "regex.svg"); //$NON-NLS-1$
+		declareRegistryImage(KEY_REPLACE_ALL, ELCL + "replace_all.svg"); //$NON-NLS-1$
+		declareRegistryImage(KEY_REPLACE, ELCL + "replace.svg"); //$NON-NLS-1$
+		declareRegistryImage(KEY_WHOLE_WORD, ELCL + "whole_word.svg"); //$NON-NLS-1$
+		declareRegistryImage(KEY_CASE_SENSITIVE, ELCL + "case_sensitive.svg"); //$NON-NLS-1$
+		declareRegistryImage(KEY_SEARCH_ALL, ELCL + "search_all.svg"); //$NON-NLS-1$
+		declareRegistryImage(KEY_SEARCH_IN_AREA, ELCL + "search_in_area.svg"); //$NON-NLS-1$
+		declareRegistryImage(KEY_OPEN_REPLACE_AREA, ELCL + "open_replace.svg"); //$NON-NLS-1$
+		declareRegistryImage(KEY_CLOSE_REPLACE_AREA, ELCL + "close_replace.svg"); //$NON-NLS-1$
 		declareRegistryImage(KEY_OPEN_HISTORY, ELCL + "open_history.png"); //$NON-NLS-1$
 	}
 
@@ -119,7 +119,7 @@ public static ImageRegistry getImageRegistry() {
 	 * DLCL_ Object large OBJL_ Object small OBJS_ View VIEW_ Product images PROD_
 	 * Misc images MISC_
 	 *
-	 * Where are the images? The images (typically pngs) are found in the same
+	 * Where are the images? The images (typically SVGs) are found in the same
 	 * location as this plugin class. This may mean the same package directory as
 	 * the package holding this class. The images are declared using this.getClass()
 	 * to ensure they are looked up via this plugin class.
diff --git a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/AbstractTemplatesPage.java b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/AbstractTemplatesPage.java
index 95db41724417..cf16109246ea 100644
--- a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/AbstractTemplatesPage.java
+++ b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/AbstractTemplatesPage.java
@@ -892,10 +892,10 @@ public void run() {
 				removeTemplates();
 			}
 		};
-		fRemoveAction.setImageDescriptor(TemplatesPageImages
-				.getDescriptor(TemplatesPageImages.IMG_DLCL_TEMPLATE_DELETE));
 		fRemoveAction.setImageDescriptor(TemplatesPageImages
 				.getDescriptor(TemplatesPageImages.IMG_ELCL_TEMPLATE_DELETE));
+		fRemoveAction.setDisabledImageDescriptor(TemplatesPageImages
+				.getDescriptor(TemplatesPageImages.IMG_DLCL_TEMPLATE_DELETE));
 		fRemoveAction.setToolTipText(TemplatesMessages.TemplatesPage_remove_tooltip);
 
 		fLinkWithEditorAction= new Action(TemplatesMessages.TemplatesPage_link_to_editor,
diff --git a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplatesPageImages.java b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplatesPageImages.java
index eed175df1c8e..9311d7acbe3b 100644
--- a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplatesPageImages.java
+++ b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplatesPageImages.java
@@ -17,6 +17,7 @@
 
 import org.osgi.framework.Bundle;
 
+import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
 
 import org.eclipse.core.runtime.FileLocator;
@@ -42,29 +43,29 @@ class TemplatesPageImages {
 
 	static final String PREFIX_OBJ= TextEditorPlugin.PLUGIN_ID + ".obj."; //$NON-NLS-1$
 
-	public static final String IMG_ELCL_TEMPLATE_NEW= PREFIX_ELCL + "new_template.png"; //$NON-NLS-1$
+	public static final String IMG_ELCL_TEMPLATE_NEW = PREFIX_ELCL + "new_template.svg"; //$NON-NLS-1$
 
-	public static final String IMG_ELCL_TEMPLATE_DELETE= PREFIX_ELCL + "delete_template.png"; //$NON-NLS-1$
+	public static final String IMG_ELCL_TEMPLATE_DELETE = PREFIX_ELCL + "delete_template.svg"; //$NON-NLS-1$
 
-	public static final String IMG_ELCL_TEMPLATE_EDIT= PREFIX_ELCL + "edit_template.png"; //$NON-NLS-1$
+	public static final String IMG_ELCL_TEMPLATE_EDIT = PREFIX_ELCL + "edit_template.svg"; //$NON-NLS-1$
 
-	public static final String IMG_ELCL_TEMPLATE_INSERT= PREFIX_ELCL + "insert_template.png"; //$NON-NLS-1$
+	public static final String IMG_ELCL_TEMPLATE_INSERT = PREFIX_ELCL + "insert_template.svg"; //$NON-NLS-1$
 
-	public static final String IMG_ELCL_TEMPLATE_LINK= PREFIX_ELCL + "link_to_editor.png"; //$NON-NLS-1$
+	public static final String IMG_ELCL_TEMPLATE_LINK = PREFIX_ELCL + "link_to_editor.svg"; //$NON-NLS-1$
 
-	public static final String IMG_ELCL_TEMPLATE_COLLAPSE_ALL= PREFIX_ELCL + "collapseall.png"; //$NON-NLS-1$
+	public static final String IMG_ELCL_TEMPLATE_COLLAPSE_ALL = PREFIX_ELCL + "collapseall.svg"; //$NON-NLS-1$
 
-	public static final String IMG_DLCL_TEMPLATE_DELETE= PREFIX_DLCL + "delete_template.png"; //$NON-NLS-1$
+	public static final String IMG_DLCL_TEMPLATE_DELETE = PREFIX_DLCL + "delete_template.svg"; //$NON-NLS-1$
 
-	public static final String IMG_DLCL_TEMPLATE_EDIT= PREFIX_DLCL + "edit_template.png"; //$NON-NLS-1$
+	public static final String IMG_DLCL_TEMPLATE_EDIT = PREFIX_DLCL + "edit_template.svg"; //$NON-NLS-1$
 
-	public static final String IMG_DLCL_TEMPLATE_INSERT= PREFIX_DLCL + "insert_template.png"; //$NON-NLS-1$
+	public static final String IMG_DLCL_TEMPLATE_INSERT = PREFIX_DLCL + "insert_template.svg"; //$NON-NLS-1$
 
-	public static final String IMG_OBJ_PREVIEW= PREFIX_OBJ + "preview.png"; //$NON-NLS-1$
+	public static final String IMG_OBJ_PREVIEW = PREFIX_OBJ + "preview.svg"; //$NON-NLS-1$
 
-	public static final String IMG_OBJ_CONTEXT= PREFIX_OBJ + "context.png"; //$NON-NLS-1$
+	public static final String IMG_OBJ_CONTEXT = PREFIX_OBJ + "context.svg"; //$NON-NLS-1$
 
-	public static final String IMG_OBJ_TEMPLATE= PREFIX_OBJ + "template_obj.png"; //$NON-NLS-1$
+	public static final String IMG_OBJ_TEMPLATE = PREFIX_OBJ + "template_obj.svg"; //$NON-NLS-1$
 
 	/**
 	 * The image registry containing {@link Image images}.
@@ -77,8 +78,6 @@ class TemplatesPageImages {
 	// slashes correct
 	private final static String ELCL= ICONS_PATH + "elcl16/"; //$NON-NLS-1$
 
-	private final static String DLCL= ICONS_PATH + "dlcl16/"; //$NON-NLS-1$
-
 	private final static String OBJ= ICONS_PATH + "obj16/"; //$NON-NLS-1$
 
 	/**
@@ -86,19 +85,16 @@ class TemplatesPageImages {
 	 */
 	private static void declareImages() {
 		// Ant Editor images
-		declareRegistryImage(IMG_ELCL_TEMPLATE_NEW, ELCL + "new_template.png"); //$NON-NLS-1$
-		declareRegistryImage(IMG_ELCL_TEMPLATE_INSERT, ELCL + "insert_template.png"); //$NON-NLS-1$
-		declareRegistryImage(IMG_DLCL_TEMPLATE_INSERT, DLCL + "insert_template.png"); //$NON-NLS-1$
-		declareRegistryImage(IMG_ELCL_TEMPLATE_DELETE, ELCL + "delete_template.png"); //$NON-NLS-1$
-		declareRegistryImage(IMG_DLCL_TEMPLATE_DELETE, DLCL + "delete_template.png"); //$NON-NLS-1$
-		declareRegistryImage(IMG_ELCL_TEMPLATE_EDIT, ELCL + "edit_template.png"); //$NON-NLS-1$
-		declareRegistryImage(IMG_DLCL_TEMPLATE_EDIT, DLCL + "edit_template.png"); //$NON-NLS-1$
-		declareRegistryImage(IMG_ELCL_TEMPLATE_LINK, ELCL + "link_to_editor.png"); //$NON-NLS-1$
-		declareRegistryImage(IMG_ELCL_TEMPLATE_COLLAPSE_ALL, ELCL + "collapseall.png"); //$NON-NLS-1$
-
-		declareRegistryImage(IMG_OBJ_PREVIEW, OBJ + "preview.png"); //$NON-NLS-1$
-		declareRegistryImage(IMG_OBJ_CONTEXT, OBJ + "context.png"); //$NON-NLS-1$
-		declareRegistryImage(IMG_OBJ_TEMPLATE, OBJ + "template_obj.png"); //$NON-NLS-1$
+		declareRegistryImage(IMG_ELCL_TEMPLATE_NEW, ELCL + "new_template.svg"); //$NON-NLS-1$
+		declareRegistryImage(IMG_ELCL_TEMPLATE_INSERT, IMG_DLCL_TEMPLATE_INSERT, ELCL + "insert_template.svg"); //$NON-NLS-1$
+		declareRegistryImage(IMG_ELCL_TEMPLATE_DELETE, IMG_DLCL_TEMPLATE_DELETE, ELCL + "delete_template.svg"); //$NON-NLS-1$
+		declareRegistryImage(IMG_ELCL_TEMPLATE_EDIT, IMG_DLCL_TEMPLATE_EDIT, ELCL + "edit_template.svg"); //$NON-NLS-1$
+		declareRegistryImage(IMG_ELCL_TEMPLATE_LINK, ELCL + "link_to_editor.svg"); //$NON-NLS-1$
+		declareRegistryImage(IMG_ELCL_TEMPLATE_COLLAPSE_ALL, ELCL + "collapseall.svg"); //$NON-NLS-1$
+
+		declareRegistryImage(IMG_OBJ_PREVIEW, OBJ + "preview.svg"); //$NON-NLS-1$
+		declareRegistryImage(IMG_OBJ_CONTEXT, OBJ + "context.svg"); //$NON-NLS-1$
+		declareRegistryImage(IMG_OBJ_TEMPLATE, OBJ + "template_obj.svg"); //$NON-NLS-1$
 	}
 
 	/**
@@ -109,6 +105,10 @@ private static void declareImages() {
 	 *            class is found (i.e. typically the packages directory)
 	 */
 	private final static void declareRegistryImage(String key, String path) {
+		declareRegistryImage(key, null, path);
+	}
+
+	private final static void declareRegistryImage(String key, String disabledKey, String path) {
 		ImageDescriptor desc= ImageDescriptor.getMissingImageDescriptor();
 		Bundle bundle= Platform.getBundle(TextEditorPlugin.PLUGIN_ID);
 		URL url= null;
@@ -117,6 +117,10 @@ private final static void declareRegistryImage(String key, String path) {
 			desc= ImageDescriptor.createFromURL(url);
 		}
 		fgImageRegistry.put(key, desc);
+		if (disabledKey != null) {
+			ImageDescriptor disabledDescriptor = ImageDescriptor.createWithFlags(desc, SWT.IMAGE_DISABLE);
+			fgImageRegistry.put(disabledKey, disabledDescriptor);
+		}
 	}
 
 	/**
@@ -141,7 +145,7 @@ public static ImageRegistry getImageRegistry() {
 	 * toolbar ELCL_ Local Disable toolbar DLCL_ Object large OBJL_ Object small OBJS_ View VIEW_
 	 * Product images PROD_ Misc images MISC_
 	 *
-	 * Where are the images? The images (typically pngs) are found in the same location as this
+	 * Where are the images? The images (typically SVGs) are found in the same location as this
 	 * plugin class. This may mean the same package directory as the package holding this class. The
 	 * images are declared using this.getClass() to ensure they are looked up via this plugin class.
 	 *
diff --git a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplatesView.java b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplatesView.java
index 691f537c4a16..203445e06bbd 100644
--- a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplatesView.java
+++ b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplatesView.java
@@ -68,7 +68,7 @@
  *       point="org.eclipse.ui.views"&gt;
  *    &lt;view
  *          name="%templatesViewName"
- *          icon="$nl$/icons/full/eview16/templates.png"
+ *          icon="$nl$/icons/full/eview16/templates.svg"
  *          category="org.eclipse.ui"
  *          class="org.eclipse.ui.texteditor.templates.TemplatesView"
  *          id="org.eclipse.ui.texteditor.TemplatesView"&gt;
@@ -76,7 +76,7 @@
  * &lt;/extension&gt;
  * </pre>
  *
- * The <code>templates.png</code> icon can be copied from this plug-in.
+ * The <code>templates.svg</code> icon can be copied from this plug-in.
  * <p>
  * If the editor supports a templates page, the editor instantiates and
  * configures the page, and returns it. This page is then added to this