diff --git a/bundles/org.eclipse.search/META-INF/MANIFEST.MF b/bundles/org.eclipse.search/META-INF/MANIFEST.MF
index 73ffbc268a5..fcfd9d845d8 100644
--- a/bundles/org.eclipse.search/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.search/META-INF/MANIFEST.MF
@@ -33,3 +33,4 @@ Require-Bundle:
Bundle-RequiredExecutionEnvironment: JavaSE-17
Automatic-Module-Name: org.eclipse.search
Service-Component: OSGI-INF/org.eclipse.search.internal.ui.text.DirtyFileSearchParticipant.xml
+Require-Capability: eclipse.swt;filter:="(image.format=svg)"
diff --git a/bundles/org.eclipse.search/icons/full/elcl16/automaticOrientation.svg b/bundles/org.eclipse.search/icons/full/elcl16/automaticOrientation.svg
new file mode 100644
index 00000000000..880d3a36f0e
--- /dev/null
+++ b/bundles/org.eclipse.search/icons/full/elcl16/automaticOrientation.svg
@@ -0,0 +1,442 @@
+
+
+
+
diff --git a/bundles/org.eclipse.search/icons/full/elcl16/collapseall.svg b/bundles/org.eclipse.search/icons/full/elcl16/collapseall.svg
new file mode 100644
index 00000000000..ce1e540b8aa
--- /dev/null
+++ b/bundles/org.eclipse.search/icons/full/elcl16/collapseall.svg
@@ -0,0 +1,289 @@
+
+
+
+
diff --git a/bundles/org.eclipse.search/icons/full/elcl16/expandall.svg b/bundles/org.eclipse.search/icons/full/elcl16/expandall.svg
new file mode 100644
index 00000000000..0ea4a112e24
--- /dev/null
+++ b/bundles/org.eclipse.search/icons/full/elcl16/expandall.svg
@@ -0,0 +1,334 @@
+
+
+
+
diff --git a/bundles/org.eclipse.search/icons/full/elcl16/filter_ps.svg b/bundles/org.eclipse.search/icons/full/elcl16/filter_ps.svg
new file mode 100644
index 00000000000..67c16bb3096
--- /dev/null
+++ b/bundles/org.eclipse.search/icons/full/elcl16/filter_ps.svg
@@ -0,0 +1,137 @@
+
+
+
+
diff --git a/bundles/org.eclipse.search/icons/full/elcl16/flatLayout.svg b/bundles/org.eclipse.search/icons/full/elcl16/flatLayout.svg
new file mode 100644
index 00000000000..627fbc2bfaf
--- /dev/null
+++ b/bundles/org.eclipse.search/icons/full/elcl16/flatLayout.svg
@@ -0,0 +1,343 @@
+
+
+
+
diff --git a/bundles/org.eclipse.search/icons/full/elcl16/hierarchicalLayout.svg b/bundles/org.eclipse.search/icons/full/elcl16/hierarchicalLayout.svg
new file mode 100644
index 00000000000..db78ca21dc4
--- /dev/null
+++ b/bundles/org.eclipse.search/icons/full/elcl16/hierarchicalLayout.svg
@@ -0,0 +1,356 @@
+
+
+
+
diff --git a/bundles/org.eclipse.search/icons/full/elcl16/horizontalOrientation.svg b/bundles/org.eclipse.search/icons/full/elcl16/horizontalOrientation.svg
new file mode 100644
index 00000000000..e3ef05116fa
--- /dev/null
+++ b/bundles/org.eclipse.search/icons/full/elcl16/horizontalOrientation.svg
@@ -0,0 +1,757 @@
+
+
+
+
diff --git a/bundles/org.eclipse.search/icons/full/elcl16/pin_view.svg b/bundles/org.eclipse.search/icons/full/elcl16/pin_view.svg
new file mode 100644
index 00000000000..0139e3fa2cc
--- /dev/null
+++ b/bundles/org.eclipse.search/icons/full/elcl16/pin_view.svg
@@ -0,0 +1,261 @@
+
+
+
+
diff --git a/bundles/org.eclipse.search/icons/full/elcl16/refresh.svg b/bundles/org.eclipse.search/icons/full/elcl16/refresh.svg
new file mode 100644
index 00000000000..83c45c42b28
--- /dev/null
+++ b/bundles/org.eclipse.search/icons/full/elcl16/refresh.svg
@@ -0,0 +1,189 @@
+
+
+
+
diff --git a/bundles/org.eclipse.search/icons/full/elcl16/search_again.svg b/bundles/org.eclipse.search/icons/full/elcl16/search_again.svg
new file mode 100644
index 00000000000..1b0b944f3a2
--- /dev/null
+++ b/bundles/org.eclipse.search/icons/full/elcl16/search_again.svg
@@ -0,0 +1,497 @@
+
+
+
+
diff --git a/bundles/org.eclipse.search/icons/full/elcl16/search_goto.svg b/bundles/org.eclipse.search/icons/full/elcl16/search_goto.svg
new file mode 100644
index 00000000000..e61bd2c2c55
--- /dev/null
+++ b/bundles/org.eclipse.search/icons/full/elcl16/search_goto.svg
@@ -0,0 +1,258 @@
+
+
+
+
diff --git a/bundles/org.eclipse.search/icons/full/elcl16/search_history.svg b/bundles/org.eclipse.search/icons/full/elcl16/search_history.svg
new file mode 100644
index 00000000000..0e66bf82647
--- /dev/null
+++ b/bundles/org.eclipse.search/icons/full/elcl16/search_history.svg
@@ -0,0 +1,504 @@
+
+
+
+
diff --git a/bundles/org.eclipse.search/icons/full/elcl16/search_next.svg b/bundles/org.eclipse.search/icons/full/elcl16/search_next.svg
new file mode 100644
index 00000000000..973c4eda7b6
--- /dev/null
+++ b/bundles/org.eclipse.search/icons/full/elcl16/search_next.svg
@@ -0,0 +1,113 @@
+
+
+
+
diff --git a/bundles/org.eclipse.search/icons/full/elcl16/search_prev.svg b/bundles/org.eclipse.search/icons/full/elcl16/search_prev.svg
new file mode 100644
index 00000000000..1faf803af31
--- /dev/null
+++ b/bundles/org.eclipse.search/icons/full/elcl16/search_prev.svg
@@ -0,0 +1,113 @@
+
+
+
+
diff --git a/bundles/org.eclipse.search/icons/full/elcl16/search_rem.svg b/bundles/org.eclipse.search/icons/full/elcl16/search_rem.svg
new file mode 100644
index 00000000000..1095894a150
--- /dev/null
+++ b/bundles/org.eclipse.search/icons/full/elcl16/search_rem.svg
@@ -0,0 +1,116 @@
+
+
+
+
diff --git a/bundles/org.eclipse.search/icons/full/elcl16/search_remall.svg b/bundles/org.eclipse.search/icons/full/elcl16/search_remall.svg
new file mode 100644
index 00000000000..d3414206f16
--- /dev/null
+++ b/bundles/org.eclipse.search/icons/full/elcl16/search_remall.svg
@@ -0,0 +1,164 @@
+
+
+
+
diff --git a/bundles/org.eclipse.search/icons/full/elcl16/search_sortmatch.svg b/bundles/org.eclipse.search/icons/full/elcl16/search_sortmatch.svg
new file mode 100644
index 00000000000..15f77060d99
--- /dev/null
+++ b/bundles/org.eclipse.search/icons/full/elcl16/search_sortmatch.svg
@@ -0,0 +1,175 @@
+
+
+
+
diff --git a/bundles/org.eclipse.search/icons/full/elcl16/singleOrientation.svg b/bundles/org.eclipse.search/icons/full/elcl16/singleOrientation.svg
new file mode 100644
index 00000000000..18b8cd31d4c
--- /dev/null
+++ b/bundles/org.eclipse.search/icons/full/elcl16/singleOrientation.svg
@@ -0,0 +1,329 @@
+
+
+
+
diff --git a/bundles/org.eclipse.search/icons/full/elcl16/stop.svg b/bundles/org.eclipse.search/icons/full/elcl16/stop.svg
new file mode 100644
index 00000000000..4bd3f207b1b
--- /dev/null
+++ b/bundles/org.eclipse.search/icons/full/elcl16/stop.svg
@@ -0,0 +1,4572 @@
+
+
+
+
diff --git a/bundles/org.eclipse.search/icons/full/elcl16/tsearch_obj.svg b/bundles/org.eclipse.search/icons/full/elcl16/tsearch_obj.svg
new file mode 100644
index 00000000000..7a2883e2af7
--- /dev/null
+++ b/bundles/org.eclipse.search/icons/full/elcl16/tsearch_obj.svg
@@ -0,0 +1,525 @@
+
+
+
+
diff --git a/bundles/org.eclipse.search/icons/full/elcl16/verticalOrientation.svg b/bundles/org.eclipse.search/icons/full/elcl16/verticalOrientation.svg
new file mode 100644
index 00000000000..8bae8e88223
--- /dev/null
+++ b/bundles/org.eclipse.search/icons/full/elcl16/verticalOrientation.svg
@@ -0,0 +1,331 @@
+
+
+
+
diff --git a/bundles/org.eclipse.search/icons/full/etool16/group_by_file.svg b/bundles/org.eclipse.search/icons/full/etool16/group_by_file.svg
new file mode 100644
index 00000000000..f67ef55e8ae
--- /dev/null
+++ b/bundles/org.eclipse.search/icons/full/etool16/group_by_file.svg
@@ -0,0 +1,357 @@
+
+
+
+
diff --git a/bundles/org.eclipse.search/icons/full/etool16/group_by_folder.svg b/bundles/org.eclipse.search/icons/full/etool16/group_by_folder.svg
new file mode 100644
index 00000000000..5abb5211989
--- /dev/null
+++ b/bundles/org.eclipse.search/icons/full/etool16/group_by_folder.svg
@@ -0,0 +1,325 @@
+
+
+
+
diff --git a/bundles/org.eclipse.search/icons/full/etool16/group_by_project.svg b/bundles/org.eclipse.search/icons/full/etool16/group_by_project.svg
new file mode 100644
index 00000000000..8f40f5aa327
--- /dev/null
+++ b/bundles/org.eclipse.search/icons/full/etool16/group_by_project.svg
@@ -0,0 +1,376 @@
+
+
+
+
diff --git a/bundles/org.eclipse.search/icons/full/etool16/search.svg b/bundles/org.eclipse.search/icons/full/etool16/search.svg
new file mode 100644
index 00000000000..624246dba47
--- /dev/null
+++ b/bundles/org.eclipse.search/icons/full/etool16/search.svg
@@ -0,0 +1,313 @@
+
+
+
+
diff --git a/bundles/org.eclipse.search/icons/full/eview16/searchres.svg b/bundles/org.eclipse.search/icons/full/eview16/searchres.svg
new file mode 100644
index 00000000000..624246dba47
--- /dev/null
+++ b/bundles/org.eclipse.search/icons/full/eview16/searchres.svg
@@ -0,0 +1,313 @@
+
+
+
+
diff --git a/bundles/org.eclipse.search/icons/full/obj16/line_match.svg b/bundles/org.eclipse.search/icons/full/obj16/line_match.svg
new file mode 100644
index 00000000000..1b7922ff16e
--- /dev/null
+++ b/bundles/org.eclipse.search/icons/full/obj16/line_match.svg
@@ -0,0 +1,116 @@
+
+
+
+
diff --git a/bundles/org.eclipse.search/icons/full/obj16/searchm_obj.svg b/bundles/org.eclipse.search/icons/full/obj16/searchm_obj.svg
new file mode 100644
index 00000000000..4a87977acfa
--- /dev/null
+++ b/bundles/org.eclipse.search/icons/full/obj16/searchm_obj.svg
@@ -0,0 +1,164 @@
+
+
+
+
diff --git a/bundles/org.eclipse.search/icons/full/obj16/tsearch_dpdn_obj.svg b/bundles/org.eclipse.search/icons/full/obj16/tsearch_dpdn_obj.svg
new file mode 100644
index 00000000000..00f5427c0f7
--- /dev/null
+++ b/bundles/org.eclipse.search/icons/full/obj16/tsearch_dpdn_obj.svg
@@ -0,0 +1,285 @@
+
+
+
+
diff --git a/bundles/org.eclipse.search/plugin.xml b/bundles/org.eclipse.search/plugin.xml
index 3f8dda7b1c9..7a7739a4da1 100644
--- a/bundles/org.eclipse.search/plugin.xml
+++ b/bundles/org.eclipse.search/plugin.xml
@@ -34,7 +34,7 @@
+ icon="$nl$/icons/full/obj16/searchm_obj.svg">
@@ -56,7 +56,7 @@
+ icon="$nl$/icons/full/obj16/searchm_obj.svg">
@@ -193,14 +193,14 @@
definitionId="org.eclipse.search.ui.openFileSearchPage"
menubarPath="org.eclipse.search.menu/internalDialogGroup"
label="%openFileSearchPageAction.label"
- icon="$nl$/icons/full/elcl16/tsearch_obj.png"
+ icon="$nl$/icons/full/elcl16/tsearch_obj.svg"
helpContextId="file_search_action_context"
class="org.eclipse.search.internal.ui.OpenFileSearchPageAction"/>
@@ -263,7 +263,7 @@