diff --git a/Contrib/Icons/adni-installer-A.ico b/Contrib/Icons/adni18-installer-A.ico
similarity index 100%
rename from Contrib/Icons/adni-installer-A.ico
rename to Contrib/Icons/adni18-installer-A.ico
diff --git a/Contrib/Icons/adni-installer-B.ico b/Contrib/Icons/adni18-installer-B.ico
similarity index 100%
rename from Contrib/Icons/adni-installer-B.ico
rename to Contrib/Icons/adni18-installer-B.ico
diff --git a/Contrib/Icons/adni18-installer-C-no48xp.ico b/Contrib/Icons/adni18-installer-C-no48xp.ico
new file mode 100644
index 00000000..8bd171f8
Binary files /dev/null and b/Contrib/Icons/adni18-installer-C-no48xp.ico differ
diff --git a/Contrib/Icons/adni-installer-C.ico b/Contrib/Icons/adni18-installer-C.ico
similarity index 100%
rename from Contrib/Icons/adni-installer-C.ico
rename to Contrib/Icons/adni18-installer-C.ico
diff --git a/Contrib/Icons/adni-uninstall-A.ico b/Contrib/Icons/adni18-uninstall-A.ico
similarity index 100%
rename from Contrib/Icons/adni-uninstall-A.ico
rename to Contrib/Icons/adni18-uninstall-A.ico
diff --git a/Contrib/Icons/adni-uninstall-B.ico b/Contrib/Icons/adni18-uninstall-B.ico
similarity index 100%
rename from Contrib/Icons/adni-uninstall-B.ico
rename to Contrib/Icons/adni18-uninstall-B.ico
diff --git a/Contrib/Icons/adni-uninstall-C.ico b/Contrib/Icons/adni18-uninstall-C.ico
similarity index 100%
rename from Contrib/Icons/adni-uninstall-C.ico
rename to Contrib/Icons/adni18-uninstall-C.ico
diff --git a/Contrib/Icons/andi-installer-A.ico b/Contrib/Icons/andi-installer-A.ico
deleted file mode 100644
index ce36754a..00000000
Binary files a/Contrib/Icons/andi-installer-A.ico and /dev/null differ
diff --git a/Contrib/Icons/andi-installer-B.ico b/Contrib/Icons/andi-installer-B.ico
deleted file mode 100644
index a786d9af..00000000
Binary files a/Contrib/Icons/andi-installer-B.ico and /dev/null differ
diff --git a/Contrib/Icons/andi-installer-C.ico b/Contrib/Icons/andi-installer-C.ico
deleted file mode 100644
index 18c13438..00000000
Binary files a/Contrib/Icons/andi-installer-C.ico and /dev/null differ
diff --git a/Contrib/Icons/andi-uninstall-A.ico b/Contrib/Icons/andi-uninstall-A.ico
deleted file mode 100644
index 572cc031..00000000
Binary files a/Contrib/Icons/andi-uninstall-A.ico and /dev/null differ
diff --git a/Contrib/Icons/andi-uninstall-B.ico b/Contrib/Icons/andi-uninstall-B.ico
deleted file mode 100644
index 3e3cd4a8..00000000
Binary files a/Contrib/Icons/andi-uninstall-B.ico and /dev/null differ
diff --git a/Contrib/Icons/andi-uninstall-C.ico b/Contrib/Icons/andi-uninstall-C.ico
deleted file mode 100644
index c244cb70..00000000
Binary files a/Contrib/Icons/andi-uninstall-C.ico and /dev/null differ
diff --git a/Contrib/UIs/InstallShield.exe b/Contrib/UIs/InstallShield.exe
new file mode 100644
index 00000000..52fe741d
Binary files /dev/null and b/Contrib/UIs/InstallShield.exe differ