diff --git a/Clocker.xcodeproj/project.xcworkspace/xcuserdata/abhishekbanthia.xcuserdatad/UserInterfaceState.xcuserstate b/Clocker.xcodeproj/project.xcworkspace/xcuserdata/abhishekbanthia.xcuserdatad/UserInterfaceState.xcuserstate
index 339893f..e7f0cde 100644
Binary files a/Clocker.xcodeproj/project.xcworkspace/xcuserdata/abhishekbanthia.xcuserdatad/UserInterfaceState.xcuserstate and b/Clocker.xcodeproj/project.xcworkspace/xcuserdata/abhishekbanthia.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/Clocker.xcodeproj/xcuserdata/abhishekbanthia.xcuserdatad/xcschemes/Clocker.xcscheme b/Clocker.xcodeproj/xcuserdata/abhishekbanthia.xcuserdatad/xcschemes/Clocker.xcscheme
index 461994e..7a34412 100644
--- a/Clocker.xcodeproj/xcuserdata/abhishekbanthia.xcuserdatad/xcschemes/Clocker.xcscheme
+++ b/Clocker.xcodeproj/xcuserdata/abhishekbanthia.xcuserdatad/xcschemes/Clocker.xcscheme
@@ -51,9 +51,7 @@
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES"
-      showNonLocalizedStrings = "YES"
-      language = "en"
-      region = "CA">
+      showNonLocalizedStrings = "YES">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">
          <BuildableReference
diff --git a/Clocker/MenubarController.m b/Clocker/MenubarController.m
index 2c481a6..68ada10 100755
--- a/Clocker/MenubarController.m
+++ b/Clocker/MenubarController.m
@@ -50,7 +50,23 @@ typedef void (^CompletionType)(void);
         }
        
         _statusItemView = [[StatusItemView alloc] initWithStatusItem:statusItem];
-        _statusItemView.image = dataObject ? [self convertTextfieldRepresentationToImage:textField] : [NSImage imageNamed:@"MenuIcon"];
+        if (dataObject)
+        {
+            _statusItemView.image = [self convertTextfieldRepresentationToImage:textField];
+        }
+        else
+        {
+            if ([[[NSUserDefaults standardUserDefaults] stringForKey:@"AppleInterfaceStyle"]  isEqualToString:@"Dark"])
+            {
+                _statusItemView.image = [NSImage imageNamed:@"DarkModeIcon"];
+            }
+            else
+            {
+                _statusItemView.image = [NSImage imageNamed:@"LightModeIcon"];
+            }
+
+        }
+
         _statusItemView.alternateImage = [NSImage imageNamed:@"StatusHighlighted"];
         _statusItemView.action = @selector(togglePanel:);
         
diff --git a/Clocker/StatusItemView.m b/Clocker/StatusItemView.m
index 42a27db..9ad93fa 100755
--- a/Clocker/StatusItemView.m
+++ b/Clocker/StatusItemView.m
@@ -116,7 +116,15 @@
     }
     else
     {
-      self.image = [NSImage imageNamed:@"MenuIcon"];
+        if ([[[NSUserDefaults standardUserDefaults] stringForKey:@"AppleInterfaceStyle"]  isEqualToString:@"Dark"])
+        {
+            self.image = [NSImage imageNamed:@"DarkModeIcon"];
+        }
+        else
+        {
+            self.image = [NSImage imageNamed:@"LightModeIcon"];
+        }
+
       self.statusItem.length = 24;
       [self.statusItem drawStatusBarBackgroundInRect:CGRectMake(0, 0, self.image.size.width, self.image.size.height) withHighlight:NO];
     }
diff --git a/Media.xcassets/AlternateIcon.imageset/Contents.json b/Media.xcassets/DarkModeIcon.imageset/Contents.json
similarity index 100%
rename from Media.xcassets/AlternateIcon.imageset/Contents.json
rename to Media.xcassets/DarkModeIcon.imageset/Contents.json
diff --git a/Media.xcassets/AlternateIcon.imageset/clock.png b/Media.xcassets/DarkModeIcon.imageset/clock.png
similarity index 100%
rename from Media.xcassets/AlternateIcon.imageset/clock.png
rename to Media.xcassets/DarkModeIcon.imageset/clock.png
diff --git a/Media.xcassets/AlternateIcon.imageset/clock@2x.png b/Media.xcassets/DarkModeIcon.imageset/clock@2x.png
similarity index 100%
rename from Media.xcassets/AlternateIcon.imageset/clock@2x.png
rename to Media.xcassets/DarkModeIcon.imageset/clock@2x.png
diff --git a/Media.xcassets/LightModeIcon.imageset/Contents.json b/Media.xcassets/LightModeIcon.imageset/Contents.json
new file mode 100644
index 0000000..40ad02f
--- /dev/null
+++ b/Media.xcassets/LightModeIcon.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "black-transparent.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "black-transparent@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/Media.xcassets/LightModeIcon.imageset/black-transparent.png b/Media.xcassets/LightModeIcon.imageset/black-transparent.png
new file mode 100644
index 0000000..ccf432c
Binary files /dev/null and b/Media.xcassets/LightModeIcon.imageset/black-transparent.png differ
diff --git a/Media.xcassets/LightModeIcon.imageset/black-transparent@2x.png b/Media.xcassets/LightModeIcon.imageset/black-transparent@2x.png
new file mode 100644
index 0000000..617bad9
Binary files /dev/null and b/Media.xcassets/LightModeIcon.imageset/black-transparent@2x.png differ