diff --git a/docker-builder-data/build/script/packet/opentoonz-nsis.files/opentoonz.nsi b/docker-builder-data/build/script/packet/opentoonz-nsis.files/opentoonz.nsi
index 5959bcf..4333b47 100644
--- a/docker-builder-data/build/script/packet/opentoonz-nsis.files/opentoonz.nsi
+++ b/docker-builder-data/build/script/packet/opentoonz-nsis.files/opentoonz.nsi
@@ -156,9 +156,10 @@ Section "Uninstall"
 
   ; Remove shortcuts, if any
   SetShellVarContext All
+  Delete "$DESKTOP\${PK_NAME_FULL}.lnk"
   Delete "$SMPROGRAMS\${PK_NAME_FULL}\${PK_NAME_FULL}.lnk"
   Delete "$SMPROGRAMS\${PK_NAME_FULL}\Uninstall ${PK_NAME_FULL}.lnk"
-  Delete "$DESKTOP\${PK_NAME_FULL}.lnk"
+  RMDir "$SMPROGRAMS\${PK_NAME_FULL}"
 
   ; Remove directories used
   RMDir "$SMPROGRAMS\${PK_NAME_FULL}"
diff --git a/docker-builder-data/build/script/packet/synfigstudio-nsis.files/synfigstudio.nsi b/docker-builder-data/build/script/packet/synfigstudio-nsis.files/synfigstudio.nsi
index 9b814ee..ed53b1a 100644
--- a/docker-builder-data/build/script/packet/synfigstudio-nsis.files/synfigstudio.nsi
+++ b/docker-builder-data/build/script/packet/synfigstudio-nsis.files/synfigstudio.nsi
@@ -167,9 +167,11 @@ Section "Uninstall"
 
   ; Remove shortcuts, if any
   SetShellVarContext All
-  Delete "$SMPROGRAMS\${PK_NAME_FULL}\${PK_NAME_FULL}.lnk"
   Delete "$DESKTOP\${PK_NAME_FULL}.lnk"
-  Delete "$SMPROGRAMS\${PK_NAME_FULL}\Uninstall ${PK_NAME_FULL}.lnk"
+  Delete "$SMPROGRAMS\${PK_DIR_NAME}\${PK_NAME_FULL}.lnk"
+  Delete "$SMPROGRAMS\${PK_DIR_NAME}\Uninstall ${PK_NAME_FULL}.lnk"
+  Delete "$SMPROGRAMS\${PK_DIR_NAME}\${PK_NAME_FULL} (Debug Console).lnk"
+  RMDir "$SMPROGRAMS\${PK_DIR_NAME}"
 
   ; Remove directories used
   RMDir "$SMPROGRAMS\${PK_NAME_FULL}"