diff --git a/org.eclipse.images/eclipse-png/org.eclipse.ui.texteditor/full/elcl16/case_sensitive.png b/org.eclipse.images/eclipse-png/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/case_sensitive.png
similarity index 100%
rename from org.eclipse.images/eclipse-png/org.eclipse.ui.texteditor/full/elcl16/case_sensitive.png
rename to org.eclipse.images/eclipse-png/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/case_sensitive.png
diff --git a/org.eclipse.images/eclipse-png/org.eclipse.ui.texteditor/full/elcl16/case_sensitive@2x.png b/org.eclipse.images/eclipse-png/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/case_sensitive@2x.png
similarity index 100%
rename from org.eclipse.images/eclipse-png/org.eclipse.ui.texteditor/full/elcl16/case_sensitive@2x.png
rename to org.eclipse.images/eclipse-png/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/case_sensitive@2x.png
diff --git a/org.eclipse.images/eclipse-png/org.eclipse.ui.texteditor/full/elcl16/close_replace.png b/org.eclipse.images/eclipse-png/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/close_replace.png
similarity index 100%
rename from org.eclipse.images/eclipse-png/org.eclipse.ui.texteditor/full/elcl16/close_replace.png
rename to org.eclipse.images/eclipse-png/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/close_replace.png
diff --git a/org.eclipse.images/eclipse-png/org.eclipse.ui.texteditor/full/elcl16/close_replace@2x.png b/org.eclipse.images/eclipse-png/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/close_replace@2x.png
similarity index 100%
rename from org.eclipse.images/eclipse-png/org.eclipse.ui.texteditor/full/elcl16/close_replace@2x.png
rename to org.eclipse.images/eclipse-png/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/close_replace@2x.png
diff --git a/org.eclipse.images/eclipse-png/org.eclipse.ui.texteditor/full/elcl16/open_replace.png b/org.eclipse.images/eclipse-png/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/open_replace.png
similarity index 100%
rename from org.eclipse.images/eclipse-png/org.eclipse.ui.texteditor/full/elcl16/open_replace.png
rename to org.eclipse.images/eclipse-png/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/open_replace.png
diff --git a/org.eclipse.images/eclipse-png/org.eclipse.ui.texteditor/full/elcl16/open_replace@2x.png b/org.eclipse.images/eclipse-png/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/open_replace@2x.png
similarity index 100%
rename from org.eclipse.images/eclipse-png/org.eclipse.ui.texteditor/full/elcl16/open_replace@2x.png
rename to org.eclipse.images/eclipse-png/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/open_replace@2x.png
diff --git a/org.eclipse.images/eclipse-png/org.eclipse.ui.texteditor/full/elcl16/regex.png b/org.eclipse.images/eclipse-png/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/regex.png
similarity index 100%
rename from org.eclipse.images/eclipse-png/org.eclipse.ui.texteditor/full/elcl16/regex.png
rename to org.eclipse.images/eclipse-png/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/regex.png
diff --git a/org.eclipse.images/eclipse-png/org.eclipse.ui.texteditor/full/elcl16/regex@2x.png b/org.eclipse.images/eclipse-png/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/regex@2x.png
similarity index 100%
rename from org.eclipse.images/eclipse-png/org.eclipse.ui.texteditor/full/elcl16/regex@2x.png
rename to org.eclipse.images/eclipse-png/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/regex@2x.png
diff --git a/org.eclipse.images/eclipse-png/org.eclipse.ui.texteditor/full/elcl16/replace.png b/org.eclipse.images/eclipse-png/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/replace.png
similarity index 100%
rename from org.eclipse.images/eclipse-png/org.eclipse.ui.texteditor/full/elcl16/replace.png
rename to org.eclipse.images/eclipse-png/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/replace.png
diff --git a/org.eclipse.images/eclipse-png/org.eclipse.ui.texteditor/full/elcl16/replace@2x.png b/org.eclipse.images/eclipse-png/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/replace@2x.png
similarity index 100%
rename from org.eclipse.images/eclipse-png/org.eclipse.ui.texteditor/full/elcl16/replace@2x.png
rename to org.eclipse.images/eclipse-png/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/replace@2x.png
diff --git a/org.eclipse.images/eclipse-png/org.eclipse.ui.texteditor/full/elcl16/replace_all.png b/org.eclipse.images/eclipse-png/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/replace_all.png
similarity index 100%
rename from org.eclipse.images/eclipse-png/org.eclipse.ui.texteditor/full/elcl16/replace_all.png
rename to org.eclipse.images/eclipse-png/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/replace_all.png
diff --git a/org.eclipse.images/eclipse-png/org.eclipse.ui.texteditor/full/elcl16/replace_all@2x.png b/org.eclipse.images/eclipse-png/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/replace_all@2x.png
similarity index 100%
rename from org.eclipse.images/eclipse-png/org.eclipse.ui.texteditor/full/elcl16/replace_all@2x.png
rename to org.eclipse.images/eclipse-png/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/replace_all@2x.png
diff --git a/org.eclipse.images/eclipse-png/org.eclipse.ui.texteditor/full/elcl16/search_all.png b/org.eclipse.images/eclipse-png/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/search_all.png
similarity index 100%
rename from org.eclipse.images/eclipse-png/org.eclipse.ui.texteditor/full/elcl16/search_all.png
rename to org.eclipse.images/eclipse-png/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/search_all.png
diff --git a/org.eclipse.images/eclipse-png/org.eclipse.ui.texteditor/full/elcl16/search_all@2x.png b/org.eclipse.images/eclipse-png/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/search_all@2x.png
similarity index 100%
rename from org.eclipse.images/eclipse-png/org.eclipse.ui.texteditor/full/elcl16/search_all@2x.png
rename to org.eclipse.images/eclipse-png/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/search_all@2x.png
diff --git a/org.eclipse.images/eclipse-png/org.eclipse.ui.texteditor/full/elcl16/search_in_area.png b/org.eclipse.images/eclipse-png/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/search_in_area.png
similarity index 100%
rename from org.eclipse.images/eclipse-png/org.eclipse.ui.texteditor/full/elcl16/search_in_area.png
rename to org.eclipse.images/eclipse-png/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/search_in_area.png
diff --git a/org.eclipse.images/eclipse-png/org.eclipse.ui.texteditor/full/elcl16/search_in_area@2x.png b/org.eclipse.images/eclipse-png/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/search_in_area@2x.png
similarity index 100%
rename from org.eclipse.images/eclipse-png/org.eclipse.ui.texteditor/full/elcl16/search_in_area@2x.png
rename to org.eclipse.images/eclipse-png/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/search_in_area@2x.png
diff --git a/org.eclipse.images/eclipse-png/org.eclipse.ui.texteditor/full/elcl16/select_next.png b/org.eclipse.images/eclipse-png/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/select_next.png
similarity index 100%
rename from org.eclipse.images/eclipse-png/org.eclipse.ui.texteditor/full/elcl16/select_next.png
rename to org.eclipse.images/eclipse-png/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/select_next.png
diff --git a/org.eclipse.images/eclipse-png/org.eclipse.ui.texteditor/full/elcl16/select_next@2x.png b/org.eclipse.images/eclipse-png/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/select_next@2x.png
similarity index 100%
rename from org.eclipse.images/eclipse-png/org.eclipse.ui.texteditor/full/elcl16/select_next@2x.png
rename to org.eclipse.images/eclipse-png/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/select_next@2x.png
diff --git a/org.eclipse.images/eclipse-png/org.eclipse.ui.texteditor/full/elcl16/select_prev.png b/org.eclipse.images/eclipse-png/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/select_prev.png
similarity index 100%
rename from org.eclipse.images/eclipse-png/org.eclipse.ui.texteditor/full/elcl16/select_prev.png
rename to org.eclipse.images/eclipse-png/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/select_prev.png
diff --git a/org.eclipse.images/eclipse-png/org.eclipse.ui.texteditor/full/elcl16/select_prev@2x.png b/org.eclipse.images/eclipse-png/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/select_prev@2x.png
similarity index 100%
rename from org.eclipse.images/eclipse-png/org.eclipse.ui.texteditor/full/elcl16/select_prev@2x.png
rename to org.eclipse.images/eclipse-png/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/select_prev@2x.png
diff --git a/org.eclipse.images/eclipse-png/org.eclipse.ui.texteditor/full/elcl16/whole_word.png b/org.eclipse.images/eclipse-png/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/whole_word.png
similarity index 100%
rename from org.eclipse.images/eclipse-png/org.eclipse.ui.texteditor/full/elcl16/whole_word.png
rename to org.eclipse.images/eclipse-png/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/whole_word.png
diff --git a/org.eclipse.images/eclipse-png/org.eclipse.ui.texteditor/full/elcl16/whole_word@2x.png b/org.eclipse.images/eclipse-png/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/whole_word@2x.png
similarity index 100%
rename from org.eclipse.images/eclipse-png/org.eclipse.ui.texteditor/full/elcl16/whole_word@2x.png
rename to org.eclipse.images/eclipse-png/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/whole_word@2x.png
diff --git a/org.eclipse.images/eclipse-svg/org.eclipse.ui.texteditor/full/elcl16/case_sensitive.svg b/org.eclipse.images/eclipse-svg/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/case_sensitive.svg
similarity index 100%
rename from org.eclipse.images/eclipse-svg/org.eclipse.ui.texteditor/full/elcl16/case_sensitive.svg
rename to org.eclipse.images/eclipse-svg/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/case_sensitive.svg
diff --git a/org.eclipse.images/eclipse-svg/org.eclipse.ui.texteditor/full/elcl16/close_replace.svg b/org.eclipse.images/eclipse-svg/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/close_replace.svg
similarity index 100%
rename from org.eclipse.images/eclipse-svg/org.eclipse.ui.texteditor/full/elcl16/close_replace.svg
rename to org.eclipse.images/eclipse-svg/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/close_replace.svg
diff --git a/org.eclipse.images/eclipse-svg/org.eclipse.ui.texteditor/full/elcl16/open_replace.svg b/org.eclipse.images/eclipse-svg/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/open_replace.svg
similarity index 100%
rename from org.eclipse.images/eclipse-svg/org.eclipse.ui.texteditor/full/elcl16/open_replace.svg
rename to org.eclipse.images/eclipse-svg/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/open_replace.svg
diff --git a/org.eclipse.images/eclipse-svg/org.eclipse.ui.texteditor/full/elcl16/regex.svg b/org.eclipse.images/eclipse-svg/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/regex.svg
similarity index 100%
rename from org.eclipse.images/eclipse-svg/org.eclipse.ui.texteditor/full/elcl16/regex.svg
rename to org.eclipse.images/eclipse-svg/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/regex.svg
diff --git a/org.eclipse.images/eclipse-svg/org.eclipse.ui.texteditor/full/elcl16/replace.svg b/org.eclipse.images/eclipse-svg/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/replace.svg
similarity index 100%
rename from org.eclipse.images/eclipse-svg/org.eclipse.ui.texteditor/full/elcl16/replace.svg
rename to org.eclipse.images/eclipse-svg/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/replace.svg
diff --git a/org.eclipse.images/eclipse-svg/org.eclipse.ui.texteditor/full/elcl16/replace-all.svg b/org.eclipse.images/eclipse-svg/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/replace_all.svg
similarity index 100%
rename from org.eclipse.images/eclipse-svg/org.eclipse.ui.texteditor/full/elcl16/replace-all.svg
rename to org.eclipse.images/eclipse-svg/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/replace_all.svg
diff --git a/org.eclipse.images/eclipse-svg/org.eclipse.ui.texteditor/full/elcl16/search_all.svg b/org.eclipse.images/eclipse-svg/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/search_all.svg
similarity index 100%
rename from org.eclipse.images/eclipse-svg/org.eclipse.ui.texteditor/full/elcl16/search_all.svg
rename to org.eclipse.images/eclipse-svg/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/search_all.svg
diff --git a/org.eclipse.images/eclipse-svg/org.eclipse.ui.texteditor/full/elcl16/search_in_area.svg b/org.eclipse.images/eclipse-svg/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/search_in_area.svg
similarity index 100%
rename from org.eclipse.images/eclipse-svg/org.eclipse.ui.texteditor/full/elcl16/search_in_area.svg
rename to org.eclipse.images/eclipse-svg/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/search_in_area.svg
diff --git a/org.eclipse.images/eclipse-svg/org.eclipse.ui.texteditor/full/elcl16/search_next.svg b/org.eclipse.images/eclipse-svg/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/search_next.svg
similarity index 100%
rename from org.eclipse.images/eclipse-svg/org.eclipse.ui.texteditor/full/elcl16/search_next.svg
rename to org.eclipse.images/eclipse-svg/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/search_next.svg
diff --git a/org.eclipse.images/eclipse-svg/org.eclipse.ui.texteditor/full/elcl16/search_prev.svg b/org.eclipse.images/eclipse-svg/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/search_prev.svg
similarity index 100%
rename from org.eclipse.images/eclipse-svg/org.eclipse.ui.texteditor/full/elcl16/search_prev.svg
rename to org.eclipse.images/eclipse-svg/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/search_prev.svg
diff --git a/org.eclipse.images/eclipse-svg/org.eclipse.ui.texteditor/full/elcl16/whole_word.svg b/org.eclipse.images/eclipse-svg/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/whole_word.svg
similarity index 100%
rename from org.eclipse.images/eclipse-svg/org.eclipse.ui.texteditor/full/elcl16/whole_word.svg
rename to org.eclipse.images/eclipse-svg/org.eclipse.ui.workbench.texteditor/icons/full/elcl16/whole_word.svg