diff --git a/media/beardroid.png b/media/beardroid.png
deleted file mode 100644
index f95ee1867..000000000
Binary files a/media/beardroid.png and /dev/null differ
diff --git a/media/fdroid-logo-2010/beardroid.png b/media/fdroid-logo-2010/beardroid.png
new file mode 100644
index 000000000..2715c2607
Binary files /dev/null and b/media/fdroid-logo-2010/beardroid.png differ
diff --git a/media/beardroid.svg b/media/fdroid-logo-2010/beardroid.svg
similarity index 100%
rename from media/beardroid.svg
rename to media/fdroid-logo-2010/beardroid.svg
diff --git a/media/fdroid-logo/fdroid-135.png b/media/fdroid-logo-2012/fdroid-135.png
similarity index 97%
rename from media/fdroid-logo/fdroid-135.png
rename to media/fdroid-logo-2012/fdroid-135.png
index 92995a5a7..ba612553e 100644
Binary files a/media/fdroid-logo/fdroid-135.png and b/media/fdroid-logo-2012/fdroid-135.png differ
diff --git a/media/fdroid-logo/fdroid-logo-blue-48pxb.svg b/media/fdroid-logo-2012/fdroid-logo-blue-48pxb.svg
similarity index 100%
rename from media/fdroid-logo/fdroid-logo-blue-48pxb.svg
rename to media/fdroid-logo-2012/fdroid-logo-blue-48pxb.svg
diff --git a/media/fdroid-logo/fdroid-logo-green48pxg.svg b/media/fdroid-logo-2012/fdroid-logo-green48pxg.svg
similarity index 100%
rename from media/fdroid-logo/fdroid-logo-green48pxg.svg
rename to media/fdroid-logo-2012/fdroid-logo-green48pxg.svg
diff --git a/media/fdroid-logo/fdroid-logo.svg b/media/fdroid-logo-2012/fdroid-logo.svg
similarity index 100%
rename from media/fdroid-logo/fdroid-logo.svg
rename to media/fdroid-logo-2012/fdroid-logo.svg
diff --git a/media/fdroid-logo-2012/fdroidheader-thumb.png b/media/fdroid-logo-2012/fdroidheader-thumb.png
new file mode 100644
index 000000000..1d40917db
Binary files /dev/null and b/media/fdroid-logo-2012/fdroidheader-thumb.png differ
diff --git a/media/fdroid-logo-2012/fdroidheader.png b/media/fdroid-logo-2012/fdroidheader.png
new file mode 100644
index 000000000..6f25a311d
Binary files /dev/null and b/media/fdroid-logo-2012/fdroidheader.png differ
diff --git a/media/fdroidheader.xcf b/media/fdroid-logo-2012/fdroidheader.xcf
similarity index 100%
rename from media/fdroidheader.xcf
rename to media/fdroid-logo-2012/fdroidheader.xcf
diff --git a/media/fdroid-logo-2012/icon.png b/media/fdroid-logo-2012/icon.png
new file mode 100644
index 000000000..f7fe0fcb0
Binary files /dev/null and b/media/fdroid-logo-2012/icon.png differ
diff --git a/media/fdroid-logo/license.txt b/media/fdroid-logo-2012/license.txt
similarity index 100%
rename from media/fdroid-logo/license.txt
rename to media/fdroid-logo-2012/license.txt
diff --git a/media/fdroid-logo-2013/available-on-fdroid.svg b/media/fdroid-logo-2013/available-on-fdroid.svg
new file mode 100644
index 000000000..08fbb3a3e
--- /dev/null
+++ b/media/fdroid-logo-2013/available-on-fdroid.svg
@@ -0,0 +1,5415 @@
+
+
+
+
diff --git a/media/fdroid-logo-2013/fdroid-logo.svg b/media/fdroid-logo-2013/fdroid-logo.svg
new file mode 100644
index 000000000..20c930d3f
--- /dev/null
+++ b/media/fdroid-logo-2013/fdroid-logo.svg
@@ -0,0 +1,4083 @@
+
+
+
+
diff --git a/media/fdroid-logo-2013/header.svg b/media/fdroid-logo-2013/header.svg
new file mode 100644
index 000000000..fbcdc326e
--- /dev/null
+++ b/media/fdroid-logo-2013/header.svg
@@ -0,0 +1,5674 @@
+
+
+
+
diff --git a/media/fdroid-logo-2013/install-client-button.svg b/media/fdroid-logo-2013/install-client-button.svg
new file mode 100644
index 000000000..a6b524796
--- /dev/null
+++ b/media/fdroid-logo-2013/install-client-button.svg
@@ -0,0 +1,225 @@
+
+
+
+
diff --git a/media/fdroid-logo-2013/license.txt b/media/fdroid-logo-2013/license.txt
new file mode 100644
index 000000000..59a9be001
--- /dev/null
+++ b/media/fdroid-logo-2013/license.txt
@@ -0,0 +1,7 @@
+The F-Droid logo
+Copyright 2012 William Theaker
+Copyright 2013 Robert Martinez
+Dual-licensed (pick either) under CC-BY-SA 3.0 Unported and GPLv3 or later versions of that license
+
+About:
+This is a soft spin-off of the artwork initially designed by William.
diff --git a/media/updates_notification.svg b/media/fdroid-logo-2013/updates_notification.svg
similarity index 100%
rename from media/updates_notification.svg
rename to media/fdroid-logo-2013/updates_notification.svg
diff --git a/media/fdroidheader-thumb.png b/media/fdroidheader-thumb.png
deleted file mode 100644
index 35a18881b..000000000
Binary files a/media/fdroidheader-thumb.png and /dev/null differ
diff --git a/media/fdroidheader.png b/media/fdroidheader.png
deleted file mode 100644
index 319a4e763..000000000
Binary files a/media/fdroidheader.png and /dev/null differ
diff --git a/media/icon.png b/media/icon.png
deleted file mode 100644
index 8b76c9ab1..000000000
Binary files a/media/icon.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_launcher.png b/res/drawable-hdpi/ic_launcher.png
index 10159b215..08d5d89b5 100644
Binary files a/res/drawable-hdpi/ic_launcher.png and b/res/drawable-hdpi/ic_launcher.png differ
diff --git a/res/drawable-ldpi/ic_launcher.png b/res/drawable-ldpi/ic_launcher.png
index 2427c5674..2b5489661 100644
Binary files a/res/drawable-ldpi/ic_launcher.png and b/res/drawable-ldpi/ic_launcher.png differ
diff --git a/res/drawable-mdpi/ic_launcher.png b/res/drawable-mdpi/ic_launcher.png
index 0644d6b0d..0c0d41738 100644
Binary files a/res/drawable-mdpi/ic_launcher.png and b/res/drawable-mdpi/ic_launcher.png differ
diff --git a/res/drawable-xhdpi/ic_launcher.png b/res/drawable-xhdpi/ic_launcher.png
index 1db87eff1..cd508306b 100644
Binary files a/res/drawable-xhdpi/ic_launcher.png and b/res/drawable-xhdpi/ic_launcher.png differ
diff --git a/res/drawable-xxhdpi/ic_launcher.png b/res/drawable-xxhdpi/ic_launcher.png
index 872b18ef7..a5fe271ac 100644
Binary files a/res/drawable-xxhdpi/ic_launcher.png and b/res/drawable-xxhdpi/ic_launcher.png differ
diff --git a/res/drawable-xxhdpi/ic_stat_notify_updates.png b/res/drawable-xxhdpi/ic_stat_notify_updates.png
index 737c615a1..08efc3d68 100644
Binary files a/res/drawable-xxhdpi/ic_stat_notify_updates.png and b/res/drawable-xxhdpi/ic_stat_notify_updates.png differ