diff --git a/srcpkgs/vim/template b/srcpkgs/vim/template
index f30415a4c2f..e02e21c7a8e 100644
--- a/srcpkgs/vim/template
+++ b/srcpkgs/vim/template
@@ -112,6 +112,7 @@ do_install() {
 		vmkdir usr/share/icons/hicolor/${d}x${d}/apps
 	done
 	make -C src DESTDIR=${DESTDIR} install-icons
+	rm -rf $DESTDIR/usr/share/applications
 }
 
 vim-common_package() {
@@ -155,7 +156,9 @@ gvim_package() {
 	alternatives="vim:vim:/usr/bin/gvim"
 	pkg_install() {
 		cd $wrksrc/gvim
-		make -C src DESTDIR=${PKGDESTDIR} installvimbin
+		make -C src DESTDIR=${PKGDESTDIR} installvimbin install-icons
+		rm -f ${PKGDESTDIR}/usr/share/applications/vim.desktop
+		rm -rf ${PKGDESTDIR}/usr/share/icons
 	}
 }
 gvim-huge_package() {
@@ -165,7 +168,11 @@ gvim-huge_package() {
 	alternatives="vim:vim:/usr/bin/gvim-huge"
 	pkg_install() {
 		cd $wrksrc/gvim-huge
-		make -C src DESTDIR=${PKGDESTDIR} installvimbin
+		make -C src DESTDIR=${PKGDESTDIR} installvimbin install-icons
+		rm -f ${PKGDESTDIR}/usr/share/applications/vim.desktop
+		mv ${PKGDESTDIR}/usr/share/applications/{gvim,gvim-huge}.desktop
+		vsed -i 's,Exec=gvim,Exec=gvim-huge,g' ${PKGDESTDIR}/usr/share/applications/gvim-huge.desktop
+		rm -rf ${PKGDESTDIR}/usr/share/icons
 	}
 }
 vim-huge_package() {