diff --git a/ZRCola/ZRCola.fbp b/ZRCola/ZRCola.fbp
index f4151b8..d9b0a84 100644
--- a/ZRCola/ZRCola.fbp
+++ b/ZRCola/ZRCola.fbp
@@ -161,13 +161,13 @@
                         <property name="bitmap">Load From Icon Resource; edit_cut.ico; [16; 16]</property>
                         <property name="checked">0</property>
                         <property name="enabled">1</property>
-                        <property name="help">Cuts selected text and puts it on the clipboard</property>
+                        <property name="help"></property>
                         <property name="id">wxID_CUT</property>
                         <property name="kind">wxITEM_NORMAL</property>
-                        <property name="label">Cut</property>
+                        <property name="label"></property>
                         <property name="name">m_menuItemEditCut</property>
                         <property name="permission">none</property>
-                        <property name="shortcut">Ctrl+X</property>
+                        <property name="shortcut"></property>
                         <property name="unchecked_bitmap"></property>
                         <event name="OnMenuSelection"></event>
                         <event name="OnUpdateUI"></event>
@@ -176,13 +176,13 @@
                         <property name="bitmap">Load From Icon Resource; edit_copy.ico; [16; 16]</property>
                         <property name="checked">0</property>
                         <property name="enabled">1</property>
-                        <property name="help">Copies selected text to the clipboard</property>
+                        <property name="help"></property>
                         <property name="id">wxID_COPY</property>
                         <property name="kind">wxITEM_NORMAL</property>
-                        <property name="label">&amp;Copy</property>
+                        <property name="label"></property>
                         <property name="name">m_menuItemEditCopy</property>
                         <property name="permission">none</property>
-                        <property name="shortcut">Ctrl+C</property>
+                        <property name="shortcut"></property>
                         <property name="unchecked_bitmap"></property>
                         <event name="OnMenuSelection"></event>
                         <event name="OnUpdateUI"></event>
@@ -191,13 +191,13 @@
                         <property name="bitmap">Load From Icon Resource; edit_paste.ico; [16; 16]</property>
                         <property name="checked">0</property>
                         <property name="enabled">1</property>
-                        <property name="help">Inserts text from the clipboard</property>
+                        <property name="help"></property>
                         <property name="id">wxID_PASTE</property>
                         <property name="kind">wxITEM_NORMAL</property>
-                        <property name="label">&amp;Paste</property>
+                        <property name="label"></property>
                         <property name="name">m_menuItemEditPaste</property>
                         <property name="permission">none</property>
-                        <property name="shortcut">Ctrl+V</property>
+                        <property name="shortcut"></property>
                         <property name="unchecked_bitmap"></property>
                         <event name="OnMenuSelection"></event>
                         <event name="OnUpdateUI"></event>
@@ -284,7 +284,7 @@
                 <property name="aui_row"></property>
                 <property name="best_size"></property>
                 <property name="bg"></property>
-                <property name="bitmapsize"></property>
+                <property name="bitmapsize">16,16</property>
                 <property name="caption"></property>
                 <property name="caption_visible">1</property>
                 <property name="center_pane">0</property>
diff --git a/ZRCola/zrcolagui.cpp b/ZRCola/zrcolagui.cpp
index ddc094a..0fd2b84 100644
--- a/ZRCola/zrcolagui.cpp
+++ b/ZRCola/zrcolagui.cpp
@@ -36,7 +36,7 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS
 	
 	m_menuEdit = new wxMenu();
 	wxMenuItem* m_menuItemEditCut;
-	m_menuItemEditCut = new wxMenuItem( m_menuEdit, wxID_CUT, wxString( _("Cut") ) + wxT('\t') + wxT("Ctrl+X"), _("Cuts selected text and puts it on the clipboard"), wxITEM_NORMAL );
+	m_menuItemEditCut = new wxMenuItem( m_menuEdit, wxID_CUT, wxString( wxEmptyString ) , wxEmptyString, wxITEM_NORMAL );
 	#ifdef __WXMSW__
 	m_menuItemEditCut->SetBitmaps( wxIcon( wxT("edit_cut.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 16, 16 ) );
 	#elif (defined( __WXGTK__ ) || defined( __WXOSX__ ))
@@ -45,7 +45,7 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS
 	m_menuEdit->Append( m_menuItemEditCut );
 	
 	wxMenuItem* m_menuItemEditCopy;
-	m_menuItemEditCopy = new wxMenuItem( m_menuEdit, wxID_COPY, wxString( _("&Copy") ) + wxT('\t') + wxT("Ctrl+C"), _("Copies selected text to the clipboard"), wxITEM_NORMAL );
+	m_menuItemEditCopy = new wxMenuItem( m_menuEdit, wxID_COPY, wxString( wxEmptyString ) , wxEmptyString, wxITEM_NORMAL );
 	#ifdef __WXMSW__
 	m_menuItemEditCopy->SetBitmaps( wxIcon( wxT("edit_copy.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 16, 16 ) );
 	#elif (defined( __WXGTK__ ) || defined( __WXOSX__ ))
@@ -54,7 +54,7 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS
 	m_menuEdit->Append( m_menuItemEditCopy );
 	
 	wxMenuItem* m_menuItemEditPaste;
-	m_menuItemEditPaste = new wxMenuItem( m_menuEdit, wxID_PASTE, wxString( _("&Paste") ) + wxT('\t') + wxT("Ctrl+V"), _("Inserts text from the clipboard"), wxITEM_NORMAL );
+	m_menuItemEditPaste = new wxMenuItem( m_menuEdit, wxID_PASTE, wxString( wxEmptyString ) , wxEmptyString, wxITEM_NORMAL );
 	#ifdef __WXMSW__
 	m_menuItemEditPaste->SetBitmaps( wxIcon( wxT("edit_paste.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 16, 16 ) );
 	#elif (defined( __WXGTK__ ) || defined( __WXOSX__ ))
@@ -102,7 +102,8 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS
 	
 	this->SetMenuBar( m_menubar );
 	
-	m_toolbar = this->CreateToolBar( wxTB_HORIZONTAL, wxID_ANY ); 
+	m_toolbar = this->CreateToolBar( wxTB_HORIZONTAL, wxID_ANY );
+	m_toolbar->SetToolBitmapSize( wxSize( 16,16 ) );
 	m_toolEditCut = m_toolbar->AddTool( wxID_CUT, _("Cut"), wxIcon( wxT("edit_cut.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24 ), wxNullBitmap, wxITEM_NORMAL, _("Cut"), _("Cuts selected text and puts it on the clipboard"), NULL ); 
 	
 	m_toolEditCopy = m_toolbar->AddTool( wxID_COPY, _("Copy"), wxIcon( wxT("edit_copy.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24 ), wxNullBitmap, wxITEM_NORMAL, _("Copy"), _("Copies selected text to the clipboard"), NULL );