diff --git a/contrib/bkgrnd2d/plugin.cpp b/contrib/bkgrnd2d/plugin.cpp
index 319c0ac4..e665900f 100644
--- a/contrib/bkgrnd2d/plugin.cpp
+++ b/contrib/bkgrnd2d/plugin.cpp
@@ -103,28 +103,28 @@ struct toolbar_button_info_s
 struct toolbar_button_info_s toolbar_buttons[NUM_TOOLBAR_BUTTONS] =
 {
 	{
-		"bkgrnd2d_xy_toggle.bmp",
+		"bkgrnd2d_xy_toggle.png",
 		"xy background",
 		"Toggle xy background image",
 		DoBkgrndToggleXY,
 		IToolbarButton::eToggleButton
 	},
 	{
-		"bkgrnd2d_xz_toggle.bmp",
+		"bkgrnd2d_xz_toggle.png",
 		"xz background",
 		"Toggle xz background image",
 		DoBkgrndToggleXZ,
 		IToolbarButton::eToggleButton
 	},
 	{
-		"bkgrnd2d_yz_toggle.bmp",
+		"bkgrnd2d_yz_toggle.png",
 		"yz background",
 		"Toggle yz background image",
 		DoBkgrndToggleYZ,
 		IToolbarButton::eToggleButton
 	},
 	{
-		"bkgrnd2d_conf.bmp",
+		"bkgrnd2d_conf.png",
 		"Configure",
 		"Configure background images",
 		ShowBackgroundDialog,
diff --git a/contrib/bobtoolz/bobToolz-GTK.cpp b/contrib/bobtoolz/bobToolz-GTK.cpp
index 8143bd67..2a38b496 100644
--- a/contrib/bobtoolz/bobToolz-GTK.cpp
+++ b/contrib/bobtoolz/bobToolz-GTK.cpp
@@ -125,15 +125,15 @@ class CBobtoolzToolbarButton : public IToolbarButton
 public:
 virtual const char* getImage() const {
 	switch ( mIndex ) {
-	case 0: return "bobtoolz_cleanup.bmp";
-	case 1: return "bobtoolz_poly.bmp";
-	case 2: return "bobtoolz_caulk.bmp";
-	case 3: return "bobtoolz_treeplanter.bmp";
-	case 4: return "bobtoolz_trainpathplot.bmp";
-	case 5: return "bobtoolz_dropent.bmp";
-	case 6: return "bobtoolz_merge.bmp";
-	case 7: return "bobtoolz_split.bmp";
-	case 8: return "bobtoolz_turnedge.bmp";
+	case 0: return "bobtoolz_cleanup.png";
+	case 1: return "bobtoolz_poly.png";
+	case 2: return "bobtoolz_caulk.png";
+	case 3: return "bobtoolz_treeplanter.png";
+	case 4: return "bobtoolz_trainpathplot.png";
+	case 5: return "bobtoolz_dropent.png";
+	case 6: return "bobtoolz_merge.png";
+	case 7: return "bobtoolz_split.png";
+	case 8: return "bobtoolz_turnedge.png";
 	}
 	return NULL;
 }
diff --git a/contrib/camera/camera.cpp b/contrib/camera/camera.cpp
index 9c133941..8e8ecfa3 100644
--- a/contrib/camera/camera.cpp
+++ b/contrib/camera/camera.cpp
@@ -134,7 +134,7 @@ class CameraInspectorButton : public IToolbarButton
 {
 public:
 virtual const char* getImage() const {
-	return "camera_insp.bmp";
+	return "camera_insp.png";
 }
 virtual const char* getText() const {
 	return "Inspector";
diff --git a/install/modules/bitmaps/bkgrnd2d_conf.bmp b/install/modules/bitmaps/bkgrnd2d_conf.bmp
deleted file mode 100644
index bc307e26..00000000
Binary files a/install/modules/bitmaps/bkgrnd2d_conf.bmp and /dev/null differ
diff --git a/install/modules/bitmaps/bkgrnd2d_xy_toggle.bmp b/install/modules/bitmaps/bkgrnd2d_xy_toggle.bmp
deleted file mode 100644
index d95fa284..00000000
Binary files a/install/modules/bitmaps/bkgrnd2d_xy_toggle.bmp and /dev/null differ
diff --git a/install/modules/bitmaps/bkgrnd2d_xz_toggle.bmp b/install/modules/bitmaps/bkgrnd2d_xz_toggle.bmp
deleted file mode 100644
index 6af8308d..00000000
Binary files a/install/modules/bitmaps/bkgrnd2d_xz_toggle.bmp and /dev/null differ
diff --git a/install/modules/bitmaps/bkgrnd2d_yz_toggle.bmp b/install/modules/bitmaps/bkgrnd2d_yz_toggle.bmp
deleted file mode 100644
index de9f4df9..00000000
Binary files a/install/modules/bitmaps/bkgrnd2d_yz_toggle.bmp and /dev/null differ
diff --git a/install/modules/bitmaps/bobtoolz_caulk.bmp b/install/modules/bitmaps/bobtoolz_caulk.bmp
deleted file mode 100644
index 52239503..00000000
Binary files a/install/modules/bitmaps/bobtoolz_caulk.bmp and /dev/null differ
diff --git a/install/modules/bitmaps/bobtoolz_cleanup.bmp b/install/modules/bitmaps/bobtoolz_cleanup.bmp
deleted file mode 100644
index 33cc9490..00000000
Binary files a/install/modules/bitmaps/bobtoolz_cleanup.bmp and /dev/null differ
diff --git a/install/modules/bitmaps/bobtoolz_dropent.bmp b/install/modules/bitmaps/bobtoolz_dropent.bmp
deleted file mode 100644
index 2fcdcba3..00000000
Binary files a/install/modules/bitmaps/bobtoolz_dropent.bmp and /dev/null differ
diff --git a/install/modules/bitmaps/bobtoolz_merge.bmp b/install/modules/bitmaps/bobtoolz_merge.bmp
deleted file mode 100644
index cc5e272c..00000000
Binary files a/install/modules/bitmaps/bobtoolz_merge.bmp and /dev/null differ
diff --git a/install/modules/bitmaps/bobtoolz_poly.bmp b/install/modules/bitmaps/bobtoolz_poly.bmp
deleted file mode 100644
index ed720e90..00000000
Binary files a/install/modules/bitmaps/bobtoolz_poly.bmp and /dev/null differ
diff --git a/install/modules/bitmaps/bobtoolz_split.bmp b/install/modules/bitmaps/bobtoolz_split.bmp
deleted file mode 100644
index fbb1571c..00000000
Binary files a/install/modules/bitmaps/bobtoolz_split.bmp and /dev/null differ
diff --git a/install/modules/bitmaps/bobtoolz_trainpathplot.bmp b/install/modules/bitmaps/bobtoolz_trainpathplot.bmp
deleted file mode 100644
index 66537dc1..00000000
Binary files a/install/modules/bitmaps/bobtoolz_trainpathplot.bmp and /dev/null differ
diff --git a/install/modules/bitmaps/bobtoolz_treeplanter.bmp b/install/modules/bitmaps/bobtoolz_treeplanter.bmp
deleted file mode 100644
index 08f55f3c..00000000
Binary files a/install/modules/bitmaps/bobtoolz_treeplanter.bmp and /dev/null differ
diff --git a/install/modules/bitmaps/bobtoolz_turnedge.bmp b/install/modules/bitmaps/bobtoolz_turnedge.bmp
deleted file mode 100644
index b72cb2aa..00000000
Binary files a/install/modules/bitmaps/bobtoolz_turnedge.bmp and /dev/null differ
diff --git a/install/modules/bitmaps/camera_insp.bmp b/install/modules/bitmaps/camera_insp.bmp
deleted file mode 100644
index 1286716e..00000000
Binary files a/install/modules/bitmaps/camera_insp.bmp and /dev/null differ
diff --git a/install/modules/bitmaps/model_reload_entity.bmp b/install/modules/bitmaps/model_reload_entity.bmp
deleted file mode 100644
index 800a0dfe..00000000
Binary files a/install/modules/bitmaps/model_reload_entity.bmp and /dev/null differ
diff --git a/install/modules/bitmaps/picomodel.bmp b/install/modules/bitmaps/picomodel.bmp
deleted file mode 100644
index 0d9c88e0..00000000
Binary files a/install/modules/bitmaps/picomodel.bmp and /dev/null differ
diff --git a/install/modules/bitmaps/sample.bmp b/install/modules/bitmaps/sample.bmp
deleted file mode 100644
index 05e34c8c..00000000
Binary files a/install/modules/bitmaps/sample.bmp and /dev/null differ