diff --git a/install/bitmaps/brush_flipx.bmp b/install/bitmaps/brush_flipx.bmp
deleted file mode 100644
index 91f3d669..00000000
Binary files a/install/bitmaps/brush_flipx.bmp and /dev/null differ
diff --git a/install/bitmaps/brush_flipx.png b/install/bitmaps/brush_flipx.png
new file mode 100644
index 00000000..39a98da3
Binary files /dev/null and b/install/bitmaps/brush_flipx.png differ
diff --git a/install/bitmaps/brush_flipy.bmp b/install/bitmaps/brush_flipy.bmp
deleted file mode 100644
index 0f8e65c6..00000000
Binary files a/install/bitmaps/brush_flipy.bmp and /dev/null differ
diff --git a/install/bitmaps/brush_flipy.png b/install/bitmaps/brush_flipy.png
new file mode 100644
index 00000000..e58e2284
Binary files /dev/null and b/install/bitmaps/brush_flipy.png differ
diff --git a/install/bitmaps/brush_flipz.bmp b/install/bitmaps/brush_flipz.bmp
deleted file mode 100644
index 38c20ff2..00000000
Binary files a/install/bitmaps/brush_flipz.bmp and /dev/null differ
diff --git a/install/bitmaps/brush_flipz.png b/install/bitmaps/brush_flipz.png
new file mode 100644
index 00000000..eb120e73
Binary files /dev/null and b/install/bitmaps/brush_flipz.png differ
diff --git a/install/bitmaps/brush_rotatex.bmp b/install/bitmaps/brush_rotatex.bmp
deleted file mode 100644
index b079071e..00000000
Binary files a/install/bitmaps/brush_rotatex.bmp and /dev/null differ
diff --git a/install/bitmaps/brush_rotatex.png b/install/bitmaps/brush_rotatex.png
new file mode 100644
index 00000000..cfdbbd22
Binary files /dev/null and b/install/bitmaps/brush_rotatex.png differ
diff --git a/install/bitmaps/brush_rotatey.bmp b/install/bitmaps/brush_rotatey.bmp
deleted file mode 100644
index efcfec24..00000000
Binary files a/install/bitmaps/brush_rotatey.bmp and /dev/null differ
diff --git a/install/bitmaps/brush_rotatey.png b/install/bitmaps/brush_rotatey.png
new file mode 100644
index 00000000..e8ead705
Binary files /dev/null and b/install/bitmaps/brush_rotatey.png differ
diff --git a/install/bitmaps/brush_rotatez.bmp b/install/bitmaps/brush_rotatez.bmp
deleted file mode 100644
index fcea0814..00000000
Binary files a/install/bitmaps/brush_rotatez.bmp and /dev/null differ
diff --git a/install/bitmaps/brush_rotatez.png b/install/bitmaps/brush_rotatez.png
new file mode 100644
index 00000000..a849fbfd
Binary files /dev/null and b/install/bitmaps/brush_rotatez.png differ
diff --git a/install/bitmaps/cap_bevel.bmp b/install/bitmaps/cap_bevel.bmp
deleted file mode 100644
index 0de32442..00000000
Binary files a/install/bitmaps/cap_bevel.bmp and /dev/null differ
diff --git a/install/bitmaps/cap_bevel.png b/install/bitmaps/cap_bevel.png
new file mode 100644
index 00000000..d190d1c9
Binary files /dev/null and b/install/bitmaps/cap_bevel.png differ
diff --git a/install/bitmaps/cap_endcap.bmp b/install/bitmaps/cap_endcap.bmp
deleted file mode 100644
index 8e6c7f2a..00000000
Binary files a/install/bitmaps/cap_endcap.bmp and /dev/null differ
diff --git a/install/bitmaps/cap_endcap.png b/install/bitmaps/cap_endcap.png
new file mode 100644
index 00000000..45e5c0d7
Binary files /dev/null and b/install/bitmaps/cap_endcap.png differ
diff --git a/install/bitmaps/cap_ibevel.bmp b/install/bitmaps/cap_ibevel.bmp
deleted file mode 100644
index ccab98da..00000000
Binary files a/install/bitmaps/cap_ibevel.bmp and /dev/null differ
diff --git a/install/bitmaps/cap_ibevel.png b/install/bitmaps/cap_ibevel.png
new file mode 100644
index 00000000..cd84c785
Binary files /dev/null and b/install/bitmaps/cap_ibevel.png differ
diff --git a/install/bitmaps/cap_iendcap.bmp b/install/bitmaps/cap_iendcap.bmp
deleted file mode 100644
index 9640c9ae..00000000
Binary files a/install/bitmaps/cap_iendcap.bmp and /dev/null differ
diff --git a/install/bitmaps/cap_iendcap.png b/install/bitmaps/cap_iendcap.png
new file mode 100644
index 00000000..bbc013c6
Binary files /dev/null and b/install/bitmaps/cap_iendcap.png differ
diff --git a/install/bitmaps/curve_cap.bmp b/install/bitmaps/curve_cap.bmp
deleted file mode 100644
index e9d00a21..00000000
Binary files a/install/bitmaps/curve_cap.bmp and /dev/null differ
diff --git a/install/bitmaps/curve_cap.png b/install/bitmaps/curve_cap.png
new file mode 100644
index 00000000..52ff4fdc
Binary files /dev/null and b/install/bitmaps/curve_cap.png differ
diff --git a/install/bitmaps/dontselectcurve.bmp b/install/bitmaps/dontselectcurve.bmp
deleted file mode 100644
index a7b97954..00000000
Binary files a/install/bitmaps/dontselectcurve.bmp and /dev/null differ
diff --git a/install/bitmaps/dontselectcurve.png b/install/bitmaps/dontselectcurve.png
new file mode 100644
index 00000000..7c4373d7
Binary files /dev/null and b/install/bitmaps/dontselectcurve.png differ
diff --git a/install/bitmaps/dontselectmodel.bmp b/install/bitmaps/dontselectmodel.bmp
deleted file mode 100644
index e81b1189..00000000
Binary files a/install/bitmaps/dontselectmodel.bmp and /dev/null differ
diff --git a/install/bitmaps/dontselectmodel.png b/install/bitmaps/dontselectmodel.png
new file mode 100644
index 00000000..510e5cda
Binary files /dev/null and b/install/bitmaps/dontselectmodel.png differ
diff --git a/install/bitmaps/file_open.bmp b/install/bitmaps/file_open.bmp
deleted file mode 100644
index 1f1770c3..00000000
Binary files a/install/bitmaps/file_open.bmp and /dev/null differ
diff --git a/install/bitmaps/file_open.png b/install/bitmaps/file_open.png
new file mode 100644
index 00000000..db1fb7bf
Binary files /dev/null and b/install/bitmaps/file_open.png differ
diff --git a/install/bitmaps/file_save.bmp b/install/bitmaps/file_save.bmp
deleted file mode 100644
index 651afb68..00000000
Binary files a/install/bitmaps/file_save.bmp and /dev/null differ
diff --git a/install/bitmaps/file_save.png b/install/bitmaps/file_save.png
new file mode 100644
index 00000000..e1a1af8e
Binary files /dev/null and b/install/bitmaps/file_save.png differ
diff --git a/install/bitmaps/icon.bmp b/install/bitmaps/icon.bmp
deleted file mode 100644
index 4224da83..00000000
Binary files a/install/bitmaps/icon.bmp and /dev/null differ
diff --git a/install/bitmaps/icon.png b/install/bitmaps/icon.png
new file mode 100644
index 00000000..b42e1c9a
Binary files /dev/null and b/install/bitmaps/icon.png differ
diff --git a/install/bitmaps/patch_bend.bmp b/install/bitmaps/patch_bend.bmp
deleted file mode 100644
index af4fc94c..00000000
Binary files a/install/bitmaps/patch_bend.bmp and /dev/null differ
diff --git a/install/bitmaps/patch_bend.png b/install/bitmaps/patch_bend.png
new file mode 100644
index 00000000..36b055ca
Binary files /dev/null and b/install/bitmaps/patch_bend.png differ
diff --git a/install/bitmaps/patch_drilldown.bmp b/install/bitmaps/patch_drilldown.bmp
deleted file mode 100644
index 01ebcf39..00000000
Binary files a/install/bitmaps/patch_drilldown.bmp and /dev/null differ
diff --git a/install/bitmaps/patch_drilldown.png b/install/bitmaps/patch_drilldown.png
new file mode 100644
index 00000000..cdb6458b
Binary files /dev/null and b/install/bitmaps/patch_drilldown.png differ
diff --git a/install/bitmaps/patch_insdel.bmp b/install/bitmaps/patch_insdel.bmp
deleted file mode 100644
index b60b76b0..00000000
Binary files a/install/bitmaps/patch_insdel.bmp and /dev/null differ
diff --git a/install/bitmaps/patch_insdel.png b/install/bitmaps/patch_insdel.png
new file mode 100644
index 00000000..bd104d69
Binary files /dev/null and b/install/bitmaps/patch_insdel.png differ
diff --git a/install/bitmaps/patch_showboundingbox.bmp b/install/bitmaps/patch_showboundingbox.bmp
deleted file mode 100644
index 357cfaf1..00000000
Binary files a/install/bitmaps/patch_showboundingbox.bmp and /dev/null differ
diff --git a/install/bitmaps/patch_showboundingbox.png b/install/bitmaps/patch_showboundingbox.png
new file mode 100644
index 00000000..f4a05cc9
Binary files /dev/null and b/install/bitmaps/patch_showboundingbox.png differ
diff --git a/install/bitmaps/patch_weld.bmp b/install/bitmaps/patch_weld.bmp
deleted file mode 100644
index a0c99730..00000000
Binary files a/install/bitmaps/patch_weld.bmp and /dev/null differ
diff --git a/install/bitmaps/patch_weld.png b/install/bitmaps/patch_weld.png
new file mode 100644
index 00000000..d0319d78
Binary files /dev/null and b/install/bitmaps/patch_weld.png differ
diff --git a/install/bitmaps/patch_wireframe.bmp b/install/bitmaps/patch_wireframe.bmp
deleted file mode 100644
index 9804274f..00000000
Binary files a/install/bitmaps/patch_wireframe.bmp and /dev/null differ
diff --git a/install/bitmaps/patch_wireframe.png b/install/bitmaps/patch_wireframe.png
new file mode 100644
index 00000000..fc805599
Binary files /dev/null and b/install/bitmaps/patch_wireframe.png differ
diff --git a/install/bitmaps/popup_selection.bmp b/install/bitmaps/popup_selection.bmp
deleted file mode 100644
index 676c4d98..00000000
Binary files a/install/bitmaps/popup_selection.bmp and /dev/null differ
diff --git a/install/bitmaps/popup_selection.png b/install/bitmaps/popup_selection.png
new file mode 100644
index 00000000..2c5aaa40
Binary files /dev/null and b/install/bitmaps/popup_selection.png differ
diff --git a/install/bitmaps/scalelockx.bmp b/install/bitmaps/scalelockx.bmp
deleted file mode 100644
index 61363da2..00000000
Binary files a/install/bitmaps/scalelockx.bmp and /dev/null differ
diff --git a/install/bitmaps/scalelockx.png b/install/bitmaps/scalelockx.png
new file mode 100644
index 00000000..2b47f1bb
Binary files /dev/null and b/install/bitmaps/scalelockx.png differ
diff --git a/install/bitmaps/scalelocky.bmp b/install/bitmaps/scalelocky.bmp
deleted file mode 100644
index 812394db..00000000
Binary files a/install/bitmaps/scalelocky.bmp and /dev/null differ
diff --git a/install/bitmaps/scalelocky.png b/install/bitmaps/scalelocky.png
new file mode 100644
index 00000000..50d1965e
Binary files /dev/null and b/install/bitmaps/scalelocky.png differ
diff --git a/install/bitmaps/scalelockz.bmp b/install/bitmaps/scalelockz.bmp
deleted file mode 100644
index 5692e4a7..00000000
Binary files a/install/bitmaps/scalelockz.bmp and /dev/null differ
diff --git a/install/bitmaps/scalelockz.png b/install/bitmaps/scalelockz.png
new file mode 100644
index 00000000..c469b7fc
Binary files /dev/null and b/install/bitmaps/scalelockz.png differ
diff --git a/install/bitmaps/select_mouserotate.bmp b/install/bitmaps/select_mouserotate.bmp
deleted file mode 100644
index 0139fd55..00000000
Binary files a/install/bitmaps/select_mouserotate.bmp and /dev/null differ
diff --git a/install/bitmaps/select_mouserotate.png b/install/bitmaps/select_mouserotate.png
new file mode 100644
index 00000000..3d40c4e0
Binary files /dev/null and b/install/bitmaps/select_mouserotate.png differ
diff --git a/install/bitmaps/select_mousescale.bmp b/install/bitmaps/select_mousescale.bmp
deleted file mode 100644
index 7cac2881..00000000
Binary files a/install/bitmaps/select_mousescale.bmp and /dev/null differ
diff --git a/install/bitmaps/select_mousescale.png b/install/bitmaps/select_mousescale.png
new file mode 100644
index 00000000..c65b9c8c
Binary files /dev/null and b/install/bitmaps/select_mousescale.png differ
diff --git a/install/bitmaps/selection_csgmerge.bmp b/install/bitmaps/selection_csgmerge.bmp
deleted file mode 100644
index a77eba14..00000000
Binary files a/install/bitmaps/selection_csgmerge.bmp and /dev/null differ
diff --git a/install/bitmaps/selection_csgmerge.png b/install/bitmaps/selection_csgmerge.png
new file mode 100644
index 00000000..52f88d75
Binary files /dev/null and b/install/bitmaps/selection_csgmerge.png differ
diff --git a/install/bitmaps/selection_csgsubtract.bmp b/install/bitmaps/selection_csgsubtract.bmp
deleted file mode 100644
index 902f32f5..00000000
Binary files a/install/bitmaps/selection_csgsubtract.bmp and /dev/null differ
diff --git a/install/bitmaps/selection_csgsubtract.png b/install/bitmaps/selection_csgsubtract.png
new file mode 100644
index 00000000..b010f874
Binary files /dev/null and b/install/bitmaps/selection_csgsubtract.png differ
diff --git a/install/bitmaps/selection_makehollow.bmp b/install/bitmaps/selection_makehollow.bmp
deleted file mode 100644
index 1b62f223..00000000
Binary files a/install/bitmaps/selection_makehollow.bmp and /dev/null differ
diff --git a/install/bitmaps/selection_makehollow.png b/install/bitmaps/selection_makehollow.png
new file mode 100644
index 00000000..b58b73cb
Binary files /dev/null and b/install/bitmaps/selection_makehollow.png differ
diff --git a/install/bitmaps/selection_selectcompletetall.bmp b/install/bitmaps/selection_selectcompletetall.bmp
deleted file mode 100644
index 1f911e8c..00000000
Binary files a/install/bitmaps/selection_selectcompletetall.bmp and /dev/null differ
diff --git a/install/bitmaps/selection_selectcompletetall.png b/install/bitmaps/selection_selectcompletetall.png
new file mode 100644
index 00000000..7c499175
Binary files /dev/null and b/install/bitmaps/selection_selectcompletetall.png differ
diff --git a/install/bitmaps/selection_selectinside.bmp b/install/bitmaps/selection_selectinside.bmp
deleted file mode 100644
index 5670d3ad..00000000
Binary files a/install/bitmaps/selection_selectinside.bmp and /dev/null differ
diff --git a/install/bitmaps/selection_selectinside.png b/install/bitmaps/selection_selectinside.png
new file mode 100644
index 00000000..eadd586d
Binary files /dev/null and b/install/bitmaps/selection_selectinside.png differ
diff --git a/install/bitmaps/selection_selectpartialtall.bmp b/install/bitmaps/selection_selectpartialtall.bmp
deleted file mode 100644
index 77b418be..00000000
Binary files a/install/bitmaps/selection_selectpartialtall.bmp and /dev/null differ
diff --git a/install/bitmaps/selection_selectpartialtall.png b/install/bitmaps/selection_selectpartialtall.png
new file mode 100644
index 00000000..d51ea3b1
Binary files /dev/null and b/install/bitmaps/selection_selectpartialtall.png differ
diff --git a/install/bitmaps/selection_selecttouching.bmp b/install/bitmaps/selection_selecttouching.bmp
deleted file mode 100644
index 9a60815d..00000000
Binary files a/install/bitmaps/selection_selecttouching.bmp and /dev/null differ
diff --git a/install/bitmaps/selection_selecttouching.png b/install/bitmaps/selection_selecttouching.png
new file mode 100644
index 00000000..e12e1cf0
Binary files /dev/null and b/install/bitmaps/selection_selecttouching.png differ
diff --git a/install/bitmaps/show_entities.bmp b/install/bitmaps/show_entities.bmp
deleted file mode 100644
index 9188bee6..00000000
Binary files a/install/bitmaps/show_entities.bmp and /dev/null differ
diff --git a/install/bitmaps/show_entities.png b/install/bitmaps/show_entities.png
new file mode 100644
index 00000000..d094bf26
Binary files /dev/null and b/install/bitmaps/show_entities.png differ
diff --git a/install/bitmaps/splash.png b/install/bitmaps/splash.png
new file mode 100644
index 00000000..0c9bf224
Binary files /dev/null and b/install/bitmaps/splash.png differ
diff --git a/install/bitmaps/textures_popup.bmp b/install/bitmaps/textures_popup.bmp
deleted file mode 100644
index 5333382f..00000000
Binary files a/install/bitmaps/textures_popup.bmp and /dev/null differ
diff --git a/install/bitmaps/textures_popup.png b/install/bitmaps/textures_popup.png
new file mode 100644
index 00000000..48ab4019
Binary files /dev/null and b/install/bitmaps/textures_popup.png differ
diff --git a/install/bitmaps/view_cameratoggle.bmp b/install/bitmaps/view_cameratoggle.bmp
deleted file mode 100644
index 4ec79ed6..00000000
Binary files a/install/bitmaps/view_cameratoggle.bmp and /dev/null differ
diff --git a/install/bitmaps/view_cameratoggle.png b/install/bitmaps/view_cameratoggle.png
new file mode 100644
index 00000000..94ac8266
Binary files /dev/null and b/install/bitmaps/view_cameratoggle.png differ
diff --git a/install/bitmaps/view_cameraupdate.bmp b/install/bitmaps/view_cameraupdate.bmp
deleted file mode 100644
index dbb11956..00000000
Binary files a/install/bitmaps/view_cameraupdate.bmp and /dev/null differ
diff --git a/install/bitmaps/view_cameraupdate.png b/install/bitmaps/view_cameraupdate.png
new file mode 100644
index 00000000..737b2cfb
Binary files /dev/null and b/install/bitmaps/view_cameraupdate.png differ
diff --git a/install/bitmaps/view_change.bmp b/install/bitmaps/view_change.bmp
deleted file mode 100644
index 31b609e5..00000000
Binary files a/install/bitmaps/view_change.bmp and /dev/null differ
diff --git a/install/bitmaps/view_change.png b/install/bitmaps/view_change.png
new file mode 100644
index 00000000..c13f4679
Binary files /dev/null and b/install/bitmaps/view_change.png differ
diff --git a/install/bitmaps/view_clipper.bmp b/install/bitmaps/view_clipper.bmp
deleted file mode 100644
index 4ef20566..00000000
Binary files a/install/bitmaps/view_clipper.bmp and /dev/null differ
diff --git a/install/bitmaps/view_clipper.png b/install/bitmaps/view_clipper.png
new file mode 100644
index 00000000..70b3753f
Binary files /dev/null and b/install/bitmaps/view_clipper.png differ
diff --git a/install/bitmaps/view_cubicclipping.bmp b/install/bitmaps/view_cubicclipping.bmp
deleted file mode 100644
index 7c6d23c1..00000000
Binary files a/install/bitmaps/view_cubicclipping.bmp and /dev/null differ
diff --git a/install/bitmaps/view_cubicclipping.png b/install/bitmaps/view_cubicclipping.png
new file mode 100644
index 00000000..0f846a84
Binary files /dev/null and b/install/bitmaps/view_cubicclipping.png differ
diff --git a/install/bitmaps/view_entity.bmp b/install/bitmaps/view_entity.bmp
deleted file mode 100644
index 851ec2c3..00000000
Binary files a/install/bitmaps/view_entity.bmp and /dev/null differ
diff --git a/install/bitmaps/view_entity.png b/install/bitmaps/view_entity.png
new file mode 100644
index 00000000..c6a51841
Binary files /dev/null and b/install/bitmaps/view_entity.png differ
diff --git a/install/bitmaps/window1.bmp b/install/bitmaps/window1.bmp
deleted file mode 100644
index f308f6ef..00000000
Binary files a/install/bitmaps/window1.bmp and /dev/null differ
diff --git a/install/bitmaps/window1.png b/install/bitmaps/window1.png
new file mode 100644
index 00000000..1301d0ad
Binary files /dev/null and b/install/bitmaps/window1.png differ
diff --git a/install/bitmaps/window2.bmp b/install/bitmaps/window2.bmp
deleted file mode 100644
index b98b8691..00000000
Binary files a/install/bitmaps/window2.bmp and /dev/null differ
diff --git a/install/bitmaps/window2.png b/install/bitmaps/window2.png
new file mode 100644
index 00000000..8bd1092f
Binary files /dev/null and b/install/bitmaps/window2.png differ
diff --git a/install/bitmaps/window3.bmp b/install/bitmaps/window3.bmp
deleted file mode 100644
index 2ea6feb8..00000000
Binary files a/install/bitmaps/window3.bmp and /dev/null differ
diff --git a/install/bitmaps/window3.png b/install/bitmaps/window3.png
new file mode 100644
index 00000000..a389dc15
Binary files /dev/null and b/install/bitmaps/window3.png differ
diff --git a/install/bitmaps/window4.bmp b/install/bitmaps/window4.bmp
deleted file mode 100644
index 5b9df336..00000000
Binary files a/install/bitmaps/window4.bmp and /dev/null differ
diff --git a/install/bitmaps/window4.png b/install/bitmaps/window4.png
new file mode 100644
index 00000000..4001e0ee
Binary files /dev/null and b/install/bitmaps/window4.png differ
diff --git a/radiant/gtkdlgs.cpp b/radiant/gtkdlgs.cpp
index eeeab109..d03daa35 100644
--- a/radiant/gtkdlgs.cpp
+++ b/radiant/gtkdlgs.cpp
@@ -2962,25 +2962,25 @@ int DoCapDlg( int *type, bool *b_GroupResult ){
 	gtk_table_set_row_spacings( GTK_TABLE( table ), 5 );
 	gtk_table_set_col_spacings( GTK_TABLE( table ), 5 );
 
-	pixmap = new_pixmap( g_pParentWnd->m_pWidget, "cap_bevel.bmp" );
+	pixmap = new_image_icon("cap_bevel.png");
 	gtk_widget_show( pixmap );
 	gtk_table_attach( GTK_TABLE( table ), pixmap, 0, 1, 0, 1,
 					  (GtkAttachOptions) ( GTK_FILL ),
 					  (GtkAttachOptions) ( 0 ), 0, 0 );
 
-	pixmap = new_pixmap( g_pParentWnd->m_pWidget, "cap_endcap.bmp" );
+	pixmap = new_image_icon("cap_endcap.png");
 	gtk_widget_show( pixmap );
 	gtk_table_attach( GTK_TABLE( table ), pixmap, 0, 1, 1, 2,
 					  (GtkAttachOptions) ( GTK_FILL ),
 					  (GtkAttachOptions) ( 0 ), 0, 0 );
 
-	pixmap = new_pixmap( g_pParentWnd->m_pWidget, "cap_ibevel.bmp" );
+	pixmap = new_image_icon("cap_ibevel.png");
 	gtk_widget_show( pixmap );
 	gtk_table_attach( GTK_TABLE( table ), pixmap, 0, 1, 2, 3,
 					  (GtkAttachOptions) ( GTK_FILL ),
 					  (GtkAttachOptions) ( 0 ), 0, 0 );
 
-	pixmap = new_pixmap( g_pParentWnd->m_pWidget, "cap_iendcap.bmp" );
+	pixmap = new_image_icon("cap_iendcap.png");
 	gtk_widget_show( pixmap );
 	gtk_table_attach( GTK_TABLE( table ), pixmap, 0, 1, 3, 4,
 					  (GtkAttachOptions) ( GTK_FILL ),
diff --git a/radiant/gtkmisc.cpp b/radiant/gtkmisc.cpp
index b80e7e3f..352acac9 100644
--- a/radiant/gtkmisc.cpp
+++ b/radiant/gtkmisc.cpp
@@ -727,18 +727,6 @@ GtkWidget* new_pixmap( GtkWidget* widget, const char* filename ){
 }
 
 GtkWidget* new_image_icon(const char* filename) {
-    GError*     gErr;
-    GdkPixbuf*  iconPB;
-    
-    /*
-    iconPB = gdk_pixbuf_new_from_file(filename, &gErr);
-
-    if(iconPB)
-        return gtk_image_new_from_pixbuf(iconPB);
-    else
-        return NULL;
-        */
-
     CString str = g_strBitmapsPath;
     str += filename;
     return gtk_image_new_from_file(str);
diff --git a/radiant/preferences.cpp b/radiant/preferences.cpp
index a8bc384d..c3021346 100644
--- a/radiant/preferences.cpp
+++ b/radiant/preferences.cpp
@@ -2083,28 +2083,28 @@ void PrefsDlg::BuildDialog(){
 	gtk_table_set_col_spacings( GTK_TABLE( table ), 5 );
 
 	// view type 1
-	pixmap = new_pixmap( g_pParentWnd->m_pWidget, "window1.bmp" );
+	pixmap = new_image_icon("window1.png");
 	gtk_widget_show( pixmap );
 	gtk_table_attach( GTK_TABLE( table ), pixmap, 0, 1, 0, 1,
 					  (GtkAttachOptions) ( 0 ),
 					  (GtkAttachOptions) ( 0 ), 0, 0 );
 
 	// view type 2
-	pixmap = new_pixmap( g_pParentWnd->m_pWidget, "window2.bmp" );
+	pixmap = new_image_icon("window2.png");
 	gtk_widget_show( pixmap );
 	gtk_table_attach( GTK_TABLE( table ), pixmap, 1, 2, 0, 1,
 					  (GtkAttachOptions) ( 0 ),
 					  (GtkAttachOptions) ( 0 ), 0, 0 );
 
 	// view type 3
-	pixmap = new_pixmap( g_pParentWnd->m_pWidget, "window3.bmp" );
+	pixmap = new_image_icon("window3.png");
 	gtk_widget_show( pixmap );
 	gtk_table_attach( GTK_TABLE( table ), pixmap, 2, 3, 0, 1,
 					  (GtkAttachOptions) ( 0 ),
 					  (GtkAttachOptions) ( 0 ), 0, 0 );
 
 	// view type 4
-	pixmap = new_pixmap( g_pParentWnd->m_pWidget, "window4.bmp" );
+	pixmap = new_image_icon("window4.png");
 	gtk_widget_show( pixmap );
 	gtk_table_attach( GTK_TABLE( table ), pixmap, 3, 4, 0, 1,
 					  (GtkAttachOptions) ( 0 ),