diff --git a/icons/128x128/geary.svg b/icons/128x128/geary.svg
deleted file mode 100644
index da64d1b7..00000000
--- a/icons/128x128/geary.svg
+++ /dev/null
@@ -1,608 +0,0 @@
-
-
-
-
diff --git a/icons/16x16/geary.png b/icons/16x16/geary.png
new file mode 100644
index 00000000..ef3b4da1
Binary files /dev/null and b/icons/16x16/geary.png differ
diff --git a/icons/16x16/geary.svg b/icons/16x16/geary.svg
deleted file mode 100644
index a0e86395..00000000
--- a/icons/16x16/geary.svg
+++ /dev/null
@@ -1,359 +0,0 @@
-
-
-
-
diff --git a/icons/24x24/geary.png b/icons/24x24/geary.png
new file mode 100644
index 00000000..e8b525f2
Binary files /dev/null and b/icons/24x24/geary.png differ
diff --git a/icons/256x256/geary.png b/icons/256x256/geary.png
new file mode 100644
index 00000000..2d2b7921
Binary files /dev/null and b/icons/256x256/geary.png differ
diff --git a/icons/32x32/geary.png b/icons/32x32/geary.png
new file mode 100644
index 00000000..961b9f03
Binary files /dev/null and b/icons/32x32/geary.png differ
diff --git a/icons/32x32/geary.svg b/icons/32x32/geary.svg
deleted file mode 100644
index b75e86fb..00000000
--- a/icons/32x32/geary.svg
+++ /dev/null
@@ -1,635 +0,0 @@
-
-
-
-
diff --git a/icons/48x48/geary.png b/icons/48x48/geary.png
new file mode 100644
index 00000000..89db36cc
Binary files /dev/null and b/icons/48x48/geary.png differ
diff --git a/icons/48x48/geary.svg b/icons/48x48/geary.svg
deleted file mode 100644
index 49ca8e91..00000000
--- a/icons/48x48/geary.svg
+++ /dev/null
@@ -1,588 +0,0 @@
-
-
-
-
diff --git a/icons/512x512/geary.png b/icons/512x512/geary.png
new file mode 100644
index 00000000..fd2442fd
Binary files /dev/null and b/icons/512x512/geary.png differ
diff --git a/icons/64x64/geary.svg b/icons/64x64/geary.svg
deleted file mode 100644
index cf69e54e..00000000
--- a/icons/64x64/geary.svg
+++ /dev/null
@@ -1,593 +0,0 @@
-
-
-
-
diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt
index 36650d41..ae25a143 100644
--- a/icons/CMakeLists.txt
+++ b/icons/CMakeLists.txt
@@ -30,11 +30,12 @@ set(ICON_FILES
install(FILES ${ICON_FILES} DESTINATION ${ICONS_DEST})
# Application icon goes in theme directory
-install(FILES "16x16/geary.svg" DESTINATION share/icons/hicolor/16x16/apps)
-install(FILES "32x32/geary.svg" DESTINATION share/icons/hicolor/32x32/apps)
-install(FILES "48x48/geary.svg" DESTINATION share/icons/hicolor/48x48/apps)
-install(FILES "64x64/geary.svg" DESTINATION share/icons/hicolor/64x64/apps)
-install(FILES "128x128/geary.svg" DESTINATION share/icons/hicolor/128x128/apps)
+install(FILES "16x16/geary.png" DESTINATION share/icons/hicolor/16x16/apps)
+install(FILES "24x24/geary.png" DESTINATION share/icons/hicolor/24x24/apps)
+install(FILES "32x32/geary.png" DESTINATION share/icons/hicolor/32x32/apps)
+install(FILES "48x48/geary.png" DESTINATION share/icons/hicolor/48x48/apps)
+install(FILES "256x256/geary.png" DESTINATION share/icons/hicolor/256x256/apps)
+install(FILES "512x512/geary.png" DESTINATION share/icons/hicolor/512x512/apps)
# Optional: update icon cache at install time.
if (ICON_UPDATE)
diff --git a/icons/geary.svg b/icons/geary.svg
new file mode 100644
index 00000000..50ae6fc5
--- /dev/null
+++ b/icons/geary.svg
@@ -0,0 +1,5816 @@
+
+
+
+