diff --git a/build/geany-plugins.nsi b/build/geany-plugins.nsi
index e6f1d25e0..aa99fb18c 100644
--- a/build/geany-plugins.nsi
+++ b/build/geany-plugins.nsi
@@ -166,6 +166,7 @@ Section Uninstall
 	Delete "$INSTDIR\lib\geany\geanygendoc.dll"
 	Delete "$INSTDIR\lib\geany\geanyinsertnum.dll"
 	Delete "$INSTDIR\lib\geany\geanylatex.dll"
+	; Keep for geanylipsum propper deleting old dll some time
 	Delete "$INSTDIR\lib\geany\geanylipsum.dll"
 	Delete "$INSTDIR\lib\geany\geanylua.dll"
 	Delete "$INSTDIR\lib\geany\geanymacro.dll"
@@ -178,6 +179,7 @@ Section Uninstall
 	Delete "$INSTDIR\lib\geany\geanyvc.dll"
 	Delete "$INSTDIR\lib\geany\geniuspaste.dll"
 	Delete "$INSTDIR\lib\geany\git-changebar.dll"
+	Delete "$INSTDIR\lib\geany\lipsum.dll"
 	Delete "$INSTDIR\lib\geany\lineoperations.dll"
 	Delete "$INSTDIR\lib\geany\markdown.dll"
 	Delete "$INSTDIR\lib\geany\overview.dll"
@@ -236,30 +238,30 @@ Section Uninstall
 	Delete "$INSTDIR\bin\libgstvideo-1.0-0.dll"
 	Delete "$INSTDIR\bin\libgtkspell-0.dll"
 	Delete "$INSTDIR\bin\libgtkspell3-*.dll"
-	Delete "$INSTDIR\bin\libhistory6.dll"
-	Delete "$INSTDIR\bin\libhogweed-4-1.dll"
+	Delete "$INSTDIR\bin\libhistory7.dll"
+	Delete "$INSTDIR\bin\libhogweed-4.dll"
 	Delete "$INSTDIR\bin\libhttp_parser-2.dll"
-	Delete "$INSTDIR\bin\libhunspell-1.3-0.dll"
-	Delete "$INSTDIR\bin\libicudt56.dll"
-	Delete "$INSTDIR\bin\libicuin56.dll"
-	Delete "$INSTDIR\bin\libicuio56.dll"
-	Delete "$INSTDIR\bin\libicule56.dll"
-	Delete "$INSTDIR\bin\libiculx56.dll"
-	Delete "$INSTDIR\bin\libicutest56.dll"
-	Delete "$INSTDIR\bin\libicutu56.dll"
-	Delete "$INSTDIR\bin\libicuuc56.dll"
+	Delete "$INSTDIR\bin\libhunspell-1.4-0.dll"
+	Delete "$INSTDIR\bin\libicudt57.dll"
+	Delete "$INSTDIR\bin\libicuin57.dll"
+	Delete "$INSTDIR\bin\libicuio57.dll"
+	Delete "$INSTDIR\bin\libicule57.dll"
+	Delete "$INSTDIR\bin\libiculx57.dll"
+	Delete "$INSTDIR\bin\libicutest57.dll"
+	Delete "$INSTDIR\bin\libicutu57.dll"
+	Delete "$INSTDIR\bin\libicuuc57.dll"
 	Delete "$INSTDIR\bin\libidn-11.dll"
 	Delete "$INSTDIR\bin\libjavascriptcoregtk-1.0-0.dll"
 	Delete "$INSTDIR\bin\libjavascriptcoregtk-3.0-0.dll"
 	Delete "$INSTDIR\bin\libjpeg-8.dll"
 	Delete "$INSTDIR\bin\liblzma-5.dll"
-	Delete "$INSTDIR\bin\libnettle-6-2.dll"
-	Delete "$INSTDIR\bin\libnghttp2-14"
+	Delete "$INSTDIR\bin\libnettle-6.dll"
+	Delete "$INSTDIR\bin\libnghttp2-14.dll"
 	Delete "$INSTDIR\bin\libogg-0.dll"
 	Delete "$INSTDIR\bin\liborc-0.4-0.dll"
 	Delete "$INSTDIR\bin\liborc-test-0.4-0.dll"
 	Delete "$INSTDIR\bin\libp11-kit-0.dll"
-	Delete "$INSTDIR\bin\libreadline6.dll"
+	Delete "$INSTDIR\bin\libreadline7.dll"
 	Delete "$INSTDIR\bin\librtmp-1.dll"
 	Delete "$INSTDIR\bin\libsoup-2.4-1.dll"
 	Delete "$INSTDIR\bin\libsoup-gnome-2.4-1.dll"
@@ -284,6 +286,7 @@ Section Uninstall
 	Delete "$INSTDIR\bin\libwebp-6.dll"
 	Delete "$INSTDIR\bin\libwebpdecoder-2.dll"
 	Delete "$INSTDIR\bin\libwebpdemux-2.dll"
+	Delete "$INSTDIR\bin\libwebpextras-0.dll"
 	Delete "$INSTDIR\bin\libwebpmux-2.dll"
 	Delete "$INSTDIR\bin\libxml2-2.dll"
 	Delete "$INSTDIR\bin\libxslt-1.dll"
@@ -318,8 +321,12 @@ Section Uninstall
 	FindClose $0
 
 	; only if empty
+	RMDir "$INSTDIR\lib\geany"
 	RMDir "$INSTDIR\lib"
 	RMDir "$INSTDIR\share\doc"
+	RMDir "$INSTDIR\share\icons\hicolor\16x16\apps"
+	RMDir "$INSTDIR\share\icons\hicolor\16x16"
+	RMDir "$INSTDIR\share\icons\hicolor"
 	RMDir "$INSTDIR\share\icons"
 	RMDir "$INSTDIR\share\locale"
 	RMDir "$INSTDIR\share"