diff --git a/bitmap2component/bitmap2cmp_gui.cpp b/bitmap2component/bitmap2cmp_gui.cpp
index 679c636446..be1d52a68c 100644
--- a/bitmap2component/bitmap2cmp_gui.cpp
+++ b/bitmap2component/bitmap2cmp_gui.cpp
@@ -29,7 +29,7 @@
 #include "potracelib.h"
 #include "bitmap_io.h"
 
-//#include "bitmap2component.xpm"
+#include "bitmap2component.xpm"
 
 
 #define KEYWORD_FRAME_POSX wxT( "bmconverter_Pos_x" )
@@ -82,9 +82,13 @@ BM2CMP_FRAME::BM2CMP_FRAME() : BM2CMP_FRAME_BASE( NULL )
     m_Config->Read( KEYWORD_FRAME_SIZEX, & m_FrameSize.x, -1 );
     m_Config->Read( KEYWORD_FRAME_SIZEY, & m_FrameSize.y, -1 );
 
+    #ifdef __WINDOWS__
     SetIcon( wxICON( bitmap2component_icon ) );
+    #else
+    SetIcon( wxICON( bitmap2component ) );
+    #endif
 
-    wxString msg( wxT( "  0000  " ) );
+    wxString msg( wxT( "000000" ) );
     m_gridInfo->SetCellValue( 1, 0, msg );
     m_gridInfo->SetCellValue( 2, 0, msg );
     if( GetSizer() )
diff --git a/bitmap2component/bitmap2component.ico b/bitmap2component/bitmap2component.ico
new file mode 100644
index 0000000000..476513d76f
Binary files /dev/null and b/bitmap2component/bitmap2component.ico differ
diff --git a/bitmap2component/bitmap2component.rc b/bitmap2component/bitmap2component.rc
new file mode 100644
index 0000000000..98ff16a927
--- /dev/null
+++ b/bitmap2component/bitmap2component.rc
@@ -0,0 +1,2 @@
+bitmap2component_icon ICON bitmap2component.ico
+#include "wx/msw/wx.rc"
diff --git a/bitmap2component/bitmap2component.xpm b/bitmap2component/bitmap2component.xpm
index b33d7a583b..e968612ef9 100644
--- a/bitmap2component/bitmap2component.xpm
+++ b/bitmap2component/bitmap2component.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char *bitmap2component_xpm[] = {
+const char *bitmap2component_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 16 1",
 "@ c #592904",