diff --git a/dlls/user/resources/user32.rc b/dlls/user/resources/user32.rc
index 90bbcd02d82c16fd3ce2b612636f0cadf52c2933..d50e0ed1c9e02e9c63579d4fba50d4ab0e613457 100644
--- a/dlls/user/resources/user32.rc
+++ b/dlls/user/resources/user32.rc
@@ -17,6 +17,7 @@
  * neutral language. This will prevent them from
  * being duplicated for each language.
  */
+#include "resources/user32_bitmaps.rc"
 #include "resources/user32_cursors.rc"
 #include "resources/user32_icons.rc"
 
diff --git a/dlls/user/resources/user32_bitmaps.rc b/dlls/user/resources/user32_bitmaps.rc
new file mode 100644
index 0000000000000000000000000000000000000000..60f71725e9d0f5fec72acaf6a4e164af77fa28bf
--- /dev/null
+++ b/dlls/user/resources/user32_bitmaps.rc
@@ -0,0 +1,553 @@
+/*
+ * USER bitmaps
+ */
+
+/* BINRES obm_trtype.bmp */
+OBM_TRTYPE BITMAP
+{
+ '42 4D E6 00 00 00 00 00 00 00 76 00 00 00 28 00'
+ '00 00 0E 00 00 00 0E 00 00 00 01 00 04 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 80 80 80 00 FF FF'
+ 'FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 22 22 22 22 22 22 22 00 22 22'
+ '22 00 00 00 22 00 22 22 22 22 00 22 22 00 22 22'
+ '22 22 00 22 22 00 21 11 11 11 00 22 22 00 22 22'
+ '11 22 00 22 22 00 22 22 10 22 00 22 02 00 22 22'
+ '10 22 00 22 02 00 22 22 10 02 00 20 02 00 21 22'
+ '10 00 00 00 02 00 21 22 11 22 12 22 22 00 21 12'
+ '11 21 12 22 22 00 21 11 11 11 12 22 22 00 22 22'
+ '22 22 22 22 22 00'
+}
+
+/* BINRES obm_lfarrowi.bmp */
+OBM_LFARROWI BITMAP
+{
+ '42 4D 42 01 00 00 00 00 00 00 76 00 00 00 28 00'
+ '00 00 11 00 00 00 11 00 00 00 01 00 04 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 BF BF BF 00 7F 7F'
+ '7F 00 FF FF FF 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 02 22 22 22 22 22 22 22 00 00 00 00 03 22'
+ '22 22 22 22 22 22 00 00 00 00 03 11 11 11 11 11'
+ '11 22 00 00 00 00 03 11 11 11 13 11 11 22 00 00'
+ '00 00 03 11 11 11 23 11 11 22 00 00 00 00 03 11'
+ '11 12 21 33 31 22 00 00 00 00 03 11 11 22 22 22'
+ '31 22 00 00 00 00 03 11 12 22 22 22 31 22 00 00'
+ '00 00 03 11 11 22 22 22 11 22 00 00 00 00 03 11'
+ '11 12 23 11 11 22 00 00 00 00 03 11 11 11 23 11'
+ '11 22 00 00 00 00 03 11 11 11 11 11 11 22 00 00'
+ '00 00 03 11 11 11 11 11 11 22 00 00 00 00 03 11'
+ '11 11 11 11 11 22 00 00 00 00 03 33 33 33 33 33'
+ '33 32 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00'
+}
+
+/* BINRES obm_rgarrowi.bmp */
+OBM_RGARROWI BITMAP
+{
+ '42 4D 42 01 00 00 00 00 00 00 76 00 00 00 28 00'
+ '00 00 11 00 00 00 11 00 00 00 01 00 04 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 BF BF BF 00 7F 7F'
+ '7F 00 FF FF FF 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 02 22 22 22 22 22 22 22 00 00 00 00 03 22'
+ '22 22 22 22 22 22 00 00 00 00 03 11 11 11 11 11'
+ '11 22 00 00 00 00 03 11 11 11 13 11 11 22 00 00'
+ '00 00 03 11 11 11 23 31 11 22 00 00 00 00 03 11'
+ '11 33 22 33 11 22 00 00 00 00 03 11 12 22 22 23'
+ '31 22 00 00 00 00 03 11 12 22 22 22 11 22 00 00'
+ '00 00 03 11 12 22 22 21 11 22 00 00 00 00 03 11'
+ '11 11 22 11 11 22 00 00 00 00 03 11 11 11 21 11'
+ '11 22 00 00 00 00 03 11 11 11 11 11 11 22 00 00'
+ '00 00 03 11 11 11 11 11 11 22 00 00 00 00 03 11'
+ '11 11 11 11 11 22 00 00 00 00 03 33 33 33 33 33'
+ '33 32 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00'
+}
+
+/* BINRES obm_dnarrowi.bmp */
+OBM_DNARROWI BITMAP
+{
+ '42 4D 42 01 00 00 00 00 00 00 76 00 00 00 28 00'
+ '00 00 11 00 00 00 11 00 00 00 01 00 04 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 BF BF BF 00 7F 7F'
+ '7F 00 FF FF FF 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 02 22 22 22 22 22 22 22 00 00 00 00 03 22'
+ '22 22 22 22 22 22 00 00 00 00 03 11 11 11 11 11'
+ '11 22 00 00 00 00 03 11 11 11 13 11 11 22 00 00'
+ '00 00 03 11 11 11 23 31 11 22 00 00 00 00 03 11'
+ '11 12 22 33 11 22 00 00 00 00 03 11 11 22 22 23'
+ '31 22 00 00 00 00 03 11 12 22 22 22 11 22 00 00'
+ '00 00 03 11 11 12 22 31 11 22 00 00 00 00 03 11'
+ '11 12 22 31 11 22 00 00 00 00 03 11 11 12 22 11'
+ '11 22 00 00 00 00 03 11 11 11 11 11 11 22 00 00'
+ '00 00 03 11 11 11 11 11 11 22 00 00 00 00 03 11'
+ '11 11 11 11 11 22 00 00 00 00 03 33 33 33 33 33'
+ '33 32 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00'
+}
+
+/* BINRES obm_uparrowi.bmp */
+OBM_UPARROWI BITMAP
+{
+ '42 4D 42 01 00 00 00 00 00 00 76 00 00 00 28 00'
+ '00 00 11 00 00 00 11 00 00 00 01 00 04 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 BF BF BF 00 7F 7F'
+ '7F 00 FF FF FF 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 02 22 22 22 22 22 22 22 00 00 00 00 03 22'
+ '22 22 22 22 22 22 00 00 00 00 03 11 11 11 11 11'
+ '11 22 00 00 00 00 03 11 11 11 33 31 11 22 00 00'
+ '00 00 03 11 11 12 22 31 11 22 00 00 00 00 03 11'
+ '11 12 22 31 11 22 00 00 00 00 03 11 13 32 22 13'
+ '31 22 00 00 00 00 03 11 12 22 22 22 11 22 00 00'
+ '00 00 03 11 11 22 22 21 11 22 00 00 00 00 03 11'
+ '11 12 22 11 11 22 00 00 00 00 03 11 11 11 21 11'
+ '11 22 00 00 00 00 03 11 11 11 11 11 11 22 00 00'
+ '00 00 03 11 11 11 11 11 11 22 00 00 00 00 03 11'
+ '11 11 11 11 11 22 00 00 00 00 03 33 33 33 33 33'
+ '33 32 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00'
+}
+
+/* BINRES obm_combo.bmp */
+OBM_COMBO BITMAP
+{
+ '42 4D 62 00 00 00 00 00 00 00 3E 00 00 00 28 00'
+ '00 00 07 00 00 00 09 00 00 00 01 00 01 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 FF FF FF 00 00 00'
+ '00 00 FE 00 00 00 EE 00 00 00 C6 00 00 00 82 00'
+ '00 00 00 00 00 00 C6 00 00 00 C6 00 00 00 C6 00'
+ '00 00'
+}
+
+/* BINRES obm_mnarrow.bmp */
+OBM_MNARROW BITMAP
+{
+ '42 4D 6A 00 00 00 00 00 00 00 3E 00 00 00 28 00'
+ '00 00 07 00 00 00 0B 00 00 00 01 00 01 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 FF FF FF 00 FE 00'
+ '00 00 BE 00 00 00 9E 00 00 00 8E 00 00 00 86 00'
+ '00 00 82 00 00 00 86 00 00 00 8E 00 00 00 9E 00'
+ '00 00 BE 00 00 00 FE 00 00 00'
+}
+
+/* BINRES obm_lfarrowd.bmp */
+OBM_LFARROWD BITMAP
+{
+ '42 4D 42 01 00 00 00 00 00 00 76 00 00 00 28 00'
+ '00 00 11 00 00 00 11 00 00 00 01 00 04 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 BF BF BF 00 7F 7F'
+ '7F 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 02 11 11 11 11 11 11 11 00 00 00 00 02 11'
+ '11 11 11 11 11 11 00 00 00 00 02 11 11 11 11 11'
+ '11 11 00 00 00 00 02 11 11 11 10 11 11 11 00 00'
+ '00 00 02 11 11 11 00 11 11 11 00 00 00 00 02 11'
+ '11 10 00 00 01 11 00 00 00 00 02 11 11 00 00 00'
+ '01 11 00 00 00 00 02 11 11 10 00 00 01 11 00 00'
+ '00 00 02 11 11 11 00 11 11 11 00 00 00 00 02 11'
+ '11 11 10 11 11 11 00 00 00 00 02 11 11 11 11 11'
+ '11 11 00 00 00 00 02 11 11 11 11 11 11 11 00 00'
+ '00 00 02 11 11 11 11 11 11 11 00 00 00 00 02 11'
+ '11 11 11 11 11 11 00 00 00 00 02 22 22 22 22 22'
+ '22 22 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00'
+}
+
+/* BINRES obm_rgarrowd.bmp */
+OBM_RGARROWD BITMAP
+{
+ '42 4D 42 01 00 00 00 00 00 00 76 00 00 00 28 00'
+ '00 00 11 00 00 00 11 00 00 00 01 00 04 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 BF BF BF 00 7F 7F'
+ '7F 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 02 11 11 11 11 11 11 11 00 00 00 00 02 11'
+ '11 11 11 11 11 11 00 00 00 00 02 11 11 11 11 11'
+ '11 11 00 00 00 00 02 11 11 11 10 11 11 11 00 00'
+ '00 00 02 11 11 11 10 01 11 11 00 00 00 00 02 11'
+ '11 00 00 00 11 11 00 00 00 00 02 11 11 00 00 00'
+ '01 11 00 00 00 00 02 11 11 00 00 00 11 11 00 00'
+ '00 00 02 11 11 11 10 01 11 11 00 00 00 00 02 11'
+ '11 11 10 11 11 11 00 00 00 00 02 11 11 11 11 11'
+ '11 11 00 00 00 00 02 11 11 11 11 11 11 11 00 00'
+ '00 00 02 11 11 11 11 11 11 11 00 00 00 00 02 11'
+ '11 11 11 11 11 11 00 00 00 00 02 22 22 22 22 22'
+ '22 22 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00'
+}
+
+/* BINRES obm_dnarrowd.bmp */
+OBM_DNARROWD BITMAP
+{
+ '42 4D 42 01 00 00 00 00 00 00 76 00 00 00 28 00'
+ '00 00 11 00 00 00 11 00 00 00 01 00 04 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 BF BF BF 00 7F 7F'
+ '7F 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 02 11 11 11 11 11 11 11 00 00 00 00 02 11'
+ '11 11 11 11 11 11 00 00 00 00 02 11 11 11 11 11'
+ '11 11 00 00 00 00 02 11 11 11 10 11 11 11 00 00'
+ '00 00 02 11 11 11 00 01 11 11 00 00 00 00 02 11'
+ '11 10 00 00 11 11 00 00 00 00 02 11 11 00 00 00'
+ '01 11 00 00 00 00 02 11 11 11 00 01 11 11 00 00'
+ '00 00 02 11 11 11 00 01 11 11 00 00 00 00 02 11'
+ '11 11 00 01 11 11 00 00 00 00 02 11 11 11 11 11'
+ '11 11 00 00 00 00 02 11 11 11 11 11 11 11 00 00'
+ '00 00 02 11 11 11 11 11 11 11 00 00 00 00 02 11'
+ '11 11 11 11 11 11 00 00 00 00 02 22 22 22 22 22'
+ '22 22 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00'
+}
+
+/* BINRES obm_uparrowd.bmp */
+OBM_UPARROWD BITMAP
+{
+ '42 4D 42 01 00 00 00 00 00 00 76 00 00 00 28 00'
+ '00 00 11 00 00 00 11 00 00 00 01 00 04 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 BF BF BF 00 7F 7F'
+ '7F 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 02 11 11 11 11 11 11 11 00 00 00 00 02 11'
+ '11 11 11 11 11 11 00 00 00 00 02 11 11 11 11 11'
+ '11 11 00 00 00 00 02 11 11 11 00 01 11 11 00 00'
+ '00 00 02 11 11 11 00 01 11 11 00 00 00 00 02 11'
+ '11 11 00 01 11 11 00 00 00 00 02 11 11 00 00 00'
+ '01 11 00 00 00 00 02 11 11 10 00 00 11 11 00 00'
+ '00 00 02 11 11 11 00 01 11 11 00 00 00 00 02 11'
+ '11 11 10 11 11 11 00 00 00 00 02 11 11 11 11 11'
+ '11 11 00 00 00 00 02 11 11 11 11 11 11 11 00 00'
+ '00 00 02 11 11 11 11 11 11 11 00 00 00 00 02 11'
+ '11 11 11 11 11 11 00 00 00 00 02 22 22 22 22 22'
+ '22 22 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00'
+}
+
+/* BINRES obm_lfarrow.bmp */
+OBM_LFARROW BITMAP
+{
+ '42 4D 42 01 00 00 00 00 00 00 76 00 00 00 28 00'
+ '00 00 11 00 00 00 11 00 00 00 01 00 04 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 BF BF BF 00 7F 7F'
+ '7F 00 FF FF FF 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 02 22 22 22 22 22 22 22 00 00 00 00 03 22'
+ '22 22 22 22 22 22 00 00 00 00 03 11 11 11 11 11'
+ '11 22 00 00 00 00 03 11 11 11 11 11 11 22 00 00'
+ '00 00 03 11 11 11 01 11 11 22 00 00 00 00 03 11'
+ '11 10 01 11 11 22 00 00 00 00 03 11 11 00 00 00'
+ '11 22 00 00 00 00 03 11 10 00 00 00 11 22 00 00'
+ '00 00 03 11 11 00 00 00 11 22 00 00 00 00 03 11'
+ '11 10 01 11 11 22 00 00 00 00 03 11 11 11 01 11'
+ '11 22 00 00 00 00 03 11 11 11 11 11 11 22 00 00'
+ '00 00 03 11 11 11 11 11 11 22 00 00 00 00 03 11'
+ '11 11 11 11 11 22 00 00 00 00 03 33 33 33 33 33'
+ '33 32 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00'
+}
+
+/* BINRES obm_rgarrow.bmp */
+OBM_RGARROW BITMAP
+{
+ '42 4D 42 01 00 00 00 00 00 00 76 00 00 00 28 00'
+ '00 00 11 00 00 00 11 00 00 00 01 00 04 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 BF BF BF 00 7F 7F'
+ '7F 00 FF FF FF 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 02 22 22 22 22 22 22 22 00 00 00 00 03 22'
+ '22 22 22 22 22 22 00 00 00 00 03 11 11 11 11 11'
+ '11 22 00 00 00 00 03 11 11 11 11 11 11 22 00 00'
+ '00 00 03 11 11 11 01 11 11 22 00 00 00 00 03 11'
+ '11 11 00 11 11 22 00 00 00 00 03 11 10 00 00 01'
+ '11 22 00 00 00 00 03 11 10 00 00 00 11 22 00 00'
+ '00 00 03 11 10 00 00 01 11 22 00 00 00 00 03 11'
+ '11 11 00 11 11 22 00 00 00 00 03 11 11 11 01 11'
+ '11 22 00 00 00 00 03 11 11 11 11 11 11 22 00 00'
+ '00 00 03 11 11 11 11 11 11 22 00 00 00 00 03 11'
+ '11 11 11 11 11 22 00 00 00 00 03 33 33 33 33 33'
+ '33 32 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00'
+}
+
+/* BINRES obm_dnarrow.bmp */
+OBM_DNARROW BITMAP
+{
+ '42 4D 42 01 00 00 00 00 00 00 76 00 00 00 28 00'
+ '00 00 11 00 00 00 11 00 00 00 01 00 04 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 BF BF BF 00 7F 7F'
+ '7F 00 FF FF FF 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 02 22 22 22 22 22 22 22 00 00 00 00 03 22'
+ '22 22 22 22 22 22 00 00 00 00 03 11 11 11 11 11'
+ '11 22 00 00 00 00 03 11 11 11 11 11 11 22 00 00'
+ '00 00 03 11 11 11 01 11 11 22 00 00 00 00 03 11'
+ '11 10 00 11 11 22 00 00 00 00 03 11 11 00 00 01'
+ '11 22 00 00 00 00 03 11 10 00 00 00 11 22 00 00'
+ '00 00 03 11 11 10 00 11 11 22 00 00 00 00 03 11'
+ '11 10 00 11 11 22 00 00 00 00 03 11 11 10 00 11'
+ '11 22 00 00 00 00 03 11 11 11 11 11 11 22 00 00'
+ '00 00 03 11 11 11 11 11 11 22 00 00 00 00 03 11'
+ '11 11 11 11 11 22 00 00 00 00 03 33 33 33 33 33'
+ '33 32 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00'
+}
+
+/* BINRES obm_uparrow.bmp */
+OBM_UPARROW BITMAP
+{
+ '42 4D 42 01 00 00 00 00 00 00 76 00 00 00 28 00'
+ '00 00 11 00 00 00 11 00 00 00 01 00 04 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 BF BF BF 00 7F 7F'
+ '7F 00 FF FF FF 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 02 22 22 22 22 22 22 22 00 00 00 00 03 22'
+ '22 22 22 22 22 22 00 00 00 00 03 11 11 11 11 11'
+ '11 22 00 00 00 00 03 11 11 11 11 11 11 22 00 00'
+ '00 00 03 11 11 10 00 11 11 22 00 00 00 00 03 11'
+ '11 10 00 11 11 22 00 00 00 00 03 11 11 10 00 11'
+ '11 22 00 00 00 00 03 11 10 00 00 00 11 22 00 00'
+ '00 00 03 11 11 00 00 01 11 22 00 00 00 00 03 11'
+ '11 10 00 11 11 22 00 00 00 00 03 11 11 11 01 11'
+ '11 22 00 00 00 00 03 11 11 11 11 11 11 22 00 00'
+ '00 00 03 11 11 11 11 11 11 22 00 00 00 00 03 11'
+ '11 11 11 11 11 22 00 00 00 00 03 33 33 33 33 33'
+ '33 32 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00'
+}
+
+/* BINRES obm_old_restore.bmp */
+OBM_OLD_RESTORE BITMAP
+{
+ '42 4D 8A 00 00 00 00 00 00 00 3E 00 00 00 28 00'
+ '00 00 19 00 00 00 13 00 00 00 01 00 01 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 FF FF FF 00 FF FF'
+ 'FF 80 FF FF FF 80 FF 7E 0F 80 FE 3C 0F 80 FD 1D'
+ 'CF 80 FB 8D CF 80 F7 C5 CF 80 EF E1 CF 80 C3 81'
+ 'CF 80 FB 9D CF 80 FB 9D C3 80 FB 81 C1 80 FB 97'
+ 'F3 80 FB 9B E7 80 FB 9D CF 80 FB 9E 9F 80 F8 3F'
+ '7F 80 FF FF FF 80 FF FF FF 80'
+}
+
+/* BINRES obm_old_zoom.bmp */
+OBM_OLD_ZOOM BITMAP
+{
+ '42 4D 8A 00 00 00 00 00 00 00 3E 00 00 00 28 00'
+ '00 00 19 00 00 00 13 00 00 00 01 00 01 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 FF FF FF 00 FF FF'
+ 'FF 80 FF FF FF 80 FF E0 FF 80 FF C0 FF 80 FF DC'
+ 'FF 80 FF DC FF 80 FF DC FF 80 FF DC FF 80 FF DC'
+ 'FF 80 FF DC FF 80 FF DC 3F 80 FE 1C 1F 80 FF 7F'
+ '3F 80 FF BE 7F 80 FF DC FF 80 FF E9 FF 80 FF F7'
+ 'FF 80 FF FF FF 80 FF FF FF 80'
+}
+
+/* BINRES obm_old_reduce.bmp */
+OBM_OLD_REDUCE BITMAP
+{
+ '42 4D 8A 00 00 00 00 00 00 00 3E 00 00 00 28 00'
+ '00 00 19 00 00 00 13 00 00 00 01 00 01 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 FF FF FF 00 FF FF'
+ 'FF 80 FF FB FF 80 FF F1 FF 80 FF E8 FF 80 FF DC'
+ '7F 80 FF BE 3F 80 FF 7F 1F 80 FE 1C 3F 80 FF DC'
+ 'FF 80 FF DC FF 80 FF DC FF 80 FF DC FF 80 FF DC'
+ 'FF 80 FF DC FF 80 FF DD FF 80 FF C1 FF 80 FF FF'
+ 'FF 80 FF FF FF 80 FF FF FF 80'
+}
+
+/* BINRES obm_btncorners.bmp */
+OBM_BTNCORNERS BITMAP
+{
+ '42 4D 76 00 00 00 00 00 00 00 3E 00 00 00 28 00'
+ '00 00 0E 00 00 00 0E 00 00 00 01 00 01 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 FF FF FF 00 FF FC'
+ '00 00 FF FC 00 00 FF FC 00 00 F8 7C 00 00 F0 3C'
+ '00 00 E0 1C 00 00 E0 1C 00 00 E0 1C 00 00 E0 1C'
+ '00 00 F0 3C 00 00 F8 7C 00 00 FF FC 00 00 FF FC'
+ '00 00 FF FC 00 00'
+}
+
+/* BINRES obm_checkboxes.bmp */
+OBM_CHECKBOXES BITMAP
+{
+ '42 4D 76 01 00 00 00 00 00 00 3E 00 00 00 28 00'
+ '00 00 38 00 00 00 27 00 00 00 01 00 01 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 FF FF FF 00 FF FC'
+ '00 1F FF C0 01 00 FF FD 55 5F FF C0 01 00 FF FC'
+ 'AA 9F FF CA A9 00 FF FD 55 5F FF C5 51 00 FF FC'
+ 'AA 9F FF CA A9 00 FF FD 55 5F FF C5 51 00 FF FC'
+ 'AA 9F FF CA A9 00 FF FD 55 5F FF C5 51 00 FF FC'
+ 'AA 9F FF CA A9 00 FF FD 55 5F FF C5 51 00 FF FC'
+ 'AA 9F FF CA A9 00 FF FD 55 5F FF C0 01 00 FF FC'
+ '00 1F FF C0 01 00 F8 FF E3 FF 8F FE 3F 00 E7 3F'
+ '9C FE 03 F8 0F 00 DF DF 7F 7C 71 F1 C7 00 BF EE'
+ 'E3 B9 FC E2 23 00 BF EE C1 B9 FC E4 13 00 7F F5'
+ '80 D3 FE 48 09 00 7F F5 80 D3 FE 48 09 00 7F F5'
+ '80 D3 FE 48 09 00 BF EE C1 B9 FC E4 13 00 BF EE'
+ 'E3 B9 FC E2 23 00 DF DF 7F 7C 71 F1 C7 00 E7 3F'
+ '9C FE 03 F8 0F 00 F8 FF E3 FF 8F FE 3F 00 00 04'
+ '00 10 00 40 01 00 7F F4 FF 90 00 40 01 00 7F F5'
+ '7F 53 FE 47 F1 00 7F F5 BE D3 FE 4B E9 00 7F F5'
+ 'DD D3 FE 4D D9 00 7F F5 EB D3 FE 4E B9 00 7F F5'
+ 'F7 D3 FE 4F 79 00 7F F5 EB D3 FE 4E B9 00 7F F5'
+ 'DD D3 FE 4D D9 00 7F F5 BE D3 FE 4B E9 00 7F F5'
+ '7F 53 FE 47 F1 00 7F F4 FF 90 00 40 01 00 00 04'
+ '00 10 00 40 01 00'
+}
+
+/* BINRES obm_check.bmp */
+OBM_CHECK BITMAP
+{
+ '42 4D 76 00 00 00 00 00 00 00 3E 00 00 00 28 00'
+ '00 00 0E 00 00 00 0E 00 00 00 01 00 01 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 FF FF FF 00 FF FC'
+ '00 00 FF FC 00 00 FF FC 00 00 FE FC 00 00 FC 7C'
+ '00 00 FD 7C 00 00 F9 3C 00 00 F3 BC 00 00 FF 9C'
+ '00 00 FF DC 00 00 FF CC 00 00 FF EC 00 00 FF EC'
+ '00 00 FF FC 00 00'
+}
+
+/* BINRES obm_btsize.bmp */
+OBM_BTSIZE BITMAP
+{
+ '42 4D 7A 00 00 00 00 00 00 00 3E 00 00 00 28 00'
+ '00 00 0F 00 00 00 0F 00 00 00 01 00 01 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 FF FF FF 00 00 00'
+ '00 00 7F FC 00 00 7F FC 00 00 7F FC 00 00 7F FC'
+ '00 00 7F FC 00 00 00 7C 00 00 7F 7C 00 00 7F 7C'
+ '00 00 7F 7C 00 00 7F 7C 00 00 7F 7C 00 00 7F 7C'
+ '00 00 7F 7C 00 00 00 00 00 00'
+}
+
+/* BINRES obm_old_lfarrow.bmp */
+OBM_OLD_LFARROW BITMAP
+{
+ '42 4D 7A 00 00 00 00 00 00 00 3E 00 00 00 28 00'
+ '00 00 0F 00 00 00 0F 00 00 00 01 00 01 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 FF FF FF 00 FF FE'
+ '00 00 FF FE 00 00 FF FE 00 00 FE FE 00 00 FC FE'
+ '00 00 F8 FE 00 00 F0 0E 00 00 E0 0E 00 00 F0 0E'
+ '00 00 F8 FE 00 00 FC FE 00 00 FE FE 00 00 FF FE'
+ '00 00 FF FE 00 00 FF FE 00 00'
+}
+
+/* BINRES obm_old_rgarrow.bmp */
+OBM_OLD_RGARROW BITMAP
+{
+ '42 4D 7A 00 00 00 00 00 00 00 3E 00 00 00 28 00'
+ '00 00 0F 00 00 00 0F 00 00 00 01 00 01 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 FF FF FF 00 FF FE'
+ '00 00 FF FE 00 00 FF FE 00 00 FE FE 00 00 FE 7E'
+ '00 00 FE 3E 00 00 E0 1E 00 00 E0 0E 00 00 E0 1E'
+ '00 00 FE 3E 00 00 FE 7E 00 00 FE FE 00 00 FF FE'
+ '00 00 FF FE 00 00 FF FE 00 00'
+}
+
+/* BINRES obm_old_dnarrow.bmp */
+OBM_OLD_DNARROW BITMAP
+{
+ '42 4D 7A 00 00 00 00 00 00 00 3E 00 00 00 28 00'
+ '00 00 0F 00 00 00 0F 00 00 00 01 00 01 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 FF FF FF 00 FF FE'
+ '00 00 FF FE 00 00 FF FE 00 00 FE FE 00 00 FC 7E'
+ '00 00 F8 3E 00 00 F0 1E 00 00 E0 0E 00 00 FC 7E'
+ '00 00 FC 7E 00 00 FC 7E 00 00 FC 7E 00 00 FF FE'
+ '00 00 FF FE 00 00 FF FE 00 00'
+}
+
+/* BINRES obm_old_uparrow.bmp */
+OBM_OLD_UPARROW BITMAP
+{
+ '42 4D 7A 00 00 00 00 00 00 00 3E 00 00 00 28 00'
+ '00 00 0F 00 00 00 0F 00 00 00 01 00 01 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 FF FF FF 00 FF FE'
+ '00 00 FF FE 00 00 FF FE 00 00 FC 7E 00 00 FC 7E'
+ '00 00 FC 7E 00 00 FC 7E 00 00 E0 0E 00 00 F0 1E'
+ '00 00 F8 3E 00 00 FC 7E 00 00 FE FE 00 00 FF FE'
+ '00 00 FF FE 00 00 FF FE 00 00'
+}
+
+/* BINRES obm_size.bmp */
+OBM_SIZE BITMAP
+{
+ '42 4D 72 00 00 00 00 00 00 00 3E 00 00 00 28 00'
+ '00 00 0D 00 00 00 0D 00 00 00 01 00 01 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 FF FF FF 00 F8 F8'
+ '00 00 F8 F8 00 00 F8 F8 00 00 F8 F8 00 00 F8 F8'
+ '00 00 00 F8 00 00 00 F8 00 00 FF F8 00 00 FF F8'
+ '00 00 FF F8 00 00 FF F8 00 00 FF F8 00 00 FF F8'
+ '00 00'
+}
+
+/* BINRES obm_old_close.bmp */
+OBM_OLD_CLOSE BITMAP
+{
+ '42 4D D6 00 00 00 00 00 00 00 3E 00 00 00 28 00'
+ '00 00 32 00 00 00 13 00 00 00 01 00 01 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 FF FF FF 00 FF FF'
+ 'FF FF FF FF C0 00 FF FF FF FF FF FF C0 00 FF FF'
+ 'FF FF FF FF C0 00 FF FF FF FF FF FF C0 00 FF FF'
+ 'FF FF FF FF C0 00 FF FF FF FF FF FF C0 00 FF FF'
+ 'FF FF FF FF C0 00 E0 00 01 FF C0 0F C0 00 C0 00'
+ '01 FF 80 0F C0 00 DF FF F9 FF BF CF C0 00 DF FF'
+ 'F9 FF BF CF C0 00 C0 00 03 FF 80 1F C0 00 FF FF'
+ 'FF FF FF FF C0 00 FF FF FF FF FF FF C0 00 FF FF'
+ 'FF FF FF FF C0 00 FF FF FF FF FF FF C0 00 FF FF'
+ 'FF FF FF FF C0 00 FF FF FF FF FF FF C0 00 FF FF'
+ 'FF FF FF FF C0 00'
+}
diff --git a/graphics/x11drv/oembitmap.c b/graphics/x11drv/oembitmap.c
index 510e383ca950ec32955bcbe594ee267995836d13..6a65919eaf97002422bc760242b501207ede4748 100644
--- a/graphics/x11drv/oembitmap.c
+++ b/graphics/x11drv/oembitmap.c
@@ -32,50 +32,21 @@ typedef unsigned long Pixel;
 #include "x11drv.h"
 
   /* Include OEM pixmaps */
-#include "bitmaps/obm_lfarrowi"
-#include "bitmaps/obm_rgarrowi"
-#include "bitmaps/obm_dnarrowi"
-#include "bitmaps/obm_uparrowi"
-#include "bitmaps/obm_combo"
-#include "bitmaps/obm_mnarrow"
-#include "bitmaps/obm_lfarrowd"
-#include "bitmaps/obm_rgarrowd"
-#include "bitmaps/obm_dnarrowd"
-#include "bitmaps/obm_uparrowd"
-#include "bitmaps/obm_restored"
-#include "bitmaps/obm_restore"
-#include "bitmaps/obm_lfarrow"
-#include "bitmaps/obm_rgarrow"
-#include "bitmaps/obm_dnarrow"
-#include "bitmaps/obm_uparrow"
-#include "bitmaps/obm_old_restore"
-#include "bitmaps/obm_old_zoom"
-#include "bitmaps/obm_old_reduce"
-#include "bitmaps/obm_btncorners"
-#include "bitmaps/obm_checkboxes"
-#include "bitmaps/obm_check"
-#include "bitmaps/obm_btsize"
-#include "bitmaps/obm_old_lfarrow"
-#include "bitmaps/obm_old_rgarrow"
-#include "bitmaps/obm_old_dnarrow"
-#include "bitmaps/obm_old_uparrow"
-#include "bitmaps/obm_size"
-#include "bitmaps/obm_old_close"
-#include "bitmaps/obm_trtype"
-
-#include "bitmaps/obm_zoomd"
-#include "bitmaps/obm_reduced"
-#include "bitmaps/obm_zoom"
-#include "bitmaps/obm_reduce"
 #include "bitmaps/obm_close"
-#include "bitmaps/obm_zoomd_95"
-#include "bitmaps/obm_reduced_95"
-#include "bitmaps/obm_zoom_95"
-#include "bitmaps/obm_reduce_95"
 #include "bitmaps/obm_close_95"
 #include "bitmaps/obm_closed_95"
+#include "bitmaps/obm_reduce"
+#include "bitmaps/obm_reduce_95"
+#include "bitmaps/obm_reduced"
+#include "bitmaps/obm_reduced_95"
+#include "bitmaps/obm_restore"
 #include "bitmaps/obm_restore_95"
+#include "bitmaps/obm_restored"
 #include "bitmaps/obm_restored_95"
+#include "bitmaps/obm_zoom"
+#include "bitmaps/obm_zoom_95"
+#include "bitmaps/obm_zoomd"
+#include "bitmaps/obm_zoomd_95"
 
 DECLARE_DEBUG_CHANNEL(bitmap);
 DECLARE_DEBUG_CHANNEL(cursor);
@@ -91,42 +62,42 @@ static struct
     BOOL color;  /* Is it a color bitmap?  */
 } OBM_Pixmaps_Data[OBM_LAST-OBM_FIRST+1] = {
     { obm_closed_95,TRUE},      /* OBM_CLOSED */
-    { obm_trtype, TRUE },       /* OBM_TRTYPE */
+    { NULL, FALSE },            /* OBM_TRTYPE */
     { NULL, FALSE },            /* unused */
-    { obm_lfarrowi, TRUE },     /* OBM_LFARROWI */
-    { obm_rgarrowi, TRUE },     /* OBM_RGARROWI */
-    { obm_dnarrowi, TRUE },     /* OBM_DNARROWI */
-    { obm_uparrowi, TRUE },     /* OBM_UPARROWI */
-    { obm_combo, FALSE },       /* OBM_COMBO */
-    { obm_mnarrow, FALSE },     /* OBM_MNARROW */
-    { obm_lfarrowd, TRUE },     /* OBM_LFARROWD */
-    { obm_rgarrowd, TRUE },     /* OBM_RGARROWD */
-    { obm_dnarrowd, TRUE },     /* OBM_DNARROWD */
-    { obm_uparrowd, TRUE },     /* OBM_UPARROWD */
+    { NULL, FALSE },            /* OBM_LFARROWI */
+    { NULL, FALSE },            /* OBM_RGARROWI */
+    { NULL, FALSE },            /* OBM_DNARROWI */
+    { NULL, FALSE },            /* OBM_UPARROWI */
+    { NULL, FALSE },            /* OBM_COMBO */
+    { NULL, FALSE },            /* OBM_MNARROW */
+    { NULL, FALSE },            /* OBM_LFARROWD */
+    { NULL, FALSE },            /* OBM_RGARROWD */
+    { NULL, FALSE },            /* OBM_DNARROWD */
+    { NULL, FALSE },            /* OBM_UPARROWD */
     { obm_restored, TRUE },     /* OBM_RESTORED */
     { obm_zoomd, TRUE },        /* OBM_ZOOMD */
     { obm_reduced, TRUE },      /* OBM_REDUCED */
     { obm_restore, TRUE },      /* OBM_RESTORE */
     { obm_zoom, TRUE },         /* OBM_ZOOM */
     { obm_reduce, TRUE },       /* OBM_REDUCE */
-    { obm_lfarrow, TRUE },      /* OBM_LFARROW */
-    { obm_rgarrow, TRUE },      /* OBM_RGARROW */
-    { obm_dnarrow, TRUE },      /* OBM_DNARROW */
-    { obm_uparrow, TRUE },      /* OBM_UPARROW */
+    { NULL, FALSE },            /* OBM_LFARROW */
+    { NULL, FALSE },            /* OBM_RGARROW */
+    { NULL, FALSE },            /* OBM_DNARROW */
+    { NULL, FALSE },            /* OBM_UPARROW */
     { obm_close, TRUE },        /* OBM_CLOSE */
-    { obm_old_restore, FALSE }, /* OBM_OLD_RESTORE */
-    { obm_old_zoom, FALSE },    /* OBM_OLD_ZOOM */
-    { obm_old_reduce, FALSE },  /* OBM_OLD_REDUCE */
-    { obm_btncorners, FALSE },  /* OBM_BTNCORNERS */
-    { obm_checkboxes, FALSE },  /* OBM_CHECKBOXES */
-    { obm_check, FALSE },       /* OBM_CHECK */
-    { obm_btsize, FALSE },      /* OBM_BTSIZE */
-    { obm_old_lfarrow, FALSE }, /* OBM_OLD_LFARROW */
-    { obm_old_rgarrow, FALSE }, /* OBM_OLD_RGARROW */
-    { obm_old_dnarrow, FALSE }, /* OBM_OLD_DNARROW */
-    { obm_old_uparrow, FALSE }, /* OBM_OLD_UPARROW */
-    { obm_size, FALSE },        /* OBM_SIZE */
-    { obm_old_close, FALSE },   /* OBM_OLD_CLOSE */
+    { NULL, FALSE },            /* OBM_OLD_RESTORE */
+    { NULL, FALSE },            /* OBM_OLD_ZOOM */
+    { NULL, FALSE },            /* OBM_OLD_REDUCE */
+    { NULL, FALSE },            /* OBM_BTNCORNERS */
+    { NULL, FALSE },            /* OBM_CHECKBOXES */
+    { NULL, FALSE },            /* OBM_CHECK */
+    { NULL, FALSE },            /* OBM_BTSIZE */
+    { NULL, FALSE },            /* OBM_OLD_LFARROW */
+    { NULL, FALSE },            /* OBM_OLD_RGARROW */
+    { NULL, FALSE },            /* OBM_OLD_DNARROW */
+    { NULL, FALSE },            /* OBM_OLD_UPARROW */
+    { NULL, FALSE },            /* OBM_SIZE */
+    { NULL, FALSE },            /* OBM_OLD_CLOSE */
 };
 
 
diff --git a/include/bitmaps/obm_btncorners b/include/bitmaps/obm_btncorners
deleted file mode 100644
index eabe8f23f5797d63e96c7b3cb5a968e2d63726cf..0000000000000000000000000000000000000000
--- a/include/bitmaps/obm_btncorners
+++ /dev/null
@@ -1,15 +0,0 @@
-/* XPM */
-static char * obm_btncorners[] = {
-"30 10 2 1",
-" 	s white	c white",
-".	s black	c black",
-"                              ",
-"             ....             ",
-"   ....     ......            ",
-"  .    .   ..    ..    ....   ",
-"  .    .   ..    ..    ....   ",
-"  .    .   ..    ..    ....   ",
-"  .    .   ..    ..    ....   ",
-"   ....     ......            ",
-"             ....             ",
-"                              "};
diff --git a/include/bitmaps/obm_btsize b/include/bitmaps/obm_btsize
deleted file mode 100644
index b2047331bc9e37fb8608c2fec64d75749bc72679..0000000000000000000000000000000000000000
--- a/include/bitmaps/obm_btsize
+++ /dev/null
@@ -1,20 +0,0 @@
-/* XPM */
-static char * obm_btsize[] = {
-"15 15 2 1",
-" 	s black	c black",
-".	s white	c white",
-"               ",
-" ....... ..... ",
-" ....... ..... ",
-" ....... ..... ",
-" ....... ..... ",
-" ....... ..... ",
-" ....... ..... ",
-" ....... ..... ",
-"         ..... ",
-" ............. ",
-" ............. ",
-" ............. ",
-" ............. ",
-" ............. ",
-"               "};
diff --git a/include/bitmaps/obm_check b/include/bitmaps/obm_check
deleted file mode 100644
index 7ff8bf31f5b80eaae1c754e57dd70ddbb669b877..0000000000000000000000000000000000000000
--- a/include/bitmaps/obm_check
+++ /dev/null
@@ -1,19 +0,0 @@
-/* XPM */
-static char * obm_check[] = {
-"14 14 2 1",
-" 	s white	c white",
-".	s black	c black",
-"              ",
-"           .  ",
-"           .  ",
-"          ..  ",
-"          .   ",
-"         ..   ",
-"    ..   .    ",
-"     .. ..    ",
-"      . .     ",
-"      ...     ",
-"       .      ",
-"              ",
-"              ",
-"              "};
diff --git a/include/bitmaps/obm_checkboxes b/include/bitmaps/obm_checkboxes
deleted file mode 100644
index 1fb62bff9df9d9a8a98b2da4e009dc48c0d669f3..0000000000000000000000000000000000000000
--- a/include/bitmaps/obm_checkboxes
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */
-static char * obm_checkboxes[] = {
-"56 39 2 1",
-" 	s white	c white",
-".	s black	c black",
-"............. ............. ............. ............. ",
-".           . ..         .. ............. ............. ",
-".           . . .       . . ..         .. ...       ... ",
-".           . .  .     .  . ..         .. .. .     . .. ",
-".           . .   .   .   . ..         .. ..  .   .  .. ",
-".           . .    . .    . ..         .. ..   . .   .. ",
-".           . .     .     . ..         .. ..    .    .. ",
-".           . .    . .    . ..         .. ..   . .   .. ",
-".           . .   .   .   . ..         .. ..  .   .  .. ",
-".           . .  .     .  . ..         .. .. .     . .. ",
-".           . . .       . . ..         .. ...       ... ",
-".           . ..         .. ............. ............. ",
-"............. ............. ............. ............. ",
-"     ...           ...           ...           ...      ",
-"   ..   ..       ..   ..       .......       .......    ",
-"  .       .     .       .     ...   ...     ...   ...   ",
-" .         .   .   ...   .   ..       ..   ... ... ...  ",
-" .         .   .  .....  .   ..       ..   .. ..... ..  ",
-".           . .  .......  . ..         .. .. ....... .. ",
-".           . .  .......  . ..         .. .. ....... .. ",
-".           . .  .......  . ..         .. .. ....... .. ",
-" .         .   .  .....  .   ..       ..   .. ..... ..  ",
-" .         .   .   ...   .   ..       ..   ... ... ...  ",
-"  .       .     .       .     ...   ...     ...   ...   ",
-"   ..   ..       ..   ..       .......       .......    ",
-"     ...           ...           ...           ...      ",
-"              .............               ............. ",
-"              . . . . . . .               ............. ",
-"              .. . . . . ..               .. . . . . .. ",
-"              . . . . . . .               ... . . . ... ",
-"              .. . . . . ..               .. . . . . .. ",
-"              . . . . . . .               ... . . . ... ",
-"              .. . . . . ..               .. . . . . .. ",
-"              . . . . . . .               ... . . . ... ",
-"              .. . . . . ..               .. . . . . .. ",
-"              . . . . . . .               ... . . . ... ",
-"              .. . . . . ..               .. . . . . .. ",
-"              . . . . . . .               ............. ",
-"              .............               ............. "};
diff --git a/include/bitmaps/obm_combo b/include/bitmaps/obm_combo
deleted file mode 100644
index c7d69a2f7b9dc9dca6f43b5c6edd41321c33495f..0000000000000000000000000000000000000000
--- a/include/bitmaps/obm_combo
+++ /dev/null
@@ -1,14 +0,0 @@
-/* XPM */
-static char * obm_combo[] = {
-"7 9 2 1",
-" 	s white	c white",
-".	s black	c black",
-"  ...  ",
-"  ...  ",
-"  ...  ",
-".......",
-" ..... ",
-"  ...  ",
-"   .   ",
-"       ",
-"......."};
diff --git a/include/bitmaps/obm_dnarrow b/include/bitmaps/obm_dnarrow
deleted file mode 100644
index 61a9db56e562f65e68f3fd758ccb3cf03bd2ad52..0000000000000000000000000000000000000000
--- a/include/bitmaps/obm_dnarrow
+++ /dev/null
@@ -1,25 +0,0 @@
-/* XPM */
-static char * obm_dnarrow[] = {
-"17 17 5 1",
-" 	s window_frame	c black",
-".	s button_highlight	c white",
-"X	s button_shadow	c grey50",
-"o	s button_face	c grey75",
-"O	s button_text	c black",
-"                 ",
-" ..............X ",
-" .ooooooooooooXX ",
-" .ooooooooooooXX ",
-" .ooooooooooooXX ",
-" .oooooOOOooooXX ",
-" .oooooOOOooooXX ",
-" .oooooOOOooooXX ",
-" .oooOOOOOOOooXX ",
-" .ooooOOOOOoooXX ",
-" .oooooOOOooooXX ",
-" .ooooooOoooooXX ",
-" .ooooooooooooXX ",
-" .ooooooooooooXX ",
-" .XXXXXXXXXXXXXX ",
-" XXXXXXXXXXXXXXX ",
-"                 "};
diff --git a/include/bitmaps/obm_dnarrowd b/include/bitmaps/obm_dnarrowd
deleted file mode 100644
index c7c493562af47979a59ae01e46b3c3d1f6fd1193..0000000000000000000000000000000000000000
--- a/include/bitmaps/obm_dnarrowd
+++ /dev/null
@@ -1,24 +0,0 @@
-/* XPM */
-static char * obm_dnarrowd[] = {
-"17 17 4 1",
-" 	s window_frame	c black",
-".	s button_shadow	c grey50",
-"X	s button_face	c grey75",
-"o	s button_text	c black",
-"                 ",
-" ............... ",
-" .XXXXXXXXXXXXXX ",
-" .XXXXXXXXXXXXXX ",
-" .XXXXXXXXXXXXXX ",
-" .XXXXXXXXXXXXXX ",
-" .XXXXXXoooXXXXX ",
-" .XXXXXXoooXXXXX ",
-" .XXXXXXoooXXXXX ",
-" .XXXXoooooooXXX ",
-" .XXXXXoooooXXXX ",
-" .XXXXXXoooXXXXX ",
-" .XXXXXXXoXXXXXX ",
-" .XXXXXXXXXXXXXX ",
-" .XXXXXXXXXXXXXX ",
-" .XXXXXXXXXXXXXX ",
-"                 "};
diff --git a/include/bitmaps/obm_dnarrowi b/include/bitmaps/obm_dnarrowi
deleted file mode 100644
index 4c91ee8cf8aed0c261d2b72a420c4ed1bada75d7..0000000000000000000000000000000000000000
--- a/include/bitmaps/obm_dnarrowi
+++ /dev/null
@@ -1,24 +0,0 @@
-/* XPM */
-static char * obm_dnarrowi[] = {
-"17 17 4 1",
-" 	s button_text	c black",
-".	s button_highlight	c white",
-"X	s button_shadow	c grey50",
-"o	s button_face	c grey75",
-"                 ",
-" ..............X ",
-" .ooooooooooooXX ",
-" .ooooooooooooXX ",
-" .ooooooooooooXX ",
-" .oooooXXXooooXX ",
-" .oooooXXX.oooXX ",
-" .oooooXXX.oooXX ",
-" .oooXXXXXXXooXX ",
-" .ooooXXXXX..oXX ",
-" .oooooXXX..ooXX ",
-" .ooooooX..oooXX ",
-" .ooooooo.ooooXX ",
-" .ooooooooooooXX ",
-" .XXXXXXXXXXXXXX ",
-" XXXXXXXXXXXXXXX ",
-"                 "};
diff --git a/include/bitmaps/obm_lfarrow b/include/bitmaps/obm_lfarrow
deleted file mode 100644
index ae5845cd80f9809cbc3a52961892b8e87ee88987..0000000000000000000000000000000000000000
--- a/include/bitmaps/obm_lfarrow
+++ /dev/null
@@ -1,25 +0,0 @@
-/* XPM */
-static char * obm_lfarrow[] = {
-"17 17 5 1",
-" 	s window_frame	c black",
-".	s button_highlight	c white",
-"X	s button_shadow	c grey50",
-"o	s button_face	c grey75",
-"O	s button_text	c black",
-"                 ",
-" ..............X ",
-" .ooooooooooooXX ",
-" .ooooooooooooXX ",
-" .ooooooooooooXX ",
-" .ooooooOoooooXX ",
-" .oooooOOoooooXX ",
-" .ooooOOOOOOooXX ",
-" .oooOOOOOOOooXX ",
-" .ooooOOOOOOooXX ",
-" .oooooOOoooooXX ",
-" .ooooooOoooooXX ",
-" .ooooooooooooXX ",
-" .ooooooooooooXX ",
-" .XXXXXXXXXXXXXX ",
-" XXXXXXXXXXXXXXX ",
-"                 "};
diff --git a/include/bitmaps/obm_lfarrowd b/include/bitmaps/obm_lfarrowd
deleted file mode 100644
index 93660439373fc161b8f9f17975b0df3f24534320..0000000000000000000000000000000000000000
--- a/include/bitmaps/obm_lfarrowd
+++ /dev/null
@@ -1,24 +0,0 @@
-/* XPM */
-static char * obm_lfarrowd[] = {
-"17 17 4 1",
-" 	s window_frame	c black",
-".	s button_shadow	c grey50",
-"X	s button_face	c grey75",
-"o	s button_text	c black",
-"                 ",
-" ............... ",
-" .XXXXXXXXXXXXXX ",
-" .XXXXXXXXXXXXXX ",
-" .XXXXXXXXXXXXXX ",
-" .XXXXXXXXXXXXXX ",
-" .XXXXXXXoXXXXXX ",
-" .XXXXXXooXXXXXX ",
-" .XXXXXooooooXXX ",
-" .XXXXoooooooXXX ",
-" .XXXXXooooooXXX ",
-" .XXXXXXooXXXXXX ",
-" .XXXXXXXoXXXXXX ",
-" .XXXXXXXXXXXXXX ",
-" .XXXXXXXXXXXXXX ",
-" .XXXXXXXXXXXXXX ",
-"                 "};
diff --git a/include/bitmaps/obm_lfarrowi b/include/bitmaps/obm_lfarrowi
deleted file mode 100644
index 13880a107d505e97c596658da84e6576fce64f1e..0000000000000000000000000000000000000000
--- a/include/bitmaps/obm_lfarrowi
+++ /dev/null
@@ -1,24 +0,0 @@
-/* XPM */
-static char * obm_lfarrowi[] = {
-"17 17 4 1",
-" 	s button_text	c black",
-".	s button_highlight	c white",
-"X	s button_shadow	c grey50",
-"o	s button_face	c grey75",
-"                 ",
-" ..............X ",
-" .ooooooooooooXX ",
-" .ooooooooooooXX ",
-" .ooooooooooooXX ",
-" .ooooooX.ooooXX ",
-" .oooooXX.ooooXX ",
-" .ooooXXXXXXooXX ",
-" .oooXXXXXXX.oXX ",
-" .ooooXXXXXX.oXX ",
-" .oooooXXo...oXX ",
-" .ooooooX.ooooXX ",
-" .ooooooo.ooooXX ",
-" .ooooooooooooXX ",
-" .XXXXXXXXXXXXXX ",
-" XXXXXXXXXXXXXXX ",
-"                 "};
diff --git a/include/bitmaps/obm_mnarrow b/include/bitmaps/obm_mnarrow
deleted file mode 100644
index 34d2f122c650be1186238919611425a620759f93..0000000000000000000000000000000000000000
--- a/include/bitmaps/obm_mnarrow
+++ /dev/null
@@ -1,16 +0,0 @@
-/* XPM */
-static char * obm_mnarrow[] = {
-"7 11 2 1",
-" 	s white	c white",
-".	s black	c black",
-"       ",
-" .     ",
-" ..    ",
-" ...   ",
-" ....  ",
-" ..... ",
-" ....  ",
-" ...   ",
-" ..    ",
-" .     ",
-"       "};
diff --git a/include/bitmaps/obm_old_close b/include/bitmaps/obm_old_close
deleted file mode 100644
index 12f3a5a5562d759da858c754e2dde611c595fbdc..0000000000000000000000000000000000000000
--- a/include/bitmaps/obm_old_close
+++ /dev/null
@@ -1,24 +0,0 @@
-/* XPM */
-static char * obm_old_close[] = {
-"50 19 2 1",
-" 	s white	c white",
-".	s black	c black",
-"                                                  ",
-"                                                  ",
-"                                                  ",
-"                                                  ",
-"                                                  ",
-"                                                  ",
-"                                                  ",
-"  ....................           ..........       ",
-"  .                  ..          .        ..      ",
-"  .                  ..          .        ..      ",
-"  .....................          ...........      ",
-"   ....................           ..........      ",
-"                                                  ",
-"                                                  ",
-"                                                  ",
-"                                                  ",
-"                                                  ",
-"                                                  ",
-"                                                  "};
diff --git a/include/bitmaps/obm_old_dnarrow b/include/bitmaps/obm_old_dnarrow
deleted file mode 100644
index f9f707a0df3e4e18b2519c6c380847f7ff9e29f3..0000000000000000000000000000000000000000
--- a/include/bitmaps/obm_old_dnarrow
+++ /dev/null
@@ -1,20 +0,0 @@
-/* XPM */
-static char * obm_old_dnarrow[] = {
-"15 15 2 1",
-" 	s white	c white",
-".	s black	c black",
-"               ",
-"               ",
-"               ",
-"      ...      ",
-"      ...      ",
-"      ...      ",
-"      ...      ",
-"   .........   ",
-"    .......    ",
-"     .....     ",
-"      ...      ",
-"       .       ",
-"               ",
-"               ",
-"               "};
diff --git a/include/bitmaps/obm_old_lfarrow b/include/bitmaps/obm_old_lfarrow
deleted file mode 100644
index 1a5d864573dbc69934a142c3d6bc8e8590166d02..0000000000000000000000000000000000000000
--- a/include/bitmaps/obm_old_lfarrow
+++ /dev/null
@@ -1,20 +0,0 @@
-/* XPM */
-static char * obm_old_lfarrow[] = {
-"15 15 2 1",
-" 	s white	c white",
-".	s black	c black",
-"               ",
-"               ",
-"               ",
-"       .       ",
-"      ..       ",
-"     ...       ",
-"    ........   ",
-"   .........   ",
-"    ........   ",
-"     ...       ",
-"      ..       ",
-"       .       ",
-"               ",
-"               ",
-"               "};
diff --git a/include/bitmaps/obm_old_reduce b/include/bitmaps/obm_old_reduce
deleted file mode 100644
index 3418845f572df0fd674c6e2d4f9212c5fec226b8..0000000000000000000000000000000000000000
--- a/include/bitmaps/obm_old_reduce
+++ /dev/null
@@ -1,24 +0,0 @@
-/* XPM */
-static char * obm_old_reduce[] = {
-"25 19 2 1",
-" 	s white	c white",
-".	s black	c black",
-"                         ",
-"                         ",
-"                         ",
-"          .....          ",
-"          .   .          ",
-"          .   ..         ",
-"          .   ..         ",
-"          .   ..         ",
-"          .   ..         ",
-"          .   ..         ",
-"          .   ..         ",
-"       ....   ....       ",
-"        .       ...      ",
-"         .     ...       ",
-"          .   ...        ",
-"           . ...         ",
-"            ...          ",
-"             .           ",
-"                         "};
diff --git a/include/bitmaps/obm_old_restore b/include/bitmaps/obm_old_restore
deleted file mode 100644
index 92d83bb13cd9e29ee12f8a3d1a7445956dc7c178..0000000000000000000000000000000000000000
--- a/include/bitmaps/obm_old_restore
+++ /dev/null
@@ -1,24 +0,0 @@
-/* XPM */
-static char * obm_old_restore[] = {
-"25 19 2 1",
-" 	s white	c white",
-".	s black	c black",
-"                         ",
-"                         ",
-"     .....      .        ",
-"     .   ..    . ..      ",
-"     .   ..   .   ..     ",
-"     .   ..  .     ..    ",
-"     .   .. .       ..   ",
-"     .   ......   .....  ",
-"     .   ..   .   ....   ",
-"     .   ..   .   ..     ",
-"  ....   ......   ..     ",
-"   .       ....   ..     ",
-"    .     ... .   ..     ",
-"     .   ...  .   ..     ",
-"      . ...   .   ..     ",
-"       ...    ......     ",
-"        .      .....     ",
-"                         ",
-"                         "};
diff --git a/include/bitmaps/obm_old_rgarrow b/include/bitmaps/obm_old_rgarrow
deleted file mode 100644
index 0f248dc832326fd9834dc163855400850405decb..0000000000000000000000000000000000000000
--- a/include/bitmaps/obm_old_rgarrow
+++ /dev/null
@@ -1,20 +0,0 @@
-/* XPM */
-static char * obm_old_rgarrow[] = {
-"15 15 2 1",
-" 	s white	c white",
-".	s black	c black",
-"               ",
-"               ",
-"               ",
-"       .       ",
-"       ..      ",
-"       ...     ",
-"   ........    ",
-"   .........   ",
-"   ........    ",
-"       ...     ",
-"       ..      ",
-"       .       ",
-"               ",
-"               ",
-"               "};
diff --git a/include/bitmaps/obm_old_uparrow b/include/bitmaps/obm_old_uparrow
deleted file mode 100644
index 5084dc9f3c5c32a84dc4084f2c104948006970a7..0000000000000000000000000000000000000000
--- a/include/bitmaps/obm_old_uparrow
+++ /dev/null
@@ -1,20 +0,0 @@
-/* XPM */
-static char * obm_old_uparrow[] = {
-"15 15 2 1",
-" 	s white	c white",
-".	s black	c black",
-"               ",
-"               ",
-"               ",
-"       .       ",
-"      ...      ",
-"     .....     ",
-"    .......    ",
-"   .........   ",
-"      ...      ",
-"      ...      ",
-"      ...      ",
-"      ...      ",
-"               ",
-"               ",
-"               "};
diff --git a/include/bitmaps/obm_old_zoom b/include/bitmaps/obm_old_zoom
deleted file mode 100644
index ce6bca8c346f35830974c330aa803b224966e997..0000000000000000000000000000000000000000
--- a/include/bitmaps/obm_old_zoom
+++ /dev/null
@@ -1,24 +0,0 @@
-/* XPM */
-static char * obm_old_zoom[] = {
-"25 19 2 1",
-" 	s white	c white",
-".	s black	c black",
-"                         ",
-"                         ",
-"            .            ",
-"           . ..          ",
-"          .   ..         ",
-"         .     ..        ",
-"        .       ..       ",
-"       ....   .....      ",
-"          .   ....       ",
-"          .   ..         ",
-"          .   ..         ",
-"          .   ..         ",
-"          .   ..         ",
-"          .   ..         ",
-"          .   ..         ",
-"          ......         ",
-"           .....         ",
-"                         ",
-"                         "};
diff --git a/include/bitmaps/obm_rgarrow b/include/bitmaps/obm_rgarrow
deleted file mode 100644
index 9ccf10ae8fdbda5df9e4ae200009cd72701efccc..0000000000000000000000000000000000000000
--- a/include/bitmaps/obm_rgarrow
+++ /dev/null
@@ -1,25 +0,0 @@
-/* XPM */
-static char * obm_rgarrow[] = {
-"17 17 5 1",
-" 	s window_frame	c black",
-".	s button_highlight	c white",
-"X	s button_shadow	c grey50",
-"o	s button_face	c grey75",
-"O	s button_text	c black",
-"                 ",
-" ..............X ",
-" .ooooooooooooXX ",
-" .ooooooooooooXX ",
-" .ooooooooooooXX ",
-" .ooooooOoooooXX ",
-" .ooooooOOooooXX ",
-" .oooOOOOOOoooXX ",
-" .oooOOOOOOOooXX ",
-" .oooOOOOOOoooXX ",
-" .ooooooOOooooXX ",
-" .ooooooOoooooXX ",
-" .ooooooooooooXX ",
-" .ooooooooooooXX ",
-" .XXXXXXXXXXXXXX ",
-" XXXXXXXXXXXXXXX ",
-"                 "};
diff --git a/include/bitmaps/obm_rgarrowd b/include/bitmaps/obm_rgarrowd
deleted file mode 100644
index 023426593d3943f42083821f3857bd0ee99230bf..0000000000000000000000000000000000000000
--- a/include/bitmaps/obm_rgarrowd
+++ /dev/null
@@ -1,24 +0,0 @@
-/* XPM */
-static char * obm_rgarrowd[] = {
-"17 17 4 1",
-" 	s window_frame	c black",
-".	s button_shadow	c grey50",
-"X	s button_face	c grey75",
-"o	s button_text	c black",
-"                 ",
-" ............... ",
-" .XXXXXXXXXXXXXX ",
-" .XXXXXXXXXXXXXX ",
-" .XXXXXXXXXXXXXX ",
-" .XXXXXXXXXXXXXX ",
-" .XXXXXXXoXXXXXX ",
-" .XXXXXXXooXXXXX ",
-" .XXXXooooooXXXX ",
-" .XXXXoooooooXXX ",
-" .XXXXooooooXXXX ",
-" .XXXXXXXooXXXXX ",
-" .XXXXXXXoXXXXXX ",
-" .XXXXXXXXXXXXXX ",
-" .XXXXXXXXXXXXXX ",
-" .XXXXXXXXXXXXXX ",
-"                 "};
diff --git a/include/bitmaps/obm_rgarrowi b/include/bitmaps/obm_rgarrowi
deleted file mode 100644
index b6cfb3939bef69fb9281997db712f6d106bb24bc..0000000000000000000000000000000000000000
--- a/include/bitmaps/obm_rgarrowi
+++ /dev/null
@@ -1,24 +0,0 @@
-/* XPM */
-static char * obm_rgarrowi[] = {
-"17 17 4 1",
-" 	s button_text	c black",
-".	s button_highlight	c white",
-"X	s button_shadow	c grey50",
-"o	s button_face	c grey75",
-"                 ",
-" ..............X ",
-" .ooooooooooooXX ",
-" .ooooooooooooXX ",
-" .ooooooooooooXX ",
-" .ooooooXoooooXX ",
-" .ooooooXXooooXX ",
-" .oooXXXXXXoooXX ",
-" .oooXXXXXXXooXX ",
-" .oooXXXXXX..oXX ",
-" .oooo..XX..ooXX ",
-" .ooooooX..oooXX ",
-" .ooooooo.ooooXX ",
-" .ooooooooooooXX ",
-" .XXXXXXXXXXXXXX ",
-" XXXXXXXXXXXXXXX ",
-"                 "};
diff --git a/include/bitmaps/obm_size b/include/bitmaps/obm_size
deleted file mode 100644
index 74ef0b013414244914839d1c4b184fcddc216fe7..0000000000000000000000000000000000000000
--- a/include/bitmaps/obm_size
+++ /dev/null
@@ -1,18 +0,0 @@
-/* XPM */
-static char * obm_size[] = {
-"13 13 2 1",
-" 	s white	c white",
-".	s black	c black",
-"             ",
-"             ",
-"             ",
-"             ",
-"             ",
-"             ",
-"........     ",
-"........     ",
-"     ...     ",
-"     ...     ",
-"     ...     ",
-"     ...     ",
-"     ...     "};
diff --git a/include/bitmaps/obm_trtype b/include/bitmaps/obm_trtype
deleted file mode 100644
index c74a0028e438821d5c3e45a096a3daf63e6ea34e..0000000000000000000000000000000000000000
--- a/include/bitmaps/obm_trtype
+++ /dev/null
@@ -1,20 +0,0 @@
-/* XPM */
-static char * obm_trtype[] = {
-"14 14 3 1",
-" 	s white c white",
-".	s black c black",
-"o	s dkgray c #808080",
-"              ",
-" oooooooo     ",
-" oo oo oo     ",
-" o  oo  o     ",
-" o  o........ ",
-"    o.. .. .. ",
-"    o.  ..  . ",
-"    o.  ..  . ",
-"    oo  ..    ",
-" ooooooo..    ",
-"        ..    ",
-"        ..    ",
-"      ......  ",
-"              "};
diff --git a/include/bitmaps/obm_uparrow b/include/bitmaps/obm_uparrow
deleted file mode 100644
index 532d54d87914f260b91ae4e89518af2377414612..0000000000000000000000000000000000000000
--- a/include/bitmaps/obm_uparrow
+++ /dev/null
@@ -1,25 +0,0 @@
-/* XPM */
-static char * obm_uparrow[] = {
-"17 17 5 1",
-" 	s window_frame	c black",
-".	s button_highlight	c white",
-"X	s button_shadow	c grey50",
-"o	s button_face	c grey75",
-"O	s button_text	c black",
-"                 ",
-" ..............X ",
-" .ooooooooooooXX ",
-" .ooooooooooooXX ",
-" .ooooooooooooXX ",
-" .ooooooOoooooXX ",
-" .oooooOOOooooXX ",
-" .ooooOOOOOoooXX ",
-" .oooOOOOOOOooXX ",
-" .oooooOOOooooXX ",
-" .oooooOOOooooXX ",
-" .oooooOOOooooXX ",
-" .ooooooooooooXX ",
-" .ooooooooooooXX ",
-" .XXXXXXXXXXXXXX ",
-" XXXXXXXXXXXXXXX ",
-"                 "};
diff --git a/include/bitmaps/obm_uparrowd b/include/bitmaps/obm_uparrowd
deleted file mode 100644
index a4c3688980e6e191593c51c7d738aafdc3b9a9d5..0000000000000000000000000000000000000000
--- a/include/bitmaps/obm_uparrowd
+++ /dev/null
@@ -1,24 +0,0 @@
-/* XPM */
-static char * obm_uparrowd[] = {
-"17 17 4 1",
-" 	s window_frame	c black",
-".	s button_shadow	c grey50",
-"X	s button_face	c grey75",
-"o	s button_text	c black",
-"                 ",
-" ............... ",
-" .XXXXXXXXXXXXXX ",
-" .XXXXXXXXXXXXXX ",
-" .XXXXXXXXXXXXXX ",
-" .XXXXXXXXXXXXXX ",
-" .XXXXXXXoXXXXXX ",
-" .XXXXXXoooXXXXX ",
-" .XXXXXoooooXXXX ",
-" .XXXXoooooooXXX ",
-" .XXXXXXoooXXXXX ",
-" .XXXXXXoooXXXXX ",
-" .XXXXXXoooXXXXX ",
-" .XXXXXXXXXXXXXX ",
-" .XXXXXXXXXXXXXX ",
-" .XXXXXXXXXXXXXX ",
-"                 "};
diff --git a/include/bitmaps/obm_uparrowi b/include/bitmaps/obm_uparrowi
deleted file mode 100644
index d186beffb678bfad561d333d082990330dcda229..0000000000000000000000000000000000000000
--- a/include/bitmaps/obm_uparrowi
+++ /dev/null
@@ -1,24 +0,0 @@
-/* XPM */
-static char * obm_uparrowi[] = {
-"17 17 4 1",
-" 	s button_text	c black",
-".	s button_highlight	c white",
-"X	s button_shadow	c grey50",
-"o	s button_face	c grey75",
-"                 ",
-" ..............X ",
-" .ooooooooooooXX ",
-" .ooooooooooooXX ",
-" .ooooooooooooXX ",
-" .ooooooXoooooXX ",
-" .oooooXXXooooXX ",
-" .ooooXXXXXoooXX ",
-" .oooXXXXXXXooXX ",
-" .ooo..XXXo..oXX ",
-" .oooooXXX.oooXX ",
-" .oooooXXX.oooXX ",
-" .oooooo...oooXX ",
-" .ooooooooooooXX ",
-" .XXXXXXXXXXXXXX ",
-" XXXXXXXXXXXXXXX ",
-"                 "};
diff --git a/windows/cursoricon.c b/windows/cursoricon.c
index 86a692cee038678f92701af12dd4a7364e024ffe..35391ff33d1563f18c24673548dd73c11cd077ff 100644
--- a/windows/cursoricon.c
+++ b/windows/cursoricon.c
@@ -2109,13 +2109,15 @@ static HBITMAP BITMAP_Load( HINSTANCE instance,LPCWSTR name, UINT loadflags )
     HGLOBAL hFix;
     int size;
 
-    if (!(loadflags & LR_LOADFROMFILE)) {
-      if (!instance)  /* OEM bitmap */
+    if (!(loadflags & LR_LOADFROMFILE))
+    {
+      if (!instance)
       {
-	  if (HIWORD((int)name)) return 0;
-          return USER_Driver.pLoadOEMResource( LOWORD((int)name), OEM_BITMAP );
+          /* OEM bitmap: try to load the resource from user32.dll */
+          if (HIWORD(name)) return 0;
+          if ((hbitmap = USER_Driver.pLoadOEMResource( LOWORD(name), OEM_BITMAP ))) return hbitmap;
+          if (!(instance = GetModuleHandleA("user32.dll"))) return 0;
       }
-
       if (!(hRsrc = FindResourceW( instance, name, RT_BITMAPW ))) return 0;
       if (!(handle = LoadResource( instance, hRsrc ))) return 0;