diff --git a/Mainspring/res/mainspring.ico b/Mainspring/res/mainspring.ico
new file mode 100644
index 0000000..eb76040
Binary files /dev/null and b/Mainspring/res/mainspring.ico differ
diff --git a/Mainspring/resource.rc b/Mainspring/resource.rc
index fae0d6f..be11515 100644
--- a/Mainspring/resource.rc
+++ b/Mainspring/resource.rc
@@ -3,6 +3,8 @@
 #include "winres.h"
 #include "src/resources.h"
 
+IDI_ICONMAIN ICON "res/mainspring.ico"
+
 IDR_MENUMAIN MENU
 BEGIN
     POPUP "&File"
diff --git a/Mainspring/src/Application.cpp b/Mainspring/src/Application.cpp
index 263430e..7ac227b 100644
--- a/Mainspring/src/Application.cpp
+++ b/Mainspring/src/Application.cpp
@@ -35,6 +35,7 @@ namespace mainspring {
                 app = reinterpret_cast<Application*>(lParam);
 
                 SetWindowText(dlg, app->m_appName);
+                SendMessage(dlg, WM_SETICON, ICON_BIG, reinterpret_cast<LPARAM>(LoadIcon(GetModuleHandle(NULL), MAKEINTRESOURCE(IDI_ICONMAIN))));
 
                 POINT cursor = {};
                 GetCursorPos(&cursor);
@@ -71,9 +72,9 @@ namespace mainspring {
                             SetTimer(dlg, 1, 50, nullptr);
                         }
                         else {
-                            SetDlgItemText(dlg, IDC_BUTTONSTARTPAUSE, "Start");
                             KillTimer(dlg, 1);
                             app->m_elapsedSaved += app->getElapsed();
+                            SetDlgItemText(dlg, IDC_BUTTONSTARTPAUSE, !app->m_elapsedSaved ? "Start" : "Resume");
                         }
 
                         app->m_timing = !app->m_timing;
diff --git a/Mainspring/src/resources.h b/Mainspring/src/resources.h
index 5f0d28a..a5b7ae2 100644
--- a/Mainspring/src/resources.h
+++ b/Mainspring/src/resources.h
@@ -1,18 +1,23 @@
 // Win32 resources
+
+// Icon
+#define IDI_ICONMAIN 101
+
 // Dialog
-#define IDD_DIALOGMAIN 101
+#define IDD_DIALOGMAIN  201
 
 // Menu
-#define IDR_MENUMAIN 201
-#define ID_FILE_NEW 202
-#define ID_FILE_SAVE 203
-#define ID_FILE_SAVEAS 204
-#define ID_FILE_OPEN 205
-#define ID_FILE_EXIT 206
+#define IDR_MENUMAIN    301
+#define ID_FILE_NEW     302
+#define ID_FILE_SAVE    303
+#define ID_FILE_SAVEAS  304
+#define ID_FILE_OPEN    305
+#define ID_FILE_EXIT    306
 
-#define ID_HELP_ABOUT 211
+#define ID_HELP_ABOUT   311
 
 // Controls (text and buttons)
-#define IDC_BUTTONSTARTPAUSE 1001
-#define IDC_STATICTITLE 1002
-#define IDC_STATICTIME 1003
+#define IDC_BUTTONSTARTPAUSE    1001
+#define IDC_STATICTITLE         1002
+#define IDC_STATICTIME          1003
+#define IDC_STATICICON          1004