diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4ebf92c95..7d5da8920 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -6,7 +6,7 @@
+ android:icon="@drawable/ic_launcher">
diff --git a/build.properties b/build.properties
deleted file mode 100644
index d3ee3c67d..000000000
--- a/build.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file is used to override default values used by the Ant build system.
-#
-# This file must be checked in Version Control Systems, as it is
-# integral to the build system of your project.
-
-# This file is only used by the Ant script.
-
-# You can use this to override default values such as
-# 'source.dir' for the location of your java source folder and
-# 'out.dir' for the location of your output folder.
-
-# You can also use it define how the release builds are signed by declaring
-# the following properties:
-# 'key.store' for the location of your keystore and
-# 'key.alias' for the name of the key to use.
-# The password will be asked during the build when you use the 'release' target.
-
-# The name of your application package as defined in the manifest.
-# Used by the 'uninstall' rule.
-application.package=org.fdroid.fdroid
-
-
diff --git a/build.xml b/build.xml
index 96b0cec02..0eac6bac1 100644
--- a/build.xml
+++ b/build.xml
@@ -2,66 +2,91 @@
+ It contains the path to the SDK. It should *NOT* be checked into
+ Version Control Systems. -->
-
-
+
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
- The rules file is imported from
- /platforms//templates/android_rules.xml
+
+
- To customize some build steps for your project:
- - copy the content of the main node from android_rules.xml
- - paste it in this build.xml below the task.
- - disable the import by changing the setup task below to
-
- This will ensure that the properties are setup correctly but that your customized
- build steps are used.
+
-
+
+
+
+
+
diff --git a/media/fdroid-logo/fdroid-135.png b/media/fdroid-logo/fdroid-135.png
new file mode 100644
index 000000000..92995a5a7
Binary files /dev/null and b/media/fdroid-logo/fdroid-135.png differ
diff --git a/media/fdroid-logo/fdroid-logo-blue-48pxb.svg b/media/fdroid-logo/fdroid-logo-blue-48pxb.svg
new file mode 100644
index 000000000..4651fc9bc
--- /dev/null
+++ b/media/fdroid-logo/fdroid-logo-blue-48pxb.svg
@@ -0,0 +1,418 @@
+
+
+
+
diff --git a/media/fdroid-logo/fdroid-logo-green48pxg.svg b/media/fdroid-logo/fdroid-logo-green48pxg.svg
new file mode 100644
index 000000000..41f03f9d3
--- /dev/null
+++ b/media/fdroid-logo/fdroid-logo-green48pxg.svg
@@ -0,0 +1,291 @@
+
+
+
+
diff --git a/media/fdroid-logo/fdroid-logo.svg b/media/fdroid-logo/fdroid-logo.svg
new file mode 100644
index 000000000..082b0f972
--- /dev/null
+++ b/media/fdroid-logo/fdroid-logo.svg
@@ -0,0 +1,2024 @@
+
+
+
+
diff --git a/media/fdroid-logo/license.txt b/media/fdroid-logo/license.txt
new file mode 100644
index 000000000..afcd069dc
--- /dev/null
+++ b/media/fdroid-logo/license.txt
@@ -0,0 +1,9 @@
+The FDroid logo
+Copyright 2012 William Theaker
+Dual-licensed (pick either) under CC-BY-SA 3.0 Unported and GPLv2 or later versions of that license
+
+About:
+Here are the Inkscape SVGs for the icons I designed. I can change the
+line widths and email you the raster PNGs if you let me know what
+resolutions you need. Just my name should be sufficient for attribution.
+Thanks!
diff --git a/media/fdroidheader-thumb.png b/media/fdroidheader-thumb.png
index 52e84a182..35a18881b 100644
Binary files a/media/fdroidheader-thumb.png and b/media/fdroidheader-thumb.png differ
diff --git a/media/fdroidheader.png b/media/fdroidheader.png
index 07f43fcaf..319a4e763 100644
Binary files a/media/fdroidheader.png and b/media/fdroidheader.png differ
diff --git a/media/fdroidheader.xcf b/media/fdroidheader.xcf
index 27d2907b3..f0ff5f2a1 100644
Binary files a/media/fdroidheader.xcf and b/media/fdroidheader.xcf differ
diff --git a/res/drawable-hdpi/ic_launcher.png b/res/drawable-hdpi/ic_launcher.png
new file mode 100644
index 000000000..cae86050f
Binary files /dev/null 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
new file mode 100644
index 000000000..378ba4a85
Binary files /dev/null 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
new file mode 100644
index 000000000..08445ca25
Binary files /dev/null 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
new file mode 100644
index 000000000..dc54b67c8
Binary files /dev/null and b/res/drawable-xhdpi/ic_launcher.png differ
diff --git a/res/drawable/icon.png b/res/drawable/icon.png
index 717577be3..08445ca25 100644
Binary files a/res/drawable/icon.png and b/res/drawable/icon.png differ