diff --git a/checkin_notes b/checkin_notes
index cb45ee8944..79a530377d 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -84,3 +84,10 @@ Rom    4 Jan 2007
         
     lib/
         stackwalker_win.cpp
+    
+Kevin  4 Jan 2007
+    - Changed the way the buttons on the simple gui preferences and messages screens are sized
+
+    clientgui/sg_DlgMessages.cpp
+    clientgui/sg_DlgPreferences.cpp
+    
\ No newline at end of file
diff --git a/clientgui/sg_DlgMessages.cpp b/clientgui/sg_DlgMessages.cpp
index 698b4145c4..33c536f339 100644
--- a/clientgui/sg_DlgMessages.cpp
+++ b/clientgui/sg_DlgMessages.cpp
@@ -166,7 +166,7 @@ void CPanelMessages::CreateControls()
 #endif
 
 #ifdef wxUSE_CLIPBOARD
-    wxBitmapButton* itemButton1 = new wxBitmapButton(this, ID_COPYAll, *pSkinSimple->GetCopyAllButton()->GetBitmap(), wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW);
+    wxBitmapButton* itemButton1 = new wxBitmapButton(this, ID_COPYAll, *pSkinSimple->GetCopyAllButton()->GetBitmap(), wxDefaultPosition, wxSize((*pSkinSimple->GetCopyAllButton()->GetBitmap()).GetWidth(),(*pSkinSimple->GetCopyAllButton()->GetBitmap()).GetHeight()), wxBU_AUTODRAW);
 	if ( pSkinSimple->GetCopyAllButton()->GetBitmapClicked() != NULL ) {
 		itemButton1->SetBitmapSelected(*pSkinSimple->GetCopyAllButton()->GetBitmapClicked());
 	}
@@ -180,7 +180,7 @@ void CPanelMessages::CreateControls()
 #endif
     itemBoxSizer4->Add(itemButton1, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
-    wxBitmapButton* itemButton2 = new wxBitmapButton(this, ID_COPYSELECTED, *pSkinSimple->GetCopyButton()->GetBitmap(), wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW);
+    wxBitmapButton* itemButton2 = new wxBitmapButton(this, ID_COPYSELECTED, *pSkinSimple->GetCopyButton()->GetBitmap(), wxDefaultPosition, wxSize((*pSkinSimple->GetCopyButton()->GetBitmap()).GetWidth(),(*pSkinSimple->GetCopyButton()->GetBitmap()).GetHeight()), wxBU_AUTODRAW);
 	if ( pSkinSimple->GetCopyButton()->GetBitmapClicked() != NULL ) {
 		itemButton2->SetBitmapSelected(*pSkinSimple->GetCopyButton()->GetBitmapClicked());
 	}
@@ -211,7 +211,7 @@ void CPanelMessages::CreateControls()
     itemBoxSizer4->Add(itemButton2, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 #endif
 
-    wxBitmapButton* itemBitmapButton44 = new wxBitmapButton(this, wxID_OK, *pSkinSimple->GetCloseButton()->GetBitmap(), wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW);
+    wxBitmapButton* itemBitmapButton44 = new wxBitmapButton(this, wxID_OK, *pSkinSimple->GetCloseButton()->GetBitmap(), wxDefaultPosition,  wxSize((*pSkinSimple->GetCloseButton()->GetBitmap()).GetWidth(),(*pSkinSimple->GetCloseButton()->GetBitmap()).GetHeight()), wxBU_AUTODRAW);
 	if ( pSkinSimple->GetCloseButton()->GetBitmapClicked() != NULL ) {
 		itemBitmapButton44->SetBitmapSelected(*pSkinSimple->GetCloseButton()->GetBitmapClicked());
 	}
diff --git a/clientgui/sg_DlgPreferences.cpp b/clientgui/sg_DlgPreferences.cpp
index 59c614ab07..98c4bf82f4 100644
--- a/clientgui/sg_DlgPreferences.cpp
+++ b/clientgui/sg_DlgPreferences.cpp
@@ -453,13 +453,13 @@ void CPanelPreferences::CreateControls()
     wxBoxSizer* itemBoxSizer44 = new wxBoxSizer(wxHORIZONTAL);
     itemBoxSizer2->Add(itemBoxSizer44, 0, wxALIGN_RIGHT|wxALL, 5);
 
-    wxBitmapButton* itemBitmapButton44 = new wxBitmapButton( itemDialog1, wxID_OK, *pSkinSimple->GetSaveButton()->GetBitmap(), wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW );
+    wxBitmapButton* itemBitmapButton44 = new wxBitmapButton( itemDialog1, wxID_OK, *pSkinSimple->GetSaveButton()->GetBitmap(), wxDefaultPosition,  wxSize((*pSkinSimple->GetSaveButton()->GetBitmap()).GetWidth(),(*pSkinSimple->GetSaveButton()->GetBitmap()).GetHeight()), wxBU_AUTODRAW );
 	if ( pSkinSimple->GetSaveButton()->GetBitmapClicked() != NULL ) {
 		itemBitmapButton44->SetBitmapSelected(*pSkinSimple->GetSaveButton()->GetBitmapClicked());
 	}
     itemBoxSizer44->Add(itemBitmapButton44, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
-    wxBitmapButton* itemBitmapButton45 = new wxBitmapButton( itemDialog1, wxID_CANCEL, *pSkinSimple->GetCancelButton()->GetBitmap(), wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW );
+    wxBitmapButton* itemBitmapButton45 = new wxBitmapButton( itemDialog1, wxID_CANCEL, *pSkinSimple->GetCancelButton()->GetBitmap(), wxDefaultPosition,  wxSize((*pSkinSimple->GetCancelButton()->GetBitmap()).GetWidth(),(*pSkinSimple->GetCancelButton()->GetBitmap()).GetHeight()), wxBU_AUTODRAW );
 	if ( pSkinSimple->GetCancelButton()->GetBitmapClicked() != NULL ) {
 		itemBitmapButton45->SetBitmapSelected(*pSkinSimple->GetCancelButton()->GetBitmapClicked());
 	}