diff --git a/srcpkgs/vim/template b/srcpkgs/vim/template
index d4f629bc24e..f30415a4c2f 100644
--- a/srcpkgs/vim/template
+++ b/srcpkgs/vim/template
@@ -1,6 +1,6 @@
 # Template file for 'vim'
 pkgname=vim
-version=8.1.1551
+version=8.1.1578
 revision=1
 hostmakedepends="glib-devel pkg-config"
 makedepends="acl-devel gtk+-devel libXt-devel lua-devel ncurses-devel
@@ -11,7 +11,7 @@ maintainer="Juan RP <xtraeme@voidlinux.org>"
 license="Vim"
 homepage="https://www.vim.org"
 distfiles="https://github.com/vim/vim/archive/v${version}.tar.gz"
-checksum=e9de8d1efaff3f7b43de27f4bc017313cd249aa73c310b7fce55d64ad36ff309
+checksum=cd9ce1a1b661c344b3b87e382ac60357a938e7e389537481afe127714634e32d
 
 subpackages="xxd vim-common vim-x11 gvim"
 # XXX vim-huge cannot be cross compiled for now.
@@ -104,6 +104,14 @@ do_install() {
 	cd ${DESTDIR}/usr/bin
 	ln -sf vim vim-ex
 	rm -f ${DESTDIR}/usr/bin/{ex,view}
+
+	# install gvim icons
+	cd ${wrksrc}/gvim
+	sed -i "s|/locolor|/hicolor|g" src/Makefile
+	for d in 16 32 48; do
+		vmkdir usr/share/icons/hicolor/${d}x${d}/apps
+	done
+	make -C src DESTDIR=${DESTDIR} install-icons
 }
 
 vim-common_package() {
@@ -119,6 +127,7 @@ vim-common_package() {
 	 vi:view.1:/usr/share/man/man1/vim.1
 	"
 	pkg_install() {
+		vmove usr/share/icons
 		vmove usr/bin/rvim
 		vmove usr/bin/vim-ex
 		vmove usr/bin/vimdiff
@@ -146,13 +155,7 @@ gvim_package() {
 	alternatives="vim:vim:/usr/bin/gvim"
 	pkg_install() {
 		cd $wrksrc/gvim
-		sed -i "s|/locolor|/hicolor|g" src/Makefile
-		for d in 16 32 48; do
-			install -d ${PKGDESTDIR}/usr/share/icons/hicolor/${d}x${d}/apps
-		done
-		make -C src DESTDIR=${PKGDESTDIR} installvimbin install-icons
-		vmove usr/share/applications/gvim.desktop
-		rm "$PKGDESTDIR"/usr/share/applications/vim.desktop
+		make -C src DESTDIR=${PKGDESTDIR} installvimbin
 	}
 }
 gvim-huge_package() {
@@ -162,12 +165,7 @@ gvim-huge_package() {
 	alternatives="vim:vim:/usr/bin/gvim-huge"
 	pkg_install() {
 		cd $wrksrc/gvim-huge
-		sed -i "s|/locolor|/hicolor|g" src/Makefile
-		for d in 16 32 48; do
-			install -d ${PKGDESTDIR}/usr/share/icons/hicolor/${d}x${d}/apps
-		done
-		make -C src DESTDIR=${PKGDESTDIR} installvimbin install-icons
-		vmove usr/share/applications/*.desktop
+		make -C src DESTDIR=${PKGDESTDIR} installvimbin
 	}
 }
 vim-huge_package() {