diff --git a/devel/packer.png b/devel/packer.png
new file mode 100644
index 000000000..cb07e29a5
Binary files /dev/null and b/devel/packer.png differ
diff --git a/devel/packer.xml b/devel/packer.xml
index 73cd4d1d4..23474864f 100644
--- a/devel/packer.xml
+++ b/devel/packer.xml
@@ -4,6 +4,7 @@
   <summary>build automated machine images</summary>
   <description>Packer is a tool for creating identical machine images for multiple platforms from a single source configuration.</description>
   <homepage>https://www.packer.io/</homepage>
+  <icon href="https://raw.githubusercontent.com/0install/apps/master/devel/packer.png" type="image/png"/>
   <needs-terminal/>
 
   <group license="Mozilla Public License 2.0">
diff --git a/devel/packer.xml.template b/devel/packer.xml.template
index a4613b7c6..ce26161fa 100644
--- a/devel/packer.xml.template
+++ b/devel/packer.xml.template
@@ -4,6 +4,7 @@
   <summary>build automated machine images</summary>
   <description>Packer is a tool for creating identical machine images for multiple platforms from a single source configuration.</description>
   <homepage>https://www.packer.io/</homepage>
+  <icon href="https://raw.githubusercontent.com/0install/apps/master/devel/packer.png" type="image/png"/>
   <needs-terminal/>
 
   <feed-for interface="https://apps.0install.net/devel/packer.xml"/>
diff --git a/devel/terraform.png b/devel/terraform.png
new file mode 100644
index 000000000..c341df5dd
Binary files /dev/null and b/devel/terraform.png differ
diff --git a/devel/terraform.xml b/devel/terraform.xml
index f48d4bd2b..ff371a68c 100644
--- a/devel/terraform.xml
+++ b/devel/terraform.xml
@@ -4,6 +4,7 @@
   <summary>write, plan, and create infrastructure as code</summary>
   <description>Terraform is a tool for building, changing, and versioning infrastructure safely and efficiently. Terraform can manage existing and popular service providers as well as custom in-house solutions.</description>
   <homepage>https://www.terraform.io/</homepage>
+  <icon href="https://raw.githubusercontent.com/0install/apps/master/devel/terraform.png" type="image/png"/>
   <needs-terminal/>
 
   <group license="Mozilla Public License 2.0">
diff --git a/devel/terraform.xml.template b/devel/terraform.xml.template
index 7fdde51f7..14a0aa187 100644
--- a/devel/terraform.xml.template
+++ b/devel/terraform.xml.template
@@ -4,6 +4,7 @@
   <summary>write, plan, and create infrastructure as code</summary>
   <description>Terraform is a tool for building, changing, and versioning infrastructure safely and efficiently. Terraform can manage existing and popular service providers as well as custom in-house solutions.</description>
   <homepage>https://www.terraform.io/</homepage>
+  <icon href="https://raw.githubusercontent.com/0install/apps/master/devel/terraform.png" type="image/png"/>
   <needs-terminal/>
 
   <feed-for interface="https://apps.0install.net/devel/terraform.xml"/>
diff --git a/devel/vagrant.png b/devel/vagrant.png
new file mode 100644
index 000000000..4a366beda
Binary files /dev/null and b/devel/vagrant.png differ
diff --git a/devel/vagrant.xml b/devel/vagrant.xml
index 968c91355..5c1780890 100644
--- a/devel/vagrant.xml
+++ b/devel/vagrant.xml
@@ -4,6 +4,7 @@
   <summary>tool for building and distributing development environments</summary>
   <description>Development environments managed by Vagrant can run on local virtualized platforms such as VirtualBox or VMware, in the cloud via AWS or OpenStack, or in containers such as with Docker or raw LXC.</description>
   <homepage>https://www.vagrantup.com/</homepage>
+  <icon href="https://raw.githubusercontent.com/0install/apps/master/devel/vagrant.png" type="image/png"/>
   <needs-terminal/>
 
   <group license="MIT License">
diff --git a/devel/vagrant.xml.template b/devel/vagrant.xml.template
index af591cce9..dd96a2776 100644
--- a/devel/vagrant.xml.template
+++ b/devel/vagrant.xml.template
@@ -4,6 +4,7 @@
   <summary>tool for building and distributing development environments</summary>
   <description>Development environments managed by Vagrant can run on local virtualized platforms such as VirtualBox or VMware, in the cloud via AWS or OpenStack, or in containers such as with Docker or raw LXC.</description>
   <homepage>https://www.vagrantup.com/</homepage>
+  <icon href="https://raw.githubusercontent.com/0install/apps/master/devel/vagrant.png" type="image/png"/>
   <needs-terminal/>
 
   <feed-for interface="https://apps.0install.net/devel/vagrant.xml"/>
diff --git a/docker/compose-format.xml b/docker/compose-format.xml
index 28bfe1884..7d8b2d567 100644
--- a/docker/compose-format.xml
+++ b/docker/compose-format.xml
@@ -6,6 +6,8 @@
   <description>Lists all versions of the Docker Compose file format and their compatibility with specific Docker and Docker Compose versions. Useful to ensure Docker Compose files from different feeds to be merged all share the same file format version and are passed to a suitable Docker (Compose) implementation.</description>
   <homepage>https://docs.docker.com/compose/compose-file/compose-versioning/</homepage>
 
+  <icon href="https://raw.githubusercontent.com/docker/compose/master/logo.png" type="image/png"/>
+
   <implementation id="1.0" version="1.0" released="2013-12-20" stability="stable">
     <manifest-digest sha1new="da39a3ee5e6b4b0d3255bfef95601890afd80709"/>
     <recipe/>
diff --git a/dotnet/clr-monopath.xml b/dotnet/clr-monopath.xml
index daf6c8151..d8ddbf469 100644
--- a/dotnet/clr-monopath.xml
+++ b/dotnet/clr-monopath.xml
@@ -5,6 +5,7 @@
   <summary>virtual feed for .NET implementations with MONO_PATH support</summary>
   <description>Virtual feed for .NET implementations with MONO_PATH support: .NET Framework with monopath-emulator on Windows and Mono on POSIX. Uses .NET Framework profiles as version numbers.</description>
   <homepage>https://github.com/0install/monopath-emulator</homepage>
+  <icon href="https://raw.githubusercontent.com/0install/apps/master/dotnet/dotnet.png" type="image/png"/>
 
   <!-- Empty implementations used to map .NET Framework version numbers to roughly equivalent Mono version numbers. -->
   <feed arch="POSIX-*" src="https://apps.0install.net/dotnet/clr.xml" />
diff --git a/dotnet/clr.xml b/dotnet/clr.xml
index 3a427263f..e08c3d4f2 100644
--- a/dotnet/clr.xml
+++ b/dotnet/clr.xml
@@ -4,6 +4,7 @@
   <name>Common Language Runtime (CLR)</name>
   <summary>virtual feed for .NET implementations</summary>
   <description>Virtual feed for .NET implementations: .NET Framework on Windows and Mono on POSIX. Uses .NET Framework profiles as version numbers.</description>
+  <icon href="https://raw.githubusercontent.com/0install/apps/master/dotnet/dotnet.png" type="image/png"/>
 
   <!-- The .NET Framework is an implementation of the Common Language Runtime. -->
   <feed arch="Windows-*" src="https://apps.0install.net/dotnet/framework.xml" />
diff --git a/dotnet/docfx.png b/dotnet/docfx.png
new file mode 100644
index 000000000..8c02de185
Binary files /dev/null and b/dotnet/docfx.png differ
diff --git a/dotnet/docfx.xml b/dotnet/docfx.xml
index 82282f748..1984156a6 100644
--- a/dotnet/docfx.xml
+++ b/dotnet/docfx.xml
@@ -5,6 +5,7 @@
   <description>DocFX generates Documentation directly from source code (.NET, RESTful API, JavaScript, Java, etc...) and Markdown files.</description>
   <homepage>https://dotnet.github.io/docfx/</homepage>
   <category>Development</category>
+  <icon href="https://raw.githubusercontent.com/0install/apps/master/dotnet/docfx.png" type="image/png"/>
   <needs-terminal/>
 
   <group license="MIT License">
diff --git a/dotnet/docfx.xml.template b/dotnet/docfx.xml.template
index 9fe904765..5475704de 100644
--- a/dotnet/docfx.xml.template
+++ b/dotnet/docfx.xml.template
@@ -5,6 +5,7 @@
   <description>DocFX generates Documentation directly from source code (.NET, RESTful API, JavaScript, Java, etc...) and Markdown files.</description>
   <homepage>https://dotnet.github.io/docfx/</homepage>
   <category>Development</category>
+  <icon href="https://raw.githubusercontent.com/0install/apps/master/dotnet/docfx.png" type="image/png"/>
   <needs-terminal/>
 
   <feed-for interface="https://apps.0install.net/dotnet/docfx.xml"/>
diff --git a/dotnet/dotnet.png b/dotnet/dotnet.png
new file mode 100644
index 000000000..f17d43b89
Binary files /dev/null and b/dotnet/dotnet.png differ
diff --git a/dotnet/framework-client-profile.xml b/dotnet/framework-client-profile.xml
index 4d1bf4689..9daf4b6ff 100644
--- a/dotnet/framework-client-profile.xml
+++ b/dotnet/framework-client-profile.xml
@@ -5,6 +5,7 @@
   <summary>subset of the .NET Framework optimized for client applications</summary>
   <description>This feed uses the version of .NET Framework already installed on the computer. It does not download new versions.</description>
   <homepage>https://docs.microsoft.com/en-us/dotnet/framework/deployment/client-profile</homepage>
+  <icon href="https://raw.githubusercontent.com/0install/apps/master/dotnet/framework.png" type="image/png"/>
 
   <package-implementation package="netfx-client" distributions="Windows">
     <!-- There is a seperate GUI version of the Mono executable on Windows. For .NET we treat "run" and "run-gui" exactly the same. -->
diff --git a/dotnet/framework.png b/dotnet/framework.png
new file mode 100644
index 000000000..a55d4dd01
Binary files /dev/null and b/dotnet/framework.png differ
diff --git a/dotnet/framework.xml b/dotnet/framework.xml
index 9b0223433..9f8c71f1b 100644
--- a/dotnet/framework.xml
+++ b/dotnet/framework.xml
@@ -4,6 +4,7 @@
   <name>.NET Framework</name>
   <summary>.NET Framework from Microsoft</summary>
   <description>This feed uses the version of .NET Framework already installed on the computer. It does not download new versions.</description>
+  <icon href="https://raw.githubusercontent.com/0install/apps/master/dotnet/framework.png" type="image/png"/>
 
   <package-implementation package="netfx" distributions="Windows">
     <!-- There is a seperate GUI version of the Mono executable on Windows. For .NET we treat "run" and "run-gui" exactly the same. -->
diff --git a/dotnet/mono.png b/dotnet/mono.png
new file mode 100644
index 000000000..50a624509
Binary files /dev/null and b/dotnet/mono.png differ
diff --git a/dotnet/mono.xml b/dotnet/mono.xml
index 7d784713e..d3dda940c 100644
--- a/dotnet/mono.xml
+++ b/dotnet/mono.xml
@@ -4,6 +4,7 @@
   <name>Mono</name>
   <summary>open-source cross-platform implementation of the Common Language Runtime (.NET Framework compatible)</summary>
   <homepage>http://www.mono-project.com/</homepage>
+  <icon href="https://raw.githubusercontent.com/0install/apps/master/dotnet/mono.png" type="image/png"/>
 
   <group main="/usr/bin/mono">
     <!-- There is a separate GUI version of the Mono executable on Windows. On POSIX systems we simply map it back to regular Mono. -->
diff --git a/java/gradle.png b/java/gradle.png
new file mode 100644
index 000000000..e0fcafd44
Binary files /dev/null and b/java/gradle.png differ
diff --git a/java/gradle.xml b/java/gradle.xml
index cd9750476..cc8557e92 100644
--- a/java/gradle.xml
+++ b/java/gradle.xml
@@ -5,6 +5,7 @@
   <homepage>http://www.gradle.org/</homepage>
   <category>Development</category>
   <needs-terminal/>
+  <icon href="https://raw.githubusercontent.com/0install/apps/master/java/gradle.png" type="image/png"/>
 
   <group license="Apache License 2.0">
     <requires interface="https://apps.0install.net/java/jdk.xml">
diff --git a/java/gradle.xml.template b/java/gradle.xml.template
index c0f7e12f5..56c857753 100644
--- a/java/gradle.xml.template
+++ b/java/gradle.xml.template
@@ -5,6 +5,7 @@
   <homepage>http://www.gradle.org/</homepage>
   <category>Development</category>
   <needs-terminal/>
+  <icon href="https://raw.githubusercontent.com/0install/apps/master/java/gradle.png" type="image/png"/>
 
   <feed-for interface="https://apps.0install.net/java/gradle.xml"/>
 
diff --git a/kubernetes/helm-2.xml b/kubernetes/helm-2.xml
index 64b023456..63fc8e8db 100644
--- a/kubernetes/helm-2.xml
+++ b/kubernetes/helm-2.xml
@@ -4,6 +4,7 @@
   <summary>the Kubernetes package manager</summary>
   <description>Helm is a tool for managing Kubernetes charts. Charts are packages of pre-configured Kubernetes resources.</description>
   <homepage>https://helm.sh/</homepage>
+  <icon href="https://raw.githubusercontent.com/0install/apps/master/kubernetes/helm.png" type="image/png"/>
   <needs-terminal/>
 
   <feed-for interface="https://apps.0install.net/kubernetes/helm.xml"/>
diff --git a/kubernetes/helm-2.xml.template b/kubernetes/helm-2.xml.template
index 0c8364bd4..bb0d0523d 100644
--- a/kubernetes/helm-2.xml.template
+++ b/kubernetes/helm-2.xml.template
@@ -4,6 +4,7 @@
   <summary>the Kubernetes package manager</summary>
   <description>Helm is a tool for managing Kubernetes charts. Charts are packages of pre-configured Kubernetes resources.</description>
   <homepage>https://helm.sh/</homepage>
+  <icon href="https://raw.githubusercontent.com/0install/apps/master/kubernetes/helm.png" type="image/png"/>
   <needs-terminal/>
 
   <feed-for interface="https://apps.0install.net/kubernetes/helm-2.xml"/>
diff --git a/kubernetes/helm-3.xml b/kubernetes/helm-3.xml
index f5bb01802..060682f21 100644
--- a/kubernetes/helm-3.xml
+++ b/kubernetes/helm-3.xml
@@ -4,6 +4,7 @@
   <summary>the Kubernetes package manager</summary>
   <description>Helm is a tool for managing Kubernetes charts. Charts are packages of pre-configured Kubernetes resources.</description>
   <homepage>https://helm.sh/</homepage>
+  <icon href="https://raw.githubusercontent.com/0install/apps/master/kubernetes/helm.png" type="image/png"/>
   <needs-terminal/>
 
   <feed-for interface="https://apps.0install.net/kubernetes/helm.xml"/>
diff --git a/kubernetes/helm-3.xml.template b/kubernetes/helm-3.xml.template
index 7ca70fd81..75fd59d61 100644
--- a/kubernetes/helm-3.xml.template
+++ b/kubernetes/helm-3.xml.template
@@ -4,6 +4,7 @@
   <summary>the Kubernetes package manager</summary>
   <description>Helm is a tool for managing Kubernetes charts. Charts are packages of pre-configured Kubernetes resources.</description>
   <homepage>https://helm.sh/</homepage>
+  <icon href="https://raw.githubusercontent.com/0install/apps/master/kubernetes/helm.png" type="image/png"/>
   <needs-terminal/>
 
   <feed-for interface="https://apps.0install.net/kubernetes/helm-3.xml"/>
diff --git a/kubernetes/helm.png b/kubernetes/helm.png
new file mode 100644
index 000000000..3f456d951
Binary files /dev/null and b/kubernetes/helm.png differ
diff --git a/kubernetes/helm.xml b/kubernetes/helm.xml
index cdb4c4509..7b8950a9d 100644
--- a/kubernetes/helm.xml
+++ b/kubernetes/helm.xml
@@ -4,6 +4,7 @@
   <summary>the Kubernetes package manager</summary>
   <description>Helm is a tool for managing Kubernetes charts. Charts are packages of pre-configured Kubernetes resources.</description>
   <homepage>https://helm.sh/</homepage>
+  <icon href="https://raw.githubusercontent.com/0install/apps/master/kubernetes/helm.png" type="image/png"/>
   <needs-terminal/>
 
   <feed src="https://apps.0install.net/kubernetes/helm-2.xml"/>
diff --git a/kubernetes/istio.png b/kubernetes/istio.png
new file mode 100644
index 000000000..2921123bf
Binary files /dev/null and b/kubernetes/istio.png differ
diff --git a/kubernetes/istioctl.xml b/kubernetes/istioctl.xml
index 572de8b00..360661ebd 100644
--- a/kubernetes/istioctl.xml
+++ b/kubernetes/istioctl.xml
@@ -4,6 +4,7 @@
   <summary>command line utility to debug and diagnose Istio</summary>
   <description>Istio configuration command line utility for service operators to debug and diagnose their Istio mesh.</description>
   <homepage>https://istio.io/docs/reference/commands/istioctl/</homepage>
+  <icon href="https://raw.githubusercontent.com/0install/apps/master/kubernetes/istio.png" type="image/png"/>
   <needs-terminal/>
 
   <entry-point binary-name="istioctl" command="run"/>
diff --git a/kubernetes/istioctl.xml.template b/kubernetes/istioctl.xml.template
index 8ee62a6e5..0968dbf86 100644
--- a/kubernetes/istioctl.xml.template
+++ b/kubernetes/istioctl.xml.template
@@ -4,6 +4,7 @@
   <summary>command line utility to debug and diagnose Istio</summary>
   <description>Istio configuration command line utility for service operators to debug and diagnose their Istio mesh.</description>
   <homepage>https://istio.io/docs/reference/commands/istioctl/</homepage>
+  <icon href="https://raw.githubusercontent.com/0install/apps/master/kubernetes/istio.png" type="image/png"/>
   <needs-terminal/>
 
   <feed-for interface="https://apps.0install.net/kubernetes/istioctl.xml"/>
diff --git a/kubernetes/kops.png b/kubernetes/kops.png
new file mode 100644
index 000000000..cbaff271c
Binary files /dev/null and b/kubernetes/kops.png differ
diff --git a/kubernetes/kops.xml b/kubernetes/kops.xml
index e7a3c5509..cf1c4c175 100644
--- a/kubernetes/kops.xml
+++ b/kubernetes/kops.xml
@@ -4,6 +4,7 @@
   <summary>production grade Kubernetes installation, upgrades, and management</summary>
   <description>kops helps you create, destroy, upgrade and maintain production-grade, highly available, Kubernetes clusters from the command line.</description>
   <homepage>https://github.com/kubernetes/kops</homepage>
+  <icon href="https://raw.githubusercontent.com/0install/apps/master/kubernetes/kops.png" type="image/png"/>
   <needs-terminal/>
 
   <group license="Apache License 2.0">
diff --git a/kubernetes/kops.xml.template b/kubernetes/kops.xml.template
index 9a755c581..0453abe14 100644
--- a/kubernetes/kops.xml.template
+++ b/kubernetes/kops.xml.template
@@ -4,6 +4,7 @@
   <summary>production grade Kubernetes installation, upgrades, and management </summary>
   <description>kops helps you create, destroy, upgrade and maintain production-grade, highly available, Kubernetes clusters from the command line.</description>
   <homepage>https://github.com/kubernetes/kops</homepage>
+  <icon href="https://raw.githubusercontent.com/0install/apps/master/kubernetes/kops.png" type="image/png"/>
   <needs-terminal/>
 
   <feed-for interface="https://apps.0install.net/kubernetes/kops.xml"/>
diff --git a/ocaml/ocaml-runtime.xml b/ocaml/ocaml-runtime.xml
index 4754aac3b..a0c539a50 100644
--- a/ocaml/ocaml-runtime.xml
+++ b/ocaml/ocaml-runtime.xml
@@ -5,6 +5,7 @@
   <description>OCaml is a general purpose industrial-strength programming language with an emphasis on expressiveness and safety. Developed for more than 20 years at Inria it benefits from one of the most advanced type systems and supports functional, imperative and object-oriented styles of programming.
 
     This is the runtime package. It contains the bytecode interpreter (ocamlrun) and the toplevel (ocaml), which allows dynamic linking. It also includes the standard library, plus the Dynlink, Bigarray, Str and Unix extra libraries. Note: only changes to the last version component are binary compatible (e.g. 4.00.1 and 4.00.2 are compatible with each other, but not with 4.01.0).</description>
+  <icon href="https://raw.githubusercontent.com/ocaml/ocaml-logo/master/Colour/PNG/colour-transparent-icon.png" type="image/png"/>
   <group>
     <environment insert="" mode="replace" name="OCAML_HOME"/>
     <environment insert="lib" mode="replace" name="OCAMLLIB"/>
diff --git a/ruby/ruby.gui.png b/ruby/ruby.gui.png
deleted file mode 100644
index ce9c2d4ea..000000000
Binary files a/ruby/ruby.gui.png and /dev/null differ
diff --git a/ruby/ruby.png b/ruby/ruby.png
deleted file mode 100644
index 298288b24..000000000
Binary files a/ruby/ruby.png and /dev/null differ
diff --git a/ruby/ruby.xml b/ruby/ruby.xml
index 35f554210..5583fd09f 100644
--- a/ruby/ruby.xml
+++ b/ruby/ruby.xml
@@ -7,7 +7,7 @@
   <needs-terminal/>
 
   <icon href="https://raw.githubusercontent.com/0install/apps/master/ruby/ruby.ico" type="image/vnd.microsoft.icon"/>
-  <icon href="https://raw.githubusercontent.com/0install/apps/master/ruby/ruby.png" type="image/png"/>
+  <icon href="https://www.ruby-lang.org/images/header-ruby-logo.png" type="image/png"/>
 
   <package-implementation main="/usr/bin/ruby" package="ruby"/>
 
@@ -296,12 +296,10 @@
     <needs-terminal/>
     <name>Ruby command-line runner</name>
     <icon href="https://raw.githubusercontent.com/0install/apps/master/ruby/ruby.ico" type="image/vnd.microsoft.icon"/>
-    <icon href="https://raw.githubusercontent.com/0install/apps/master/ruby/ruby.png" type="image/png"/>
   </entry-point>
   <entry-point binary-name="rubyw" command="run-gui">
     <name>Ruby GUI runner</name>
     <icon href="https://raw.githubusercontent.com/0install/apps/master/ruby/ruby.gui.ico" type="image/vnd.microsoft.icon"/>
-    <icon href="https://raw.githubusercontent.com/0install/apps/master/ruby/ruby.gui.png" type="image/png"/>
   </entry-point>
   <entry-point binary-name="irb" command="irb">
     <needs-terminal/>
@@ -343,7 +341,6 @@
     <file-type id="RubyWFile">
       <description>RubyW File</description>
       <icon href="https://raw.githubusercontent.com/0install/apps/master/ruby/ruby.gui.ico" type="image/vnd.microsoft.icon.xml" xmlns="http://zero-install.sourceforge.net/2004/injector/interface"/>
-      <icon href="https://raw.githubusercontent.com/0install/apps/master/ruby/ruby.gui.png" type="image/png.xml" xmlns="http://zero-install.sourceforge.net/2004/injector/interface"/>
       <verb args="&quot;%1&quot; %*" command="run-gui" name="open"/>
       <extension value=".rbw"/>
     </file-type>
diff --git a/ruby/ruby.xml.template b/ruby/ruby.xml.template
index 7c44e5194..a5883ee20 100644
--- a/ruby/ruby.xml.template
+++ b/ruby/ruby.xml.template
@@ -7,7 +7,7 @@
   <needs-terminal/>
 
   <icon href="https://raw.githubusercontent.com/0install/apps/master/ruby/ruby.ico" type="image/vnd.microsoft.icon"/>
-  <icon href="https://raw.githubusercontent.com/0install/apps/master/ruby/ruby.png" type="image/png"/>
+  <icon href="https://www.ruby-lang.org/images/header-ruby-logo.png" type="image/png"/>
 
   <feed-for interface="https://apps.0install.net/ruby/ruby.xml"/>