diff --git a/satellites/i3.sat b/satellites/i3.sat
index cae2a2d..e899e4e 100644
--- a/satellites/i3.sat
+++ b/satellites/i3.sat
@@ -2,12 +2,21 @@ name=i3
 version=4.12
 update_url='http://i3wm.org/downloads/'
 
+define_option '!window-icons: Patch for support for icons in the title'
+
 dlextract "http://i3wm.org/downloads/$name-$version.tar.bz2" \
           '308fc79ed252e1f3c8a093598e13e326'
+
+if option window-icons; then
+    dlfile 'https://aur.archlinux.org/cgit/aur.git/plain/iconsupport.patch?h=i3-wm-iconpatch' \
+           '3fe4dbd039bc0934d641ac9328e7ef92'
+fi
 header_end
 
 cd "$name-$version"
 
+option window-icons patch -p1 -i ../iconsupport.patch
+
 # Fix install directories
 sed -i -e "/\$(INSTALL)/s/bin/$(safe_sed "$dir_bindir")/" \
        -e "/\$(INSTALL)/s/share/$(safe_sed "$dir_datadir")/" \