diff --git a/elementary-xfce/apps/128/catfish.svg b/elementary-xfce/apps/128/catfish.svg
deleted file mode 100644
index 61e2a10f9..000000000
--- a/elementary-xfce/apps/128/catfish.svg
+++ /dev/null
@@ -1,453 +0,0 @@
-
-
diff --git a/elementary-xfce/apps/128/org.xfce.catfish.svg b/elementary-xfce/apps/128/org.xfce.catfish.svg
deleted file mode 120000
index 50cc9a5e5..000000000
--- a/elementary-xfce/apps/128/org.xfce.catfish.svg
+++ /dev/null
@@ -1 +0,0 @@
-catfish.svg
\ No newline at end of file
diff --git a/elementary-xfce/apps/128/org.xfce.catfish.svg b/elementary-xfce/apps/128/org.xfce.catfish.svg
new file mode 100644
index 000000000..2bf78d0df
--- /dev/null
+++ b/elementary-xfce/apps/128/org.xfce.catfish.svg
@@ -0,0 +1,295 @@
+
+
diff --git a/elementary-xfce/apps/128/spacefm-find.svg b/elementary-xfce/apps/128/spacefm-find.svg
index 50cc9a5e5..9830f494d 120000
--- a/elementary-xfce/apps/128/spacefm-find.svg
+++ b/elementary-xfce/apps/128/spacefm-find.svg
@@ -1 +1 @@
-catfish.svg
\ No newline at end of file
+org.xfce.catfish.svg
\ No newline at end of file
diff --git a/elementary-xfce/apps/16/catfish.svg b/elementary-xfce/apps/16/catfish.svg
deleted file mode 100644
index d1b71f96c..000000000
--- a/elementary-xfce/apps/16/catfish.svg
+++ /dev/null
@@ -1,196 +0,0 @@
-
-
diff --git a/elementary-xfce/apps/16/org.xfce.catfish.svg b/elementary-xfce/apps/16/org.xfce.catfish.svg
deleted file mode 120000
index 50cc9a5e5..000000000
--- a/elementary-xfce/apps/16/org.xfce.catfish.svg
+++ /dev/null
@@ -1 +0,0 @@
-catfish.svg
\ No newline at end of file
diff --git a/elementary-xfce/apps/16/org.xfce.catfish.svg b/elementary-xfce/apps/16/org.xfce.catfish.svg
new file mode 100644
index 000000000..040bdce99
--- /dev/null
+++ b/elementary-xfce/apps/16/org.xfce.catfish.svg
@@ -0,0 +1,155 @@
+
+
diff --git a/elementary-xfce/apps/16/spacefm-find.svg b/elementary-xfce/apps/16/spacefm-find.svg
index 50cc9a5e5..9830f494d 120000
--- a/elementary-xfce/apps/16/spacefm-find.svg
+++ b/elementary-xfce/apps/16/spacefm-find.svg
@@ -1 +1 @@
-catfish.svg
\ No newline at end of file
+org.xfce.catfish.svg
\ No newline at end of file
diff --git a/elementary-xfce/apps/22/org.xfce.catfish.svg b/elementary-xfce/apps/22/org.xfce.catfish.svg
index 0341b277a..dbc816421 100644
--- a/elementary-xfce/apps/22/org.xfce.catfish.svg
+++ b/elementary-xfce/apps/22/org.xfce.catfish.svg
@@ -1,9 +1,10 @@
+ style="stop-color:#ffffff;stop-opacity:0.39215687"
+ id="stop4104-6" />image/svg+xml
diff --git a/elementary-xfce/apps/24/catfish.svg b/elementary-xfce/apps/24/catfish.svg
deleted file mode 100644
index 276ba5e4f..000000000
--- a/elementary-xfce/apps/24/catfish.svg
+++ /dev/null
@@ -1,384 +0,0 @@
-
-
diff --git a/elementary-xfce/apps/24/org.xfce.catfish.svg b/elementary-xfce/apps/24/org.xfce.catfish.svg
deleted file mode 120000
index 50cc9a5e5..000000000
--- a/elementary-xfce/apps/24/org.xfce.catfish.svg
+++ /dev/null
@@ -1 +0,0 @@
-catfish.svg
\ No newline at end of file
diff --git a/elementary-xfce/apps/24/org.xfce.catfish.svg b/elementary-xfce/apps/24/org.xfce.catfish.svg
new file mode 100644
index 000000000..554f797d1
--- /dev/null
+++ b/elementary-xfce/apps/24/org.xfce.catfish.svg
@@ -0,0 +1,245 @@
+
+
diff --git a/elementary-xfce/apps/24/spacefm-find.svg b/elementary-xfce/apps/24/spacefm-find.svg
index 50cc9a5e5..9830f494d 120000
--- a/elementary-xfce/apps/24/spacefm-find.svg
+++ b/elementary-xfce/apps/24/spacefm-find.svg
@@ -1 +1 @@
-catfish.svg
\ No newline at end of file
+org.xfce.catfish.svg
\ No newline at end of file
diff --git a/elementary-xfce/apps/32/catfish.svg b/elementary-xfce/apps/32/catfish.svg
deleted file mode 100644
index 135a43f82..000000000
--- a/elementary-xfce/apps/32/catfish.svg
+++ /dev/null
@@ -1,392 +0,0 @@
-
-
diff --git a/elementary-xfce/apps/32/org.xfce.catfish.svg b/elementary-xfce/apps/32/org.xfce.catfish.svg
deleted file mode 120000
index 50cc9a5e5..000000000
--- a/elementary-xfce/apps/32/org.xfce.catfish.svg
+++ /dev/null
@@ -1 +0,0 @@
-catfish.svg
\ No newline at end of file
diff --git a/elementary-xfce/apps/32/org.xfce.catfish.svg b/elementary-xfce/apps/32/org.xfce.catfish.svg
new file mode 100644
index 000000000..66ce3fa0d
--- /dev/null
+++ b/elementary-xfce/apps/32/org.xfce.catfish.svg
@@ -0,0 +1,328 @@
+
+
diff --git a/elementary-xfce/apps/32/spacefm-find.svg b/elementary-xfce/apps/32/spacefm-find.svg
index 50cc9a5e5..9830f494d 120000
--- a/elementary-xfce/apps/32/spacefm-find.svg
+++ b/elementary-xfce/apps/32/spacefm-find.svg
@@ -1 +1 @@
-catfish.svg
\ No newline at end of file
+org.xfce.catfish.svg
\ No newline at end of file
diff --git a/elementary-xfce/apps/48/catfish.svg b/elementary-xfce/apps/48/catfish.svg
deleted file mode 100644
index dbc384ccd..000000000
--- a/elementary-xfce/apps/48/catfish.svg
+++ /dev/null
@@ -1,409 +0,0 @@
-
-
diff --git a/elementary-xfce/apps/48/org.xfce.catfish.svg b/elementary-xfce/apps/48/org.xfce.catfish.svg
deleted file mode 120000
index 50cc9a5e5..000000000
--- a/elementary-xfce/apps/48/org.xfce.catfish.svg
+++ /dev/null
@@ -1 +0,0 @@
-catfish.svg
\ No newline at end of file
diff --git a/elementary-xfce/apps/48/org.xfce.catfish.svg b/elementary-xfce/apps/48/org.xfce.catfish.svg
new file mode 100644
index 000000000..272f06371
--- /dev/null
+++ b/elementary-xfce/apps/48/org.xfce.catfish.svg
@@ -0,0 +1,327 @@
+
+
diff --git a/elementary-xfce/apps/48/spacefm-find.svg b/elementary-xfce/apps/48/spacefm-find.svg
index 50cc9a5e5..9830f494d 120000
--- a/elementary-xfce/apps/48/spacefm-find.svg
+++ b/elementary-xfce/apps/48/spacefm-find.svg
@@ -1 +1 @@
-catfish.svg
\ No newline at end of file
+org.xfce.catfish.svg
\ No newline at end of file
diff --git a/elementary-xfce/apps/64/catfish.svg b/elementary-xfce/apps/64/catfish.svg
deleted file mode 100644
index 10a11aac8..000000000
--- a/elementary-xfce/apps/64/catfish.svg
+++ /dev/null
@@ -1,411 +0,0 @@
-
-
diff --git a/elementary-xfce/apps/64/org.xfce.catfish.svg b/elementary-xfce/apps/64/org.xfce.catfish.svg
deleted file mode 120000
index 50cc9a5e5..000000000
--- a/elementary-xfce/apps/64/org.xfce.catfish.svg
+++ /dev/null
@@ -1 +0,0 @@
-catfish.svg
\ No newline at end of file
diff --git a/elementary-xfce/apps/64/org.xfce.catfish.svg b/elementary-xfce/apps/64/org.xfce.catfish.svg
new file mode 100644
index 000000000..19e9aa9d5
--- /dev/null
+++ b/elementary-xfce/apps/64/org.xfce.catfish.svg
@@ -0,0 +1,250 @@
+
+
diff --git a/elementary-xfce/apps/64/spacefm-find.svg b/elementary-xfce/apps/64/spacefm-find.svg
index 50cc9a5e5..9830f494d 120000
--- a/elementary-xfce/apps/64/spacefm-find.svg
+++ b/elementary-xfce/apps/64/spacefm-find.svg
@@ -1 +1 @@
-catfish.svg
\ No newline at end of file
+org.xfce.catfish.svg
\ No newline at end of file
diff --git a/elementary-xfce/apps/96/catfish.svg b/elementary-xfce/apps/96/catfish.svg
deleted file mode 100644
index 586f57bac..000000000
--- a/elementary-xfce/apps/96/catfish.svg
+++ /dev/null
@@ -1,453 +0,0 @@
-
-
diff --git a/elementary-xfce/apps/96/org.xfce.catfish.svg b/elementary-xfce/apps/96/org.xfce.catfish.svg
deleted file mode 120000
index 50cc9a5e5..000000000
--- a/elementary-xfce/apps/96/org.xfce.catfish.svg
+++ /dev/null
@@ -1 +0,0 @@
-catfish.svg
\ No newline at end of file
diff --git a/elementary-xfce/apps/96/org.xfce.catfish.svg b/elementary-xfce/apps/96/org.xfce.catfish.svg
new file mode 100644
index 000000000..e8ae380d4
--- /dev/null
+++ b/elementary-xfce/apps/96/org.xfce.catfish.svg
@@ -0,0 +1,359 @@
+
+
diff --git a/elementary-xfce/apps/96/spacefm-find.svg b/elementary-xfce/apps/96/spacefm-find.svg
index 50cc9a5e5..9830f494d 120000
--- a/elementary-xfce/apps/96/spacefm-find.svg
+++ b/elementary-xfce/apps/96/spacefm-find.svg
@@ -1 +1 @@
-catfish.svg
\ No newline at end of file
+org.xfce.catfish.svg
\ No newline at end of file