diff --git a/clientgui/DlgEventLog.cpp b/clientgui/DlgEventLog.cpp
index 440907a58c..2a0ed53204 100644
--- a/clientgui/DlgEventLog.cpp
+++ b/clientgui/DlgEventLog.cpp
@@ -99,9 +99,6 @@ CDlgEventLog::CDlgEventLog( wxWindow* parent, wxWindowID id, const wxString& cap
 CDlgEventLog::~CDlgEventLog() {
     wxLogTrace(wxT("Function Start/End"), wxT("CDlgEventLog::CDlgEventLog - Destructor Function Begin"));
     
-    SaveState();
-    SetWindowDimensions();
-
     if (m_pMessageInfoAttr) {
         delete m_pMessageInfoAttr;
         m_pMessageInfoAttr = NULL;
@@ -415,6 +412,9 @@ void CDlgEventLog::OnHelp(wxHelpEvent& event) {
  */
 
 void CDlgEventLog::OnOK( wxCommandEvent& WXUNUSED(event) ) {
+    SaveState();
+    SetWindowDimensions();
+
     Close();
 }
 
@@ -425,6 +425,10 @@ void CDlgEventLog::OnOK( wxCommandEvent& WXUNUSED(event) ) {
 
 void CDlgEventLog::OnClose(wxCloseEvent& WXUNUSED(event)) {
     m_bEventLogIsOpen = false;  // User specifically closed window
+
+    SaveState();
+    SetWindowDimensions();
+
     Destroy();
 }
 
diff --git a/clientgui/res/BOINCGUIApp.ico b/clientgui/res/BOINCGUIApp.ico
index 3a0f88f28c..2bc3437e09 100644
Binary files a/clientgui/res/BOINCGUIApp.ico and b/clientgui/res/BOINCGUIApp.ico differ