146 files changed, 0 insertions, 639 deletions
diff --git a/miranda-tools/installer/graphics/header.bmp b/miranda-tools/installer/graphics/header.bmp
deleted file mode 100644
index a38da57046..0000000000
--- a/miranda-tools/installer/graphics/header.bmp
+++ /dev/null
diff --git a/miranda-tools/installer/graphics/install.ico b/miranda-tools/installer/graphics/install.ico
deleted file mode 100644
index f7791c3e0b..0000000000
--- a/miranda-tools/installer/graphics/install.ico
+++ /dev/null
diff --git a/miranda-tools/installer/graphics/uninstall.ico b/miranda-tools/installer/graphics/uninstall.ico
deleted file mode 100644
index 7d1c21f3bd..0000000000
--- a/miranda-tools/installer/graphics/uninstall.ico
+++ /dev/null
diff --git a/miranda-tools/installer/graphics/welcome.bmp b/miranda-tools/installer/graphics/welcome.bmp
deleted file mode 100644
index 7f1e8e7d6d..0000000000
--- a/miranda-tools/installer/graphics/welcome.bmp
+++ /dev/null
diff --git a/miranda-tools/installer/icons/Makefile b/miranda-tools/installer/icons/Makefile
deleted file mode 100644
index 123a836be8..0000000000
--- a/miranda-tools/installer/icons/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-CC = ld
-RC = windres
-
-all:
-	$(RC) --input-format rc --output-format coff -DICO_AIMHI -o resource.res -i resource.rc
-	$(CC) -shared -o bin\hicolor\proto_AIM.dll -T i386pe-ico.x -s -nostdlib resource.res
-	del resource.res
-	$(RC) --input-format rc --output-format coff -DICO_AIMLO -o resource.res -i resource.rc
-	$(CC) -shared -o bin\locolor\proto_AIM.dll -T i386pe-ico.x -s -nostdlib resource.res
-	del resource.res
-	$(RC) --input-format rc --output-format coff -DICO_GGHI -o resource.res -i resource.rc
-	$(CC) -shared -o bin\hicolor\proto_GG.dll -T i386pe-ico.x -s -nostdlib resource.res
-	del resource.res
-	$(RC) --input-format rc --output-format coff -DICO_GGLO -o resource.res -i resource.rc
-	$(CC) -shared -o bin\locolor\proto_GG.dll -T i386pe-ico.x -s -nostdlib resource.res
-	del resource.res
-	$(RC) --input-format rc --output-format coff -DICO_ICQHI -o resource.res -i resource.rc
-	$(CC) -shared -o bin\hicolor\proto_ICQ.dll -T i386pe-ico.x -s -nostdlib resource.res
-	del resource.res
-	$(RC) --input-format rc --output-format coff -DICO_ICQLO -o resource.res -i resource.rc
-	$(CC) -shared -o bin\locolor\proto_ICQ.dll -T i386pe-ico.x -s -nostdlib resource.res
-	del resource.res
-	$(RC) --input-format rc --output-format coff -DICO_IRCHI -o resource.res -i resource.rc
-	$(CC) -shared -o bin\hicolor\proto_IRC.dll -T i386pe-ico.x -s -nostdlib resource.res
-	del resource.res
-	$(RC) --input-format rc --output-format coff -DICO_IRCLO -o resource.res -i resource.rc
-	$(CC) -shared -o bin\locolor\proto_IRC.dll -T i386pe-ico.x -s -nostdlib resource.res
-	del resource.res
-	$(RC) --input-format rc --output-format coff -DICO_JABBERHI -o resource.res -i resource.rc
-	$(CC) -shared -o bin\hicolor\proto_JABBER.dll -T i386pe-ico.x -s -nostdlib resource.res
-	del resource.res
-	$(RC) --input-format rc --output-format coff -DICO_JABBERLO -o resource.res -i resource.rc
-	$(CC) -shared -o bin\locolor\proto_JABBER.dll -T i386pe-ico.x -s -nostdlib resource.res
-	del resource.res
-	$(RC) --input-format rc --output-format coff -DICO_MSNHI -o resource.res -i resource.rc
-	$(CC) -shared -o bin\hicolor\proto_MSN.dll -T i386pe-ico.x -s -nostdlib resource.res
-	del resource.res
-	$(RC) --input-format rc --output-format coff -DICO_MSNLO -o resource.res -i resource.rc
-	$(CC) -shared -o bin\locolor\proto_MSN.dll -T i386pe-ico.x -s -nostdlib resource.res
-	del resource.res
-	$(RC) --input-format rc --output-format coff -DICO_YAHOOHI -o resource.res -i resource.rc
-	$(CC) -shared -o bin\hicolor\proto_YAHOO.dll -T i386pe-ico.x -s -nostdlib resource.res
-	del resource.res
-	$(RC) --input-format rc --output-format coff -DICO_YAHOOLO -o resource.res -i resource.rc
-	$(CC) -shared -o bin\locolor\proto_YAHOO.dll -T i386pe-ico.x -s -nostdlib resource.res
-	del resource.res
diff --git a/miranda-tools/installer/icons/bin/hicolor/proto_AIM.dll b/miranda-tools/installer/icons/bin/hicolor/proto_AIM.dll
deleted file mode 100644
index 3a6c1bd3b5..0000000000
--- a/miranda-tools/installer/icons/bin/hicolor/proto_AIM.dll
+++ /dev/null
diff --git a/miranda-tools/installer/icons/bin/hicolor/proto_GG.dll b/miranda-tools/installer/icons/bin/hicolor/proto_GG.dll
deleted file mode 100644
index 9d9a660653..0000000000
--- a/miranda-tools/installer/icons/bin/hicolor/proto_GG.dll
+++ /dev/null
diff --git a/miranda-tools/installer/icons/bin/hicolor/proto_ICQ.dll b/miranda-tools/installer/icons/bin/hicolor/proto_ICQ.dll
deleted file mode 100644
index 98ddfd0d15..0000000000
--- a/miranda-tools/installer/icons/bin/hicolor/proto_ICQ.dll
+++ /dev/null
diff --git a/miranda-tools/installer/icons/bin/hicolor/proto_IRC.dll b/miranda-tools/installer/icons/bin/hicolor/proto_IRC.dll
deleted file mode 100644
index 8332b384ba..0000000000
--- a/miranda-tools/installer/icons/bin/hicolor/proto_IRC.dll
+++ /dev/null
diff --git a/miranda-tools/installer/icons/bin/hicolor/proto_JABBER.dll b/miranda-tools/installer/icons/bin/hicolor/proto_JABBER.dll
deleted file mode 100644
index 0857d9de6b..0000000000
--- a/miranda-tools/installer/icons/bin/hicolor/proto_JABBER.dll
+++ /dev/null
diff --git a/miranda-tools/installer/icons/bin/hicolor/proto_MSN.dll b/miranda-tools/installer/icons/bin/hicolor/proto_MSN.dll
deleted file mode 100644
index 57884e960f..0000000000
--- a/miranda-tools/installer/icons/bin/hicolor/proto_MSN.dll
+++ /dev/null
diff --git a/miranda-tools/installer/icons/bin/hicolor/proto_YAHOO.dll b/miranda-tools/installer/icons/bin/hicolor/proto_YAHOO.dll
deleted file mode 100644
index 9a16971a21..0000000000
--- a/miranda-tools/installer/icons/bin/hicolor/proto_YAHOO.dll
+++ /dev/null
diff --git a/miranda-tools/installer/icons/bin/locolor/proto_AIM.dll b/miranda-tools/installer/icons/bin/locolor/proto_AIM.dll
deleted file mode 100644
index 5d9bb7760d..0000000000
--- a/miranda-tools/installer/icons/bin/locolor/proto_AIM.dll
+++ /dev/null
diff --git a/miranda-tools/installer/icons/bin/locolor/proto_GG.dll b/miranda-tools/installer/icons/bin/locolor/proto_GG.dll
deleted file mode 100644
index 18b86eaa0a..0000000000
--- a/miranda-tools/installer/icons/bin/locolor/proto_GG.dll
+++ /dev/null
diff --git a/miranda-tools/installer/icons/bin/locolor/proto_ICQ.dll b/miranda-tools/installer/icons/bin/locolor/proto_ICQ.dll
deleted file mode 100644
index 42811399f8..0000000000
--- a/miranda-tools/installer/icons/bin/locolor/proto_ICQ.dll
+++ /dev/null
diff --git a/miranda-tools/installer/icons/bin/locolor/proto_IRC.dll b/miranda-tools/installer/icons/bin/locolor/proto_IRC.dll
deleted file mode 100644
index 83ab003197..0000000000
--- a/miranda-tools/installer/icons/bin/locolor/proto_IRC.dll
+++ /dev/null
diff --git a/miranda-tools/installer/icons/bin/locolor/proto_JABBER.dll b/miranda-tools/installer/icons/bin/locolor/proto_JABBER.dll
deleted file mode 100644
index 85b7ba16c1..0000000000
--- a/miranda-tools/installer/icons/bin/locolor/proto_JABBER.dll
+++ /dev/null
diff --git a/miranda-tools/installer/icons/bin/locolor/proto_MSN.dll b/miranda-tools/installer/icons/bin/locolor/proto_MSN.dll
deleted file mode 100644
index d0883d9215..0000000000
--- a/miranda-tools/installer/icons/bin/locolor/proto_MSN.dll
+++ /dev/null
diff --git a/miranda-tools/installer/icons/bin/locolor/proto_YAHOO.dll b/miranda-tools/installer/icons/bin/locolor/proto_YAHOO.dll
deleted file mode 100644
index f7ac5da143..0000000000
--- a/miranda-tools/installer/icons/bin/locolor/proto_YAHOO.dll
+++ /dev/null
diff --git a/miranda-tools/installer/icons/i386pe-ico.x b/miranda-tools/installer/icons/i386pe-ico.x
deleted file mode 100644
index 6db53b6bc6..0000000000
--- a/miranda-tools/installer/icons/i386pe-ico.x
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Default linker script, for normal executables */
-OUTPUT_FORMAT(pei-i386)
-SECTIONS
-{
-  /* Make the virtual address and file offset synced if the alignment is
-     lower than the target page size. */
-  . = SIZEOF_HEADERS;
-  . = ALIGN(__section_alignment__);
- .rsrc __image_base__ + BLOCK(__section_alignment__) :
-  {
-    *(.rsrc)
-    *(SORT(.rsrc$*))
-  }
-  /DISCARD/ : 
-  {
-    *(.edata)
-  }   
-}
diff --git a/miranda-tools/installer/icons/res/AIM/32_aim_Away.ico b/miranda-tools/installer/icons/res/AIM/32_aim_Away.ico
deleted file mode 100644
index 9f668b4fe7..0000000000
--- a/miranda-tools/installer/icons/res/AIM/32_aim_Away.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/AIM/32_aim_DND.ico b/miranda-tools/installer/icons/res/AIM/32_aim_DND.ico
deleted file mode 100644
index 0ace68680a..0000000000
--- a/miranda-tools/installer/icons/res/AIM/32_aim_DND.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/AIM/32_aim_FFC.ico b/miranda-tools/installer/icons/res/AIM/32_aim_FFC.ico
deleted file mode 100644
index f3ecc5fcc3..0000000000
--- a/miranda-tools/installer/icons/res/AIM/32_aim_FFC.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/AIM/32_aim_Invisible.ico b/miranda-tools/installer/icons/res/AIM/32_aim_Invisible.ico
deleted file mode 100644
index 932356b398..0000000000
--- a/miranda-tools/installer/icons/res/AIM/32_aim_Invisible.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/AIM/32_aim_Lunch.ico b/miranda-tools/installer/icons/res/AIM/32_aim_Lunch.ico
deleted file mode 100644
index 7f6587e73c..0000000000
--- a/miranda-tools/installer/icons/res/AIM/32_aim_Lunch.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/AIM/32_aim_NA.ico b/miranda-tools/installer/icons/res/AIM/32_aim_NA.ico
deleted file mode 100644
index f6dc93b5ac..0000000000
--- a/miranda-tools/installer/icons/res/AIM/32_aim_NA.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/AIM/32_aim_Occupied.ico b/miranda-tools/installer/icons/res/AIM/32_aim_Occupied.ico
deleted file mode 100644
index f89c39625d..0000000000
--- a/miranda-tools/installer/icons/res/AIM/32_aim_Occupied.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/AIM/32_aim_Offline.ico b/miranda-tools/installer/icons/res/AIM/32_aim_Offline.ico
deleted file mode 100644
index 54fabffaa7..0000000000
--- a/miranda-tools/installer/icons/res/AIM/32_aim_Offline.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/AIM/32_aim_Online.ico b/miranda-tools/installer/icons/res/AIM/32_aim_Online.ico
deleted file mode 100644
index 429afcc9ff..0000000000
--- a/miranda-tools/installer/icons/res/AIM/32_aim_Online.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/AIM/32_aim_Phone.ico b/miranda-tools/installer/icons/res/AIM/32_aim_Phone.ico
deleted file mode 100644
index 5c568d67bf..0000000000
--- a/miranda-tools/installer/icons/res/AIM/32_aim_Phone.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/AIM/8_aim_Away.ico b/miranda-tools/installer/icons/res/AIM/8_aim_Away.ico
deleted file mode 100644
index fa26a1689e..0000000000
--- a/miranda-tools/installer/icons/res/AIM/8_aim_Away.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/AIM/8_aim_DND.ico b/miranda-tools/installer/icons/res/AIM/8_aim_DND.ico
deleted file mode 100644
index ce4f5cc56d..0000000000
--- a/miranda-tools/installer/icons/res/AIM/8_aim_DND.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/AIM/8_aim_FFC.ico b/miranda-tools/installer/icons/res/AIM/8_aim_FFC.ico
deleted file mode 100644
index f764b757c4..0000000000
--- a/miranda-tools/installer/icons/res/AIM/8_aim_FFC.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/AIM/8_aim_Invisible.ico b/miranda-tools/installer/icons/res/AIM/8_aim_Invisible.ico
deleted file mode 100644
index f231c45b8d..0000000000
--- a/miranda-tools/installer/icons/res/AIM/8_aim_Invisible.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/AIM/8_aim_Lunch.ico b/miranda-tools/installer/icons/res/AIM/8_aim_Lunch.ico
deleted file mode 100644
index d1671bef4e..0000000000
--- a/miranda-tools/installer/icons/res/AIM/8_aim_Lunch.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/AIM/8_aim_NA.ico b/miranda-tools/installer/icons/res/AIM/8_aim_NA.ico
deleted file mode 100644
index fab7a8d037..0000000000
--- a/miranda-tools/installer/icons/res/AIM/8_aim_NA.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/AIM/8_aim_Occupied.ico b/miranda-tools/installer/icons/res/AIM/8_aim_Occupied.ico
deleted file mode 100644
index fa6c135ec2..0000000000
--- a/miranda-tools/installer/icons/res/AIM/8_aim_Occupied.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/AIM/8_aim_Offline.ico b/miranda-tools/installer/icons/res/AIM/8_aim_Offline.ico
deleted file mode 100644
index d859026988..0000000000
--- a/miranda-tools/installer/icons/res/AIM/8_aim_Offline.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/AIM/8_aim_Online.ico b/miranda-tools/installer/icons/res/AIM/8_aim_Online.ico
deleted file mode 100644
index bcd70847da..0000000000
--- a/miranda-tools/installer/icons/res/AIM/8_aim_Online.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/AIM/8_aim_Phone.ico b/miranda-tools/installer/icons/res/AIM/8_aim_Phone.ico
deleted file mode 100644
index b7bd997967..0000000000
--- a/miranda-tools/installer/icons/res/AIM/8_aim_Phone.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/GG/32_gg_Away.ico b/miranda-tools/installer/icons/res/GG/32_gg_Away.ico
deleted file mode 100644
index a3df6d4e79..0000000000
--- a/miranda-tools/installer/icons/res/GG/32_gg_Away.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/GG/32_gg_DND.ico b/miranda-tools/installer/icons/res/GG/32_gg_DND.ico
deleted file mode 100644
index 5f98ae7ab8..0000000000
--- a/miranda-tools/installer/icons/res/GG/32_gg_DND.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/GG/32_gg_FFC.ico b/miranda-tools/installer/icons/res/GG/32_gg_FFC.ico
deleted file mode 100644
index d145072f08..0000000000
--- a/miranda-tools/installer/icons/res/GG/32_gg_FFC.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/GG/32_gg_Invisible.ico b/miranda-tools/installer/icons/res/GG/32_gg_Invisible.ico
deleted file mode 100644
index a6949e34f9..0000000000
--- a/miranda-tools/installer/icons/res/GG/32_gg_Invisible.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/GG/32_gg_NA.ico b/miranda-tools/installer/icons/res/GG/32_gg_NA.ico
deleted file mode 100644
index a0b460624c..0000000000
--- a/miranda-tools/installer/icons/res/GG/32_gg_NA.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/GG/32_gg_Offline.ico b/miranda-tools/installer/icons/res/GG/32_gg_Offline.ico
deleted file mode 100644
index f4093b78cc..0000000000
--- a/miranda-tools/installer/icons/res/GG/32_gg_Offline.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/GG/32_gg_Online.ico b/miranda-tools/installer/icons/res/GG/32_gg_Online.ico
deleted file mode 100644
index acbba11077..0000000000
--- a/miranda-tools/installer/icons/res/GG/32_gg_Online.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/GG/8_gg_Away.ico b/miranda-tools/installer/icons/res/GG/8_gg_Away.ico
deleted file mode 100644
index 4aa9fafdd4..0000000000
--- a/miranda-tools/installer/icons/res/GG/8_gg_Away.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/GG/8_gg_DND.ico b/miranda-tools/installer/icons/res/GG/8_gg_DND.ico
deleted file mode 100644
index 2bbc99620b..0000000000
--- a/miranda-tools/installer/icons/res/GG/8_gg_DND.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/GG/8_gg_FFC.ico b/miranda-tools/installer/icons/res/GG/8_gg_FFC.ico
deleted file mode 100644
index fcc1956365..0000000000
--- a/miranda-tools/installer/icons/res/GG/8_gg_FFC.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/GG/8_gg_Invisible.ico b/miranda-tools/installer/icons/res/GG/8_gg_Invisible.ico
deleted file mode 100644
index a416268d85..0000000000
--- a/miranda-tools/installer/icons/res/GG/8_gg_Invisible.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/GG/8_gg_NA.ico b/miranda-tools/installer/icons/res/GG/8_gg_NA.ico
deleted file mode 100644
index 7b28f86624..0000000000
--- a/miranda-tools/installer/icons/res/GG/8_gg_NA.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/GG/8_gg_Offline.ico b/miranda-tools/installer/icons/res/GG/8_gg_Offline.ico
deleted file mode 100644
index 5ec90e4142..0000000000
--- a/miranda-tools/installer/icons/res/GG/8_gg_Offline.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/GG/8_gg_Online.ico b/miranda-tools/installer/icons/res/GG/8_gg_Online.ico
deleted file mode 100644
index db72acd430..0000000000
--- a/miranda-tools/installer/icons/res/GG/8_gg_Online.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/ICQ/32_icq_Away.ico b/miranda-tools/installer/icons/res/ICQ/32_icq_Away.ico
deleted file mode 100644
index 248a3e9916..0000000000
--- a/miranda-tools/installer/icons/res/ICQ/32_icq_Away.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/ICQ/32_icq_DND.ico b/miranda-tools/installer/icons/res/ICQ/32_icq_DND.ico
deleted file mode 100644
index 4833160eac..0000000000
--- a/miranda-tools/installer/icons/res/ICQ/32_icq_DND.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/ICQ/32_icq_FFC.ico b/miranda-tools/installer/icons/res/ICQ/32_icq_FFC.ico
deleted file mode 100644
index e7ec4d3ae2..0000000000
--- a/miranda-tools/installer/icons/res/ICQ/32_icq_FFC.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/ICQ/32_icq_Invisible.ico b/miranda-tools/installer/icons/res/ICQ/32_icq_Invisible.ico
deleted file mode 100644
index 42f80a84cc..0000000000
--- a/miranda-tools/installer/icons/res/ICQ/32_icq_Invisible.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/ICQ/32_icq_Lunch.ico b/miranda-tools/installer/icons/res/ICQ/32_icq_Lunch.ico
deleted file mode 100644
index e88dd35a2e..0000000000
--- a/miranda-tools/installer/icons/res/ICQ/32_icq_Lunch.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/ICQ/32_icq_NA.ico b/miranda-tools/installer/icons/res/ICQ/32_icq_NA.ico
deleted file mode 100644
index ec0621dc9f..0000000000
--- a/miranda-tools/installer/icons/res/ICQ/32_icq_NA.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/ICQ/32_icq_Occupied.ico b/miranda-tools/installer/icons/res/ICQ/32_icq_Occupied.ico
deleted file mode 100644
index 04ea2a5855..0000000000
--- a/miranda-tools/installer/icons/res/ICQ/32_icq_Occupied.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/ICQ/32_icq_Offline.ico b/miranda-tools/installer/icons/res/ICQ/32_icq_Offline.ico
deleted file mode 100644
index af862168cd..0000000000
--- a/miranda-tools/installer/icons/res/ICQ/32_icq_Offline.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/ICQ/32_icq_Online.ico b/miranda-tools/installer/icons/res/ICQ/32_icq_Online.ico
deleted file mode 100644
index 2e33305a76..0000000000
--- a/miranda-tools/installer/icons/res/ICQ/32_icq_Online.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/ICQ/32_icq_Phone.ico b/miranda-tools/installer/icons/res/ICQ/32_icq_Phone.ico
deleted file mode 100644
index 74c80b66ed..0000000000
--- a/miranda-tools/installer/icons/res/ICQ/32_icq_Phone.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/ICQ/8_icq_Away.ico b/miranda-tools/installer/icons/res/ICQ/8_icq_Away.ico
deleted file mode 100644
index b66daff406..0000000000
--- a/miranda-tools/installer/icons/res/ICQ/8_icq_Away.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/ICQ/8_icq_DND.ico b/miranda-tools/installer/icons/res/ICQ/8_icq_DND.ico
deleted file mode 100644
index cb08b68bb3..0000000000
--- a/miranda-tools/installer/icons/res/ICQ/8_icq_DND.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/ICQ/8_icq_FFC.ico b/miranda-tools/installer/icons/res/ICQ/8_icq_FFC.ico
deleted file mode 100644
index 198981b196..0000000000
--- a/miranda-tools/installer/icons/res/ICQ/8_icq_FFC.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/ICQ/8_icq_Invisible.ico b/miranda-tools/installer/icons/res/ICQ/8_icq_Invisible.ico
deleted file mode 100644
index f1985a1cfe..0000000000
--- a/miranda-tools/installer/icons/res/ICQ/8_icq_Invisible.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/ICQ/8_icq_Lunch.ico b/miranda-tools/installer/icons/res/ICQ/8_icq_Lunch.ico
deleted file mode 100644
index be86b5ce04..0000000000
--- a/miranda-tools/installer/icons/res/ICQ/8_icq_Lunch.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/ICQ/8_icq_NA.ico b/miranda-tools/installer/icons/res/ICQ/8_icq_NA.ico
deleted file mode 100644
index 53ac247cec..0000000000
--- a/miranda-tools/installer/icons/res/ICQ/8_icq_NA.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/ICQ/8_icq_Occupied.ico b/miranda-tools/installer/icons/res/ICQ/8_icq_Occupied.ico
deleted file mode 100644
index 2b34792b8f..0000000000
--- a/miranda-tools/installer/icons/res/ICQ/8_icq_Occupied.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/ICQ/8_icq_Offline.ico b/miranda-tools/installer/icons/res/ICQ/8_icq_Offline.ico
deleted file mode 100644
index 4a94663f96..0000000000
--- a/miranda-tools/installer/icons/res/ICQ/8_icq_Offline.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/ICQ/8_icq_Online.ico b/miranda-tools/installer/icons/res/ICQ/8_icq_Online.ico
deleted file mode 100644
index ffaf5755c6..0000000000
--- a/miranda-tools/installer/icons/res/ICQ/8_icq_Online.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/ICQ/8_icq_Phone.ico b/miranda-tools/installer/icons/res/ICQ/8_icq_Phone.ico
deleted file mode 100644
index ffd84a2802..0000000000
--- a/miranda-tools/installer/icons/res/ICQ/8_icq_Phone.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/IRC/32_irc_Away.ico b/miranda-tools/installer/icons/res/IRC/32_irc_Away.ico
deleted file mode 100644
index a2391df85e..0000000000
--- a/miranda-tools/installer/icons/res/IRC/32_irc_Away.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/IRC/32_irc_Offline.ico b/miranda-tools/installer/icons/res/IRC/32_irc_Offline.ico
deleted file mode 100644
index a521360232..0000000000
--- a/miranda-tools/installer/icons/res/IRC/32_irc_Offline.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/IRC/32_irc_Online.ico b/miranda-tools/installer/icons/res/IRC/32_irc_Online.ico
deleted file mode 100644
index 37b885a806..0000000000
--- a/miranda-tools/installer/icons/res/IRC/32_irc_Online.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/IRC/8_irc_Away.ico b/miranda-tools/installer/icons/res/IRC/8_irc_Away.ico
deleted file mode 100644
index b1fb5481b3..0000000000
--- a/miranda-tools/installer/icons/res/IRC/8_irc_Away.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/IRC/8_irc_Offline.ico b/miranda-tools/installer/icons/res/IRC/8_irc_Offline.ico
deleted file mode 100644
index d36b6f0f79..0000000000
--- a/miranda-tools/installer/icons/res/IRC/8_irc_Offline.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/IRC/8_irc_Online.ico b/miranda-tools/installer/icons/res/IRC/8_irc_Online.ico
deleted file mode 100644
index eb24605f52..0000000000
--- a/miranda-tools/installer/icons/res/IRC/8_irc_Online.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/JABBER/32_jabber_Away.ico b/miranda-tools/installer/icons/res/JABBER/32_jabber_Away.ico
deleted file mode 100644
index fc97a61763..0000000000
--- a/miranda-tools/installer/icons/res/JABBER/32_jabber_Away.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/JABBER/32_jabber_DND.ico b/miranda-tools/installer/icons/res/JABBER/32_jabber_DND.ico
deleted file mode 100644
index 026c7256a7..0000000000
--- a/miranda-tools/installer/icons/res/JABBER/32_jabber_DND.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/JABBER/32_jabber_FFC.ico b/miranda-tools/installer/icons/res/JABBER/32_jabber_FFC.ico
deleted file mode 100644
index dbc899c02a..0000000000
--- a/miranda-tools/installer/icons/res/JABBER/32_jabber_FFC.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/JABBER/32_jabber_Invisible.ico b/miranda-tools/installer/icons/res/JABBER/32_jabber_Invisible.ico
deleted file mode 100644
index 9b6cc549e1..0000000000
--- a/miranda-tools/installer/icons/res/JABBER/32_jabber_Invisible.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/JABBER/32_jabber_Lunch.ico b/miranda-tools/installer/icons/res/JABBER/32_jabber_Lunch.ico
deleted file mode 100644
index aad1ab9791..0000000000
--- a/miranda-tools/installer/icons/res/JABBER/32_jabber_Lunch.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/JABBER/32_jabber_NA.ico b/miranda-tools/installer/icons/res/JABBER/32_jabber_NA.ico
deleted file mode 100644
index c23f527379..0000000000
--- a/miranda-tools/installer/icons/res/JABBER/32_jabber_NA.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/JABBER/32_jabber_Occupied.ico b/miranda-tools/installer/icons/res/JABBER/32_jabber_Occupied.ico
deleted file mode 100644
index ed8697bea3..0000000000
--- a/miranda-tools/installer/icons/res/JABBER/32_jabber_Occupied.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/JABBER/32_jabber_Offline.ico b/miranda-tools/installer/icons/res/JABBER/32_jabber_Offline.ico
deleted file mode 100644
index e86406abbc..0000000000
--- a/miranda-tools/installer/icons/res/JABBER/32_jabber_Offline.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/JABBER/32_jabber_Online.ico b/miranda-tools/installer/icons/res/JABBER/32_jabber_Online.ico
deleted file mode 100644
index 0d3b5e0ce2..0000000000
--- a/miranda-tools/installer/icons/res/JABBER/32_jabber_Online.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/JABBER/32_jabber_Phone.ico b/miranda-tools/installer/icons/res/JABBER/32_jabber_Phone.ico
deleted file mode 100644
index b66544261c..0000000000
--- a/miranda-tools/installer/icons/res/JABBER/32_jabber_Phone.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/JABBER/8_jabber_Away.ico b/miranda-tools/installer/icons/res/JABBER/8_jabber_Away.ico
deleted file mode 100644
index 39f79e4b68..0000000000
--- a/miranda-tools/installer/icons/res/JABBER/8_jabber_Away.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/JABBER/8_jabber_DND.ico b/miranda-tools/installer/icons/res/JABBER/8_jabber_DND.ico
deleted file mode 100644
index 5e6727f5b9..0000000000
--- a/miranda-tools/installer/icons/res/JABBER/8_jabber_DND.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/JABBER/8_jabber_FFC.ico b/miranda-tools/installer/icons/res/JABBER/8_jabber_FFC.ico
deleted file mode 100644
index 1777876640..0000000000
--- a/miranda-tools/installer/icons/res/JABBER/8_jabber_FFC.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/JABBER/8_jabber_Invisible.ico b/miranda-tools/installer/icons/res/JABBER/8_jabber_Invisible.ico
deleted file mode 100644
index e46dd186b0..0000000000
--- a/miranda-tools/installer/icons/res/JABBER/8_jabber_Invisible.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/JABBER/8_jabber_Lunch.ico b/miranda-tools/installer/icons/res/JABBER/8_jabber_Lunch.ico
deleted file mode 100644
index 3166f3263c..0000000000
--- a/miranda-tools/installer/icons/res/JABBER/8_jabber_Lunch.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/JABBER/8_jabber_NA.ico b/miranda-tools/installer/icons/res/JABBER/8_jabber_NA.ico
deleted file mode 100644
index c8cb60a156..0000000000
--- a/miranda-tools/installer/icons/res/JABBER/8_jabber_NA.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/JABBER/8_jabber_Occupied.ico b/miranda-tools/installer/icons/res/JABBER/8_jabber_Occupied.ico
deleted file mode 100644
index 141e487711..0000000000
--- a/miranda-tools/installer/icons/res/JABBER/8_jabber_Occupied.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/JABBER/8_jabber_Offline.ico b/miranda-tools/installer/icons/res/JABBER/8_jabber_Offline.ico
deleted file mode 100644
index a8da8ad81a..0000000000
--- a/miranda-tools/installer/icons/res/JABBER/8_jabber_Offline.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/JABBER/8_jabber_Online.ico b/miranda-tools/installer/icons/res/JABBER/8_jabber_Online.ico
deleted file mode 100644
index 5727cfce57..0000000000
--- a/miranda-tools/installer/icons/res/JABBER/8_jabber_Online.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/JABBER/8_jabber_Phone.ico b/miranda-tools/installer/icons/res/JABBER/8_jabber_Phone.ico
deleted file mode 100644
index 7adf607d5a..0000000000
--- a/miranda-tools/installer/icons/res/JABBER/8_jabber_Phone.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/MSN/32_msn_Away.ico b/miranda-tools/installer/icons/res/MSN/32_msn_Away.ico
deleted file mode 100644
index 7d058cea73..0000000000
--- a/miranda-tools/installer/icons/res/MSN/32_msn_Away.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/MSN/32_msn_DND.ico b/miranda-tools/installer/icons/res/MSN/32_msn_DND.ico
deleted file mode 100644
index c59387be4d..0000000000
--- a/miranda-tools/installer/icons/res/MSN/32_msn_DND.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/MSN/32_msn_FFC.ico b/miranda-tools/installer/icons/res/MSN/32_msn_FFC.ico
deleted file mode 100644
index 1f8a5b199f..0000000000
--- a/miranda-tools/installer/icons/res/MSN/32_msn_FFC.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/MSN/32_msn_Invisible.ico b/miranda-tools/installer/icons/res/MSN/32_msn_Invisible.ico
deleted file mode 100644
index b54168cc94..0000000000
--- a/miranda-tools/installer/icons/res/MSN/32_msn_Invisible.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/MSN/32_msn_Lunch.ico b/miranda-tools/installer/icons/res/MSN/32_msn_Lunch.ico
deleted file mode 100644
index 712bac8b31..0000000000
--- a/miranda-tools/installer/icons/res/MSN/32_msn_Lunch.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/MSN/32_msn_NA.ico b/miranda-tools/installer/icons/res/MSN/32_msn_NA.ico
deleted file mode 100644
index 790436c42d..0000000000
--- a/miranda-tools/installer/icons/res/MSN/32_msn_NA.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/MSN/32_msn_Occupied.ico b/miranda-tools/installer/icons/res/MSN/32_msn_Occupied.ico
deleted file mode 100644
index 7699d5bd16..0000000000
--- a/miranda-tools/installer/icons/res/MSN/32_msn_Occupied.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/MSN/32_msn_Offline.ico b/miranda-tools/installer/icons/res/MSN/32_msn_Offline.ico
deleted file mode 100644
index dffd80e7a0..0000000000
--- a/miranda-tools/installer/icons/res/MSN/32_msn_Offline.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/MSN/32_msn_Online.ico b/miranda-tools/installer/icons/res/MSN/32_msn_Online.ico
deleted file mode 100644
index 818824f3a0..0000000000
--- a/miranda-tools/installer/icons/res/MSN/32_msn_Online.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/MSN/32_msn_Phone.ico b/miranda-tools/installer/icons/res/MSN/32_msn_Phone.ico
deleted file mode 100644
index 01a806af22..0000000000
--- a/miranda-tools/installer/icons/res/MSN/32_msn_Phone.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/MSN/8_msn_Away.ico b/miranda-tools/installer/icons/res/MSN/8_msn_Away.ico
deleted file mode 100644
index e81618b8f7..0000000000
--- a/miranda-tools/installer/icons/res/MSN/8_msn_Away.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/MSN/8_msn_DND.ico b/miranda-tools/installer/icons/res/MSN/8_msn_DND.ico
deleted file mode 100644
index e20a67dddf..0000000000
--- a/miranda-tools/installer/icons/res/MSN/8_msn_DND.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/MSN/8_msn_FFC.ico b/miranda-tools/installer/icons/res/MSN/8_msn_FFC.ico
deleted file mode 100644
index 4638c33321..0000000000
--- a/miranda-tools/installer/icons/res/MSN/8_msn_FFC.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/MSN/8_msn_Invisible.ico b/miranda-tools/installer/icons/res/MSN/8_msn_Invisible.ico
deleted file mode 100644
index 3bd1550c6a..0000000000
--- a/miranda-tools/installer/icons/res/MSN/8_msn_Invisible.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/MSN/8_msn_Lunch.ico b/miranda-tools/installer/icons/res/MSN/8_msn_Lunch.ico
deleted file mode 100644
index 4a0ab90253..0000000000
--- a/miranda-tools/installer/icons/res/MSN/8_msn_Lunch.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/MSN/8_msn_NA.ico b/miranda-tools/installer/icons/res/MSN/8_msn_NA.ico
deleted file mode 100644
index 5c57a0689e..0000000000
--- a/miranda-tools/installer/icons/res/MSN/8_msn_NA.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/MSN/8_msn_Occupied.ico b/miranda-tools/installer/icons/res/MSN/8_msn_Occupied.ico
deleted file mode 100644
index 75c1872eef..0000000000
--- a/miranda-tools/installer/icons/res/MSN/8_msn_Occupied.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/MSN/8_msn_Offline.ico b/miranda-tools/installer/icons/res/MSN/8_msn_Offline.ico
deleted file mode 100644
index 5fc7722be1..0000000000
--- a/miranda-tools/installer/icons/res/MSN/8_msn_Offline.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/MSN/8_msn_Online.ico b/miranda-tools/installer/icons/res/MSN/8_msn_Online.ico
deleted file mode 100644
index a12a560d54..0000000000
--- a/miranda-tools/installer/icons/res/MSN/8_msn_Online.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/MSN/8_msn_Phone.ico b/miranda-tools/installer/icons/res/MSN/8_msn_Phone.ico
deleted file mode 100644
index 9de5474cf9..0000000000
--- a/miranda-tools/installer/icons/res/MSN/8_msn_Phone.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/YAHOO/32_yahoo_Away.ico b/miranda-tools/installer/icons/res/YAHOO/32_yahoo_Away.ico
deleted file mode 100644
index 82d132c8d3..0000000000
--- a/miranda-tools/installer/icons/res/YAHOO/32_yahoo_Away.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/YAHOO/32_yahoo_DND.ico b/miranda-tools/installer/icons/res/YAHOO/32_yahoo_DND.ico
deleted file mode 100644
index f6357e08bc..0000000000
--- a/miranda-tools/installer/icons/res/YAHOO/32_yahoo_DND.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/YAHOO/32_yahoo_FFC.ico b/miranda-tools/installer/icons/res/YAHOO/32_yahoo_FFC.ico
deleted file mode 100644
index e213ec5f59..0000000000
--- a/miranda-tools/installer/icons/res/YAHOO/32_yahoo_FFC.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/YAHOO/32_yahoo_Invisible.ico b/miranda-tools/installer/icons/res/YAHOO/32_yahoo_Invisible.ico
deleted file mode 100644
index 8e2c4744f5..0000000000
--- a/miranda-tools/installer/icons/res/YAHOO/32_yahoo_Invisible.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/YAHOO/32_yahoo_Lunch.ico b/miranda-tools/installer/icons/res/YAHOO/32_yahoo_Lunch.ico
deleted file mode 100644
index 9dc1968611..0000000000
--- a/miranda-tools/installer/icons/res/YAHOO/32_yahoo_Lunch.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/YAHOO/32_yahoo_NA.ico b/miranda-tools/installer/icons/res/YAHOO/32_yahoo_NA.ico
deleted file mode 100644
index 534691e78b..0000000000
--- a/miranda-tools/installer/icons/res/YAHOO/32_yahoo_NA.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/YAHOO/32_yahoo_Occupied.ico b/miranda-tools/installer/icons/res/YAHOO/32_yahoo_Occupied.ico
deleted file mode 100644
index 0e7fd434a3..0000000000
--- a/miranda-tools/installer/icons/res/YAHOO/32_yahoo_Occupied.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/YAHOO/32_yahoo_Offline.ico b/miranda-tools/installer/icons/res/YAHOO/32_yahoo_Offline.ico
deleted file mode 100644
index fd0d04104e..0000000000
--- a/miranda-tools/installer/icons/res/YAHOO/32_yahoo_Offline.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/YAHOO/32_yahoo_Online.ico b/miranda-tools/installer/icons/res/YAHOO/32_yahoo_Online.ico
deleted file mode 100644
index 1d559e0676..0000000000
--- a/miranda-tools/installer/icons/res/YAHOO/32_yahoo_Online.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/YAHOO/32_yahoo_Phone.ico b/miranda-tools/installer/icons/res/YAHOO/32_yahoo_Phone.ico
deleted file mode 100644
index 9279d34c86..0000000000
--- a/miranda-tools/installer/icons/res/YAHOO/32_yahoo_Phone.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/YAHOO/8_yahoo_Away.ico b/miranda-tools/installer/icons/res/YAHOO/8_yahoo_Away.ico
deleted file mode 100644
index 18c83f7065..0000000000
--- a/miranda-tools/installer/icons/res/YAHOO/8_yahoo_Away.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/YAHOO/8_yahoo_DND.ico b/miranda-tools/installer/icons/res/YAHOO/8_yahoo_DND.ico
deleted file mode 100644
index 3003fc79fc..0000000000
--- a/miranda-tools/installer/icons/res/YAHOO/8_yahoo_DND.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/YAHOO/8_yahoo_FFC.ico b/miranda-tools/installer/icons/res/YAHOO/8_yahoo_FFC.ico
deleted file mode 100644
index 7526f8e1d1..0000000000
--- a/miranda-tools/installer/icons/res/YAHOO/8_yahoo_FFC.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/YAHOO/8_yahoo_Invisible.ico b/miranda-tools/installer/icons/res/YAHOO/8_yahoo_Invisible.ico
deleted file mode 100644
index 03cafe0d45..0000000000
--- a/miranda-tools/installer/icons/res/YAHOO/8_yahoo_Invisible.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/YAHOO/8_yahoo_Lunch.ico b/miranda-tools/installer/icons/res/YAHOO/8_yahoo_Lunch.ico
deleted file mode 100644
index 89638253bd..0000000000
--- a/miranda-tools/installer/icons/res/YAHOO/8_yahoo_Lunch.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/YAHOO/8_yahoo_NA.ico b/miranda-tools/installer/icons/res/YAHOO/8_yahoo_NA.ico
deleted file mode 100644
index bdfd99bb57..0000000000
--- a/miranda-tools/installer/icons/res/YAHOO/8_yahoo_NA.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/YAHOO/8_yahoo_Occupied.ico b/miranda-tools/installer/icons/res/YAHOO/8_yahoo_Occupied.ico
deleted file mode 100644
index e118f8bd99..0000000000
--- a/miranda-tools/installer/icons/res/YAHOO/8_yahoo_Occupied.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/YAHOO/8_yahoo_Offline.ico b/miranda-tools/installer/icons/res/YAHOO/8_yahoo_Offline.ico
deleted file mode 100644
index e34b073446..0000000000
--- a/miranda-tools/installer/icons/res/YAHOO/8_yahoo_Offline.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/YAHOO/8_yahoo_Online.ico b/miranda-tools/installer/icons/res/YAHOO/8_yahoo_Online.ico
deleted file mode 100644
index 6bc32598fb..0000000000
--- a/miranda-tools/installer/icons/res/YAHOO/8_yahoo_Online.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/res/YAHOO/8_yahoo_Phone.ico b/miranda-tools/installer/icons/res/YAHOO/8_yahoo_Phone.ico
deleted file mode 100644
index 026aa84d59..0000000000
--- a/miranda-tools/installer/icons/res/YAHOO/8_yahoo_Phone.ico
+++ /dev/null
diff --git a/miranda-tools/installer/icons/resource.rc b/miranda-tools/installer/icons/resource.rc
deleted file mode 100644
index 19c1ccd32d..0000000000
--- a/miranda-tools/installer/icons/resource.rc
+++ /dev/null
@@ -1,150 +0,0 @@
-#include <windows.h>
-
-#define IDI_OFFLINE                     105
-#define IDI_ONLINE                      104
-#define IDI_AWAY                        128
-#define IDI_INVISIBLE                   130
-#define IDI_NA                          131
-#define IDI_DND                         158
-#define IDI_OCCUPIED                    159
-#define IDI_FREE4CHAT                   129
-#define IDI_OUTTOLUNCH                  1003
-#define IDI_ONTHEPHONE                  1002
-
-#ifdef ICO_AIMHI
-IDI_OFFLINE     ICON DISCARDABLE "res\\AIM\\32_aim_Offline.ico"
-IDI_ONLINE      ICON DISCARDABLE "res\\AIM\\32_aim_Online.ico"
-IDI_AWAY        ICON DISCARDABLE "res\\AIM\\32_aim_Away.ico"
-IDI_INVISIBLE   ICON DISCARDABLE "res\\AIM\\32_aim_Invisible.ico"
-IDI_ONTHEPHONE  ICON DISCARDABLE "res\\AIM\\32_aim_Phone.ico"
-#endif
-
-#ifdef ICO_AIMLO
-IDI_OFFLINE     ICON DISCARDABLE "res\\AIM\\8_aim_Offline.ico"
-IDI_ONLINE      ICON DISCARDABLE "res\\AIM\\8_aim_Online.ico"
-IDI_AWAY        ICON DISCARDABLE "res\\AIM\\8_aim_Away.ico"
-IDI_INVISIBLE   ICON DISCARDABLE "res\\AIM\\8_aim_Invisible.ico"
-IDI_ONTHEPHONE  ICON DISCARDABLE "res\\AIM\\8_aim_Phone.ico"
-#endif
-
-#ifdef ICO_GGHI
-IDI_OFFLINE      ICON DISCARDABLE "res\\GG\\32_gg_Offline.ico"
-IDI_ONLINE       ICON DISCARDABLE "res\\GG\\32_gg_Online.ico"
-IDI_AWAY         ICON DISCARDABLE "res\\GG\\32_gg_Away.ico"
-IDI_INVISIBLE    ICON DISCARDABLE "res\\GG\\32_gg_Invisible.ico"
-IDI_NA	         ICON DISCARDABLE "res\\GG\\32_gg_NA.ico"
-IDI_DND          ICON DISCARDABLE "res\\GG\\32_gg_DND.ico"
-IDI_FREE4CHAT    ICON DISCARDABLE "res\\GG\\32_gg_FFC.ico"
-#endif
-
-#ifdef ICO_GGLO
-IDI_OFFLINE      ICON DISCARDABLE "res\\GG\\8_gg_Offline.ico"
-IDI_ONLINE       ICON DISCARDABLE "res\\GG\\8_gg_Online.ico"
-IDI_AWAY         ICON DISCARDABLE "res\\GG\\8_gg_Away.ico"
-IDI_INVISIBLE    ICON DISCARDABLE "res\\GG\\8_gg_Invisible.ico"
-IDI_NA	         ICON DISCARDABLE "res\\GG\\8_gg_NA.ico"
-IDI_DND          ICON DISCARDABLE "res\\GG\\8_gg_DND.ico"
-IDI_FREE4CHAT    ICON DISCARDABLE "res\\GG\\8_gg_FFC.ico"
-#endif
-
-#ifdef ICO_ICQHI
-IDI_OFFLINE      ICON DISCARDABLE "res\\ICQ\\32_icq_Offline.ico"
-IDI_ONLINE       ICON DISCARDABLE "res\\ICQ\\32_icq_Online.ico"
-IDI_AWAY         ICON DISCARDABLE "res\\ICQ\\32_icq_Away.ico"
-IDI_INVISIBLE    ICON DISCARDABLE "res\\ICQ\\32_icq_Invisible.ico"
-IDI_NA	         ICON DISCARDABLE "res\\ICQ\\32_icq_Na.ico"
-IDI_DND          ICON DISCARDABLE "res\\ICQ\\32_icq_Dnd.ico"
-IDI_OCCUPIED     ICON DISCARDABLE "res\\ICQ\\32_icq_Occupied.ico"
-IDI_FREE4CHAT    ICON DISCARDABLE "res\\ICQ\\32_icq_FFC.ico"
-IDI_ONTHEPHONE   ICON DISCARDABLE "res\\ICQ\\32_icq_Phone.ico"
-#endif
-
-#ifdef ICO_ICQLO
-IDI_OFFLINE      ICON DISCARDABLE "res\\ICQ\\8_icq_Offline.ico"
-IDI_ONLINE       ICON DISCARDABLE "res\\ICQ\\8_icq_Online.ico"
-IDI_AWAY         ICON DISCARDABLE "res\\ICQ\\8_icq_Away.ico"
-IDI_INVISIBLE    ICON DISCARDABLE "res\\ICQ\\8_icq_Invisible.ico"
-IDI_NA	         ICON DISCARDABLE "res\\ICQ\\8_icq_Na.ico"
-IDI_DND          ICON DISCARDABLE "res\\ICQ\\8_icq_Dnd.ico"
-IDI_OCCUPIED     ICON DISCARDABLE "res\\ICQ\\8_icq_Occupied.ico"
-IDI_FREE4CHAT    ICON DISCARDABLE "res\\ICQ\\8_icq_FFC.ico"
-IDI_ONTHEPHONE   ICON DISCARDABLE "res\\ICQ\\8_icq_Phone.ico"
-#endif
-
-#ifdef ICO_IRCHI
-IDI_OFFLINE ICON DISCARDABLE "res\\IRC\\32_irc_Offline.ico"
-IDI_ONLINE  ICON DISCARDABLE "res\\IRC\\32_irc_Online.ico"
-IDI_AWAY    ICON DISCARDABLE "res\\IRC\\32_irc_Away.ico"
-#endif
-
-#ifdef ICO_IRCLO
-IDI_OFFLINE ICON DISCARDABLE "res\\IRC\\8_irc_Offline.ico"
-IDI_ONLINE  ICON DISCARDABLE "res\\IRC\\8_irc_Online.ico"
-IDI_AWAY    ICON DISCARDABLE "res\\IRC\\8_irc_Away.ico"
-#endif
-
-#ifdef ICO_JABBERHI
-IDI_OFFLINE      ICON DISCARDABLE "res\\JABBER\\32_jabber_Offline.ico"
-IDI_ONLINE       ICON DISCARDABLE "res\\JABBER\\32_jabber_Online.ico"
-IDI_AWAY         ICON DISCARDABLE "res\\JABBER\\32_jabber_Away.ico"
-IDI_INVISIBLE    ICON DISCARDABLE "res\\JABBER\\32_jabber_Invisible.ico"
-IDI_NA	         ICON DISCARDABLE "res\\JABBER\\32_jabber_NA.ico"
-IDI_DND          ICON DISCARDABLE "res\\JABBER\\32_jabber_DND.ico"
-IDI_FREE4CHAT    ICON DISCARDABLE "res\\JABBER\\32_jabber_FFC.ico"
-#endif
-
-#ifdef ICO_JABBERLO
-IDI_OFFLINE      ICON DISCARDABLE "res\\JABBER\\8_jabber_Offline.ico"
-IDI_ONLINE       ICON DISCARDABLE "res\\JABBER\\8_jabber_Online.ico"
-IDI_AWAY         ICON DISCARDABLE "res\\JABBER\\8_jabber_Away.ico"
-IDI_INVISIBLE    ICON DISCARDABLE "res\\JABBER\\8_jabber_Invisible.ico"
-IDI_NA	         ICON DISCARDABLE "res\\JABBER\\8_jabber_NA.ico"
-IDI_DND          ICON DISCARDABLE "res\\JABBER\\8_jabber_DND.ico"
-IDI_FREE4CHAT    ICON DISCARDABLE "res\\JABBER\\8_jabber_FFC.ico"
-#endif
-
-#ifdef ICO_MSNHI
-IDI_OFFLINE      ICON DISCARDABLE "res\\MSN\\32_msn_Offline.ico"
-IDI_ONLINE       ICON DISCARDABLE "res\\MSN\\32_msn_Online.ico"
-IDI_AWAY         ICON DISCARDABLE "res\\MSN\\32_msn_Away.ico"
-IDI_INVISIBLE    ICON DISCARDABLE "res\\MSN\\32_msn_Invisible.ico"
-IDI_NA	         ICON DISCARDABLE "res\\MSN\\32_msn_NA.ico"
-IDI_OCCUPIED     ICON DISCARDABLE "res\\MSN\\32_msn_Occupied.ico"
-IDI_OUTTOLUNCH   ICON DISCARDABLE "res\\MSN\\32_msn_Lunch.ico"
-IDI_ONTHEPHONE   ICON DISCARDABLE "res\\MSN\\32_msn_Phone.ico"
-#endif
-
-#ifdef ICO_MSNLO
-IDI_OFFLINE      ICON DISCARDABLE "res\\MSN\\8_msn_Offline.ico"
-IDI_ONLINE       ICON DISCARDABLE "res\\MSN\\8_msn_Online.ico"
-IDI_AWAY         ICON DISCARDABLE "res\\MSN\\8_msn_Away.ico"
-IDI_INVISIBLE    ICON DISCARDABLE "res\\MSN\\8_msn_Invisible.ico"
-IDI_NA	         ICON DISCARDABLE "res\\MSN\\8_msn_NA.ico"
-IDI_OCCUPIED     ICON DISCARDABLE "res\\MSN\\8_msn_Occupied.ico"
-IDI_OUTTOLUNCH   ICON DISCARDABLE "res\\MSN\\8_msn_Lunch.ico"
-IDI_ONTHEPHONE   ICON DISCARDABLE "res\\MSN\\8_msn_Phone.ico"
-#endif
-
-#ifdef ICO_YAHOOHI
-IDI_OFFLINE      ICON DISCARDABLE "res\\YAHOO\\32_yahoo_Offline.ico"
-IDI_ONLINE       ICON DISCARDABLE "res\\YAHOO\\32_yahoo_Online.ico"
-IDI_AWAY         ICON DISCARDABLE "res\\YAHOO\\32_yahoo_Away.ico"
-IDI_INVISIBLE    ICON DISCARDABLE "res\\YAHOO\\32_yahoo_Invisible.ico"
-IDI_NA	         ICON DISCARDABLE "res\\YAHOO\\32_yahoo_NA.ico"
-IDI_DND          ICON DISCARDABLE "res\\YAHOO\\32_yahoo_DND.ico"
-IDI_OCCUPIED     ICON DISCARDABLE "res\\YAHOO\\32_yahoo_Occupied.ico"
-IDI_OUTTOLUNCH   ICON DISCARDABLE "res\\YAHOO\\32_yahoo_Lunch.ico"
-IDI_ONTHEPHONE   ICON DISCARDABLE "res\\YAHOO\\32_yahoo_Phone.ico"
-#endif
-
-#ifdef ICO_YAHOOLO
-IDI_OFFLINE      ICON DISCARDABLE "res\\YAHOO\\8_yahoo_Offline.ico"
-IDI_ONLINE       ICON DISCARDABLE "res\\YAHOO\\8_yahoo_Online.ico"
-IDI_AWAY         ICON DISCARDABLE "res\\YAHOO\\8_yahoo_Away.ico"
-IDI_INVISIBLE    ICON DISCARDABLE "res\\YAHOO\\8_yahoo_Invisible.ico"
-IDI_NA	         ICON DISCARDABLE "res\\YAHOO\\8_yahoo_NA.ico"
-IDI_DND          ICON DISCARDABLE "res\\YAHOO\\8_yahoo_DND.ico"
-IDI_OCCUPIED     ICON DISCARDABLE "res\\YAHOO\\8_yahoo_Occupied.ico"
-IDI_OUTTOLUNCH   ICON DISCARDABLE "res\\YAHOO\\8_yahoo_Lunch.ico"
-IDI_ONTHEPHONE   ICON DISCARDABLE "res\\YAHOO\\8_yahoo_Phone.ico"
-#endif
diff --git a/miranda-tools/installer/miranda-core.nsi b/miranda-tools/installer/miranda-core.nsi
deleted file mode 100644
index 90ee6ce249..0000000000
--- a/miranda-tools/installer/miranda-core.nsi
+++ /dev/null
@@ -1,390 +0,0 @@
-!include "MUI.nsh"
-!include "Sections.nsh"
-!include "WinVer.nsh"
-!include "LogicLib.nsh"
-
-!include "miranda-version.nsi"
-
-!define MIM_NAME                "Miranda IM"
-
-!define MIM_BUILD_ICONS_LOW     "icons\bin\locolor"
-!define MIM_BUILD_ICONS_HI      "icons\bin\hicolor"
-!define MIM_BUILD_OPTIONS_FILE  "miranda32.lst"
-!define MIM_BUILD_OPTIONS_SECT  "InstalledSections"
-
-!ifdef MIM_BUILD_UNICODE
-!define MIM_BUILD_TYPE          "unicode"
-!define MIM_BUILD_DIR           "..\..\miranda\bin\Release Unicode"
-!else
-!define MIM_BUILD_TYPE          "ansi"
-!define MIM_BUILD_DIR           "..\..\miranda\bin\Release"
-!endif
-!define MIM_BUILD_DIRANSI       "..\..\miranda\bin\Release"
-!define MIM_BUILD_SRC           "..\..\miranda"
-
-
-!if  ${MIM_BETA} != 0
-Name                            "${MIM_NAME} ${MIM_VERSION} Beta ${MIM_BETA}"
-!if ${MIM_BUILD_TYPE} = "unicode"
-OutFile                         "..\..\miranda\bin\miranda-im-v${MIM_VERSION}b${MIM_BETA}w.exe"
-!else
-OutFile                         "..\..\miranda\bin\miranda-im-v${MIM_VERSION}b${MIM_BETA}.exe"
-!endif
-!else
-Name                            "${MIM_NAME} ${MIM_VERSION}"
-OutFile                         "..\..\miranda\bin\miranda-im-v${MIM_VERSION}-${MIM_BUILD_TYPE}.exe"
-!endif
-
-InstallDir                      "$PROGRAMFILES\Miranda IM"
-InstallDirRegKey                HKLM "Software\Microsoft\Windows\CurrentVersion\App Paths\miranda32.exe" "Path"
-SetCompressor                   lzma
-SetOverWrite                    on
-BrandingText                    "www.miranda-im.org"
-
-VAR INST_UPGRADE
-VAR INST_SUCCESS
-VAR INST_MODE
-VAR INST_DIR
-
-!define MUI_HEADERIMAGE
-!define MUI_HEADERIMAGE_BITMAP "Graphics\header.bmp"
-!define MUI_HEADERIMAGE_UNBITMAP "Graphics\header.bmp"
-!define MUI_WELCOMEFINISHPAGE_BITMAP "Graphics\welcome.bmp"
-!define MUI_UNWELCOMEFINISHPAGE_BITMAP "Graphics\welcome.bmp"
-!define MUI_ICON "Graphics\install.ico"
-!define MUI_UNICON "Graphics\uninstall.ico"
-!define MUI_ABORTWARNING
-!define MUI_COMPONENTSPAGE_NODESC
-!define MUI_LICENSEPAGE_BGCOLOR /grey
-!define MUI_FINISHPAGE_RUN $INSTDIR\miranda32.exe
-!define MUI_FINISHPAGE_RUN_TEXT "Start Miranda IM"
-!define MUI_FINISHPAGE_SHOWREADME $INSTDIR\readme.txt
-!define MUI_FINISHPAGE_SHOWREADME_TEXT "View Readme"
-!define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
-!define MUI_FINISHPAGE_LINK "Support Miranda IM"
-!define MUI_FINISHPAGE_LINK_LOCATION "http://www.miranda-im.org/donate/"
-
-!insertmacro MUI_PAGE_LICENSE "${MIM_BUILD_SRC}\docs\license.txt"
-Page Custom CustomInstallPage CustomInstallPageLeave
-!define MUI_DIRECTORYPAGE_VARIABLE $INST_DIR
-!define MUI_PAGE_CUSTOMFUNCTION_LEAVE VerifyInstallDir
-!define MUI_PAGE_CUSTOMFUNCTION_PRE VerifyDirectoryDisplay
-!insertmacro MUI_PAGE_DIRECTORY
-!define MUI_PAGE_CUSTOMFUNCTION_PRE VerifyComponentDisplay
-!insertmacro MUI_PAGE_COMPONENTS
-!insertmacro MUI_PAGE_INSTFILES
-!insertmacro MUI_PAGE_FINISH
-
-!insertmacro MUI_UNPAGE_CONFIRM
-!insertmacro MUI_UNPAGE_INSTFILES
-
-!insertmacro MUI_LANGUAGE "English"
-
-!macro PrintInstallerDetails Details
-  SetDetailsPrint textonly
-  DetailPrint "${Details}"
-  SetDetailsPrint listonly
-!macroend
-
-!macro InstallMirandaProtoIcon IconFile
-  SetOutPath "$INSTDIR\Icons"
-  SetOverWrite off
-  !ifdef MIM_BUILD_UNICODE
-  ${If} ${AtLeastWinXP}
-    File "${MIM_BUILD_ICONS_HI}\proto_${IconFile}.dll"
-  ${Else}
-    File "${MIM_BUILD_ICONS_LOW}\proto_${IconFile}.dll"
-  ${EndIf}
-  !else
-  File "${MIM_BUILD_ICONS_LOW}\proto_${IconFile}.dll"
-  !endif
-  SetOverWrite on
-!macroend
-
-!macro InstallMirandaPlugin PluginFile
-  SetOutPath "$INSTDIR\Plugins"
-  File "${MIM_BUILD_DIR}\plugins\${PluginFile}"
-!macroend
-
-!macro InstallMirandaPluginANSI PluginFile
-  SetOutPath "$INSTDIR\Plugins"
-  File "${MIM_BUILD_DIRANSI}\plugins\${PluginFile}"
-!macroend
-
-!macro WriteInstallerOption IniOption IniValue
-  ${If} $INST_MODE = 0
-    SetOutPath "$INSTDIR"
-    WriteINIStr "$INSTDIR\${MIM_BUILD_OPTIONS_FILE}" "${MIM_BUILD_OPTIONS_SECT}" "${IniValue}" "${IniOption}"
-  ${EndIf}
-!macroend
-
-Section "Miranda IM (core)"
-  SectionIn RO
-  !insertmacro PrintInstallerDetails "Installing Miranda IM Core Files..."
-  
-  !insertmacro WriteInstallerOption "0" "Import"
-  !insertmacro WriteInstallerOption "0" "StartMenuShortCut"
-  !insertmacro WriteInstallerOption "0" "DesktopShortCut"
-  !insertmacro WriteInstallerOption "0" "QuickLaunchShortCut"
-
-  SetOutPath "$INSTDIR"
-  File "${MIM_BUILD_DIR}\miranda32.exe"
-  File "${MIM_BUILD_DIR}\dbtool.exe"
-  File "${MIM_BUILD_DIR}\zlib.dll"
-  File "${MIM_BUILD_SRC}\docs\contributors.txt"
-  File "${MIM_BUILD_SRC}\docs\readme.txt"
-  File "${MIM_BUILD_SRC}\docs\changelog.txt"
-  File "${MIM_BUILD_SRC}\docs\license.txt"
-  
-  ${If} $INST_UPGRADE = 0
-    SetOverWrite off
-    File "${MIM_BUILD_SRC}\docs\mirandaboot.ini"
-    SetOverWrite on
-  ${EndIf}
-  ${If} ${FileExists} "$INSTDIR\mirandaboot.ini"
-    ${If} $INST_UPGRADE = 0
-      ${If} $INST_MODE = 0
-	    !ifdef MIM_BUILD_UNICODE
-          WriteINIStr "$INSTDIR\mirandaboot.ini" "Database" "ProfileDir" "%APPDATA%\Miranda"
-		!endif
-  	  ${ElseIf} $INST_MODE = 1
-  	    CreateDirectory "$INSTDIR\Profiles"
-	    WriteINIStr "$INSTDIR\mirandaboot.ini" "Database" "ProfileDir" "Profiles"
-	  ${EndIf}
-    ${EndIf}
-  ${EndIf}
-  
-  !insertmacro InstallMirandaPlugin "clist_classic.dll"
-  !insertmacro InstallMirandaPlugin "srmm.dll"
-  !insertmacro InstallMirandaPlugin "avs.dll"
-  !insertmacro InstallMirandaPluginANSI "advaimg.dll"
-  !ifdef MIM_BUILD_UNICODE
-  !insertmacro InstallMirandaPlugin "dbx_mmap.dll"
-  Delete "$INSTDIR\Plugins\dbx_3x.dll"
-  !else
-  !insertmacro InstallMirandaPluginANSI "dbx_3x.dll"
-  Delete "$INSTDIR\Plugins\dbx_mmap.dll"
-  !endif
-  !insertmacro InstallMirandaPlugin "chat.dll"
-  
-  ${If} $INST_MODE = 0
-   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Miranda IM" "DisplayName" "Miranda IM ${MIM_VERSION}" 
-   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Miranda IM" "UninstallString" "$INSTDIR\Uninstall.exe"
-   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\App Paths\miranda32.exe" "" "$INSTDIR\miranda32.exe"
-   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\App Paths\miranda32.exe" "Path" "$INSTDIR"
-  ${EndIf}
-  
-  ; AIM
-  !insertmacro PrintInstallerDetails "Installing AIM Protocol..."
-  !insertmacro InstallMirandaPlugin "Aim.dll"
-  !insertmacro InstallMirandaProtoIcon "AIM"
-  
-  ; Gadu-Gadu
-  !insertmacro PrintInstallerDetails "Installing Gadu-Gadu Protocol..."
-  !insertmacro InstallMirandaPluginANSI "GG.dll"
-  !insertmacro InstallMirandaProtoIcon "GG"
-  
-  ; ICQ 
-  !insertmacro PrintInstallerDetails "Installing ICQ Protocol..."
-  !insertmacro InstallMirandaPlugin "icq.dll"
-  SetOutPath "$INSTDIR\Icons"
-  File "${MIM_BUILD_DIRANSI}\Icons\xstatus_ICQ.dll"
-  !insertmacro InstallMirandaProtoIcon "ICQ"
-
-  ; IRC
-  !insertmacro PrintInstallerDetails "Installing IRC Protocol..."
-  !insertmacro InstallMirandaPlugin "irc.dll"
-  ${If} $INST_UPGRADE = 0
-    SetOverWrite off
-    File "${MIM_BUILD_SRC}\protocols\IRCG\Docs\irc_servers.ini"
-    SetOverWrite on
-  ${EndIf}
-  !insertmacro InstallMirandaProtoIcon "IRC"
-
-  ; Jabber
-  !insertmacro PrintInstallerDetails "Installing Jabber Protocol..."
-  !insertmacro InstallMirandaPlugin "jabber.dll"
-  SetOutPath "$INSTDIR\Icons"
-  File "${MIM_BUILD_DIRANSI}\Icons\xstatus_jabber.dll"
-  !insertmacro InstallMirandaProtoIcon "Jabber"
-
-  ; MSN
-  !insertmacro PrintInstallerDetails "Installing MSN Protocol..."
-  !insertmacro InstallMirandaPlugin "msn.dll"
-  !insertmacro InstallMirandaProtoIcon "MSN"
-
-  ; Yahoo
-  !insertmacro PrintInstallerDetails "Installing Yahoo Protocol..."
-  !insertmacro InstallMirandaPlugin "yahoo.dll"
-  !insertmacro InstallMirandaProtoIcon "Yahoo"
-  
-  ; Import (installs automatically on new installs and if the file exists)
-  ${If} ${FileExists} "$INSTDIR\plugins\import.dll"
-    !insertmacro InstallMirandaPlugin "import.dll"
-  ${ElseIf} $INST_UPGRADE = 0
-    !insertmacro InstallMirandaPlugin "import.dll"
-  ${EndIf}
-  
-  ${If} $INST_MODE = 0
-    WriteUninstaller "$INSTDIR\Uninstall.exe"
-  ${EndIf}
-SectionEnd
-
-SubSection /e "Options" pOptions
-  Section "Install Start Menu Shortcuts" pSCStartMenu
-    !insertmacro PrintInstallerDetails "Installing Start Menu Shortcuts..."
-    !insertmacro WriteInstallerOption "1" "StartMenuShortCut"
-    SetOutPath "$INSTDIR"
-    RMDir /r "$SMPROGRAMS\Miranda IM"
-    CreateDirectory "$SMPROGRAMS\Miranda IM"
-    CreateShortCut  "$SMPROGRAMS\Miranda IM\Miranda IM.lnk" "$INSTDIR\miranda32.exe"
-    CreateShortCut  "$SMPROGRAMS\Miranda IM\Database Tool.lnk" "$INSTDIR\dbtool.exe"
-    WriteINIStr     "$SMPROGRAMS\Miranda IM\Homepage.url" "InternetShortcut" "URL" "http://www.miranda-im.org/"
-    WriteINIStr     "$SMPROGRAMS\Miranda IM\Get More Addons.url" "InternetShortcut" "URL" "http://addons.miranda-im.org/"
-  SectionEnd
-
-  Section "Install Desktop Shortcut" pSCDesktop
-    !insertmacro PrintInstallerDetails "Installing Desktop Shortcut..."
-    !insertmacro WriteInstallerOption "1" "DesktopShortCut"
-    SetOutPath "$INSTDIR"
-    CreateShortCut  "$DESKTOP\Miranda IM.lnk" "$INSTDIR\miranda32.exe"
-  SectionEnd
-
-  Section "Install Quicklaunch Shortcut" pSCQuickLaunch
-    !insertmacro PrintInstallerDetails "Installing Quicklaunch Shortcut..."
-    !insertmacro WriteInstallerOption "1" "QuickLaunchShortCut"
-    SetOutPath "$INSTDIR"
-    CreateShortCut  "$QUICKLAUNCH\Miranda IM.lnk" "$INSTDIR\miranda32.exe"
-  SectionEnd
-SubSectionEnd
-
-Section Uninstall
-  SetShellVarContext "all"
-  RMDir /r "$SMPROGRAMS\Miranda IM"
-  Delete "$DESKTOP\Miranda IM.lnk"
-  Delete "$QUICKLAUNCH\Miranda IM.lnk"
-  SetShellVarContext "current"
-  RMDir /r "$SMPROGRAMS\Miranda IM"
-  Delete "$DESKTOP\Miranda IM.lnk"
-  Delete "$QUICKLAUNCH\Miranda IM.lnk"
-
-  RMDir /r "$INSTDIR\Icons"
-  RMDir /r "$INSTDIR\Plugins"
-  Delete "$INSTDIR\dbtool.exe"
-  Delete "$INSTDIR\miranda32.exe"
-  Delete "$INSTDIR\zlib.dll"
-  Delete "$INSTDIR\mirandaboot.ini"
-  Delete "$INSTDIR\license.txt"
-  Delete "$INSTDIR\contributors.txt"
-  Delete "$INSTDIR\readme.txt"
-  Delete "$INSTDIR\changelog.txt"
-  Delete "$INSTDIR\${MIM_BUILD_OPTIONS_FILE}"
-  Delete "$INSTDIR\uninstall.exe"
-  RMDir "$INSTDIR"
-
-  DeleteRegKey HKLM "SOFTWARE\Miranda"
-  DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Miranda IM"
-  DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\App Paths\miranda32.exe"
-SectionEnd
-
-Function .onInit
-  SetShellVarContext "current"
-  FindWindow $R0 "Miranda"
-  IsWindow $R0 showwarn
-  FindWindow $R0 "Miranda IM"
-  IsWindow $R0 0 norun
-  showwarn:
-  MessageBox MB_OK "Miranda IM is currently running.  It is recommended that you close Miranda IM so the installation can complete successfully."
-  Sleep 1000
-  norun:
-  StrCpy $INST_SUCCESS 0
-  StrCpy $INST_MODE 0
-FunctionEnd
-
-Function .onInstSuccess
-  StrCpy $INST_SUCCESS 1
-FunctionEnd
-
-Function VerifyInstallDir
-  StrCpy $INSTDIR $INST_DIR
-  ${If} ${FileExists} "$INSTDIR\miranda32.exe"
-    StrCpy $INST_UPGRADE 1
-  ${Else}
-    StrCpy $INST_UPGRADE 0
-  ${EndIf}
-  ${If} $INST_MODE = 1
-    !insertmacro ClearSectionFlag ${pSCStartMenu} ${SF_SELECTED}
-    SectionSetText ${pSCStartMenu} ""
-	!insertmacro ClearSectionFlag ${pSCDesktop} ${SF_SELECTED}
-    SectionSetText ${pSCDesktop} ""
-	!insertmacro ClearSectionFlag ${pSCQuickLaunch} ${SF_SELECTED}
-    SectionSetText ${pSCQuickLaunch} ""
-	!insertmacro ClearSectionFlag ${pOptions} ${SF_SELECTED}
-    SectionSetText ${pOptions} ""
-  ${Else}
-    ReadINIStr $0 "$INSTDIR\${MIM_BUILD_OPTIONS_FILE}" ${MIM_BUILD_OPTIONS_SECT} "StartMenuShortCut"
-    ${If} $0 == "0"
-      !insertmacro ClearSectionFlag ${pSCStartMenu} ${SF_SELECTED}
-    ${Else}
-      !insertmacro SetSectionFlag ${pSCStartMenu} ${SF_SELECTED}
-    ${EndIf}
-    ReadINIStr $0 "$INSTDIR\${MIM_BUILD_OPTIONS_FILE}" ${MIM_BUILD_OPTIONS_SECT} "DesktopShortCut"
-    ${If} $0 == "0"
-      !insertmacro ClearSectionFlag ${pSCDesktop} ${SF_SELECTED}
-    ${Else}
-      !insertmacro SetSectionFlag ${pSCDesktop} ${SF_SELECTED}
-    ${EndIf}
-    ReadINIStr $0 "$INSTDIR\${MIM_BUILD_OPTIONS_FILE}" ${MIM_BUILD_OPTIONS_SECT} "QuickLaunchShortCut"
-    ${If} $0 == "0"
-      !insertmacro ClearSectionFlag ${pSCQuickLaunch} ${SF_SELECTED}
-    ${Else}
-      !insertmacro SetSectionFlag ${pSCQuickLaunch} ${SF_SELECTED}
-    ${EndIf}
-    ${If} ${AtLeastWin7}
-      !insertmacro ClearSectionFlag ${pSCQuickLaunch} ${SF_SELECTED}
-      SectionSetText ${pSCQuickLaunch} ""
-    ${EndIf}
-  ${Endif}
-FunctionEnd
-
-Function VerifyDirectoryDisplay
-  ${If} $INST_MODE = 1
-    GetDlgItem $1 $HWNDPARENT 1
-    SendMessage $1 ${WM_SETTEXT} 0 "STR:$(^InstallBtn)"
-  ${EndIf}
-FunctionEnd
-
-Function CustomInstallPage
-  !insertmacro MUI_HEADER_TEXT "Installation Mode" "Select the type of installation to perform."
-  ReserveFile "miranda-ui-type.ini"
-  !insertmacro MUI_INSTALLOPTIONS_EXTRACT "miranda-ui-type.ini"
-  ${If} $INST_MODE = 0
-    !insertmacro MUI_INSTALLOPTIONS_WRITE "miranda-ui-type.ini" "Field 2" "State" "1"
-    !insertmacro MUI_INSTALLOPTIONS_WRITE "miranda-ui-type.ini" "Field 3" "State" "0"
-  ${Else}
-    !insertmacro MUI_INSTALLOPTIONS_WRITE "miranda-ui-type.ini" "Field 2" "State" "0"
-    !insertmacro MUI_INSTALLOPTIONS_WRITE "miranda-ui-type.ini" "Field 3" "State" "1"
-  ${EndIf}
-  !insertmacro MUI_INSTALLOPTIONS_DISPLAY "miranda-ui-type.ini"
-FunctionEnd
-
-Function CustomInstallPageLeave
-  !insertmacro MUI_INSTALLOPTIONS_READ $INST_MODE "miranda-ui-type.ini" "Field 3" "State"
-  ${If} $INST_MODE = 1
-	StrCpy $R0 $WINDIR 2
-	StrCpy $INST_DIR "$R0\Miranda IM"
-  ${Else}
-	ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\App Paths\miranda32.exe" "Path"
-	${If} $0 == ""
-      StrCpy $INST_DIR "$PROGRAMFILES\Miranda IM"
-	${Else}
-	  StrCpy $INST_DIR $0
-	${EndIf}
-  ${EndIf}
-FunctionEnd
-
-Function VerifyComponentDisplay
-  ${If} $INST_MODE = 1
-    Abort
-  ${EndIf}
-FunctionEnd
-\ No newline at end of file
diff --git a/miranda-tools/installer/miranda-install-ansi.nsi b/miranda-tools/installer/miranda-install-ansi.nsi
deleted file mode 100644
index 61da1563b2..0000000000
--- a/miranda-tools/installer/miranda-install-ansi.nsi
+++ /dev/null
@@ -1 +0,0 @@
-!include "miranda-core.nsi"
diff --git a/miranda-tools/installer/miranda-install-unicode.nsi b/miranda-tools/installer/miranda-install-unicode.nsi
deleted file mode 100644
index cf99e8f071..0000000000
--- a/miranda-tools/installer/miranda-install-unicode.nsi
+++ /dev/null
@@ -1,2 +0,0 @@
-!define MIM_BUILD_UNICODE
-!include "miranda-core.nsi"
diff --git a/miranda-tools/installer/miranda-ui-type.ini b/miranda-tools/installer/miranda-ui-type.ini
deleted file mode 100644
index 86707ea0f6..0000000000
--- a/miranda-tools/installer/miranda-ui-type.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-[Settings]
-NumFields=3
-
-[Field 1]
-Type=Label
-Text=Please select the type of installation you wish to peform.  Most users should choose "Normal Installation".  However, if you need to install Miranda IM to be portable, please select that option. 
-Left=10
-Top=3
-Right=288
-Bottom=35
-
-[Field 2]
-Type=RadioButton
-Text=Normal Installation (recommended)
-State=1
-Left=25
-Right=180
-Top=47
-Bottom=56
-
-[Field 3]
-Type=RadioButton
-Text=Portable Installation
-State=0
-Left=25
-Right=140
-Top=65
-Bottom=74
-\ No newline at end of file
diff --git a/miranda-tools/installer/miranda-version.nsi b/miranda-tools/installer/miranda-version.nsi
deleted file mode 100644
index 97dc0dd71c..0000000000
--- a/miranda-tools/installer/miranda-version.nsi
+++ /dev/null
@@ -1,4 +0,0 @@
-; Miranda Version Info
-
-!define MIM_VERSION             "0.9.1"
-!define MIM_BETA                "0" ; 0 for final build