diff --git a/ShadowsocksX-NG/AppDelegate.swift b/ShadowsocksX-NG/AppDelegate.swift
index 585877e..947b850 100644
--- a/ShadowsocksX-NG/AppDelegate.swift
+++ b/ShadowsocksX-NG/AppDelegate.swift
@@ -512,13 +512,20 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele
         if isOn {
             runningStatusMenuItem.title = "Shadowsocks: On".localized
             toggleRunningMenuItem.title = "Turn Shadowsocks Off".localized
-            let image = NSImage(named: "menu_icon")
+            var image = NSImage(named: "menu_icon")
+            if SystemThemeChangeHelper.isCurrentDark() {
+                image = NSImage(named: "menu_icon_dark_mode")
+            }
+            
             statusItemView.setIcon(image!)
 //            statusItem!.image = image
         } else {
             runningStatusMenuItem.title = "Shadowsocks: Off".localized
             toggleRunningMenuItem.title = "Turn Shadowsocks On".localized
-            let image = NSImage(named: "menu_icon_disabled")
+            var image = NSImage(named: "menu_icon_disabled")
+            if SystemThemeChangeHelper.isCurrentDark() {
+                image = NSImage(named: "menu_icon_disabled_dark_mode")
+            }
 //            statusItem.image = image
             statusItemView.setIcon(image!)
         }
diff --git a/ShadowsocksX-NG/Assets.xcassets/menu_icon.imageset/Contents.json b/ShadowsocksX-NG/Assets.xcassets/menu_icon.imageset/Contents.json
new file mode 100644
index 0000000..0533a37
--- /dev/null
+++ b/ShadowsocksX-NG/Assets.xcassets/menu_icon.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "menu_icon.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "menu_icon@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/ShadowsocksX-NG/Assets.xcassets/menu_icon.imageset/menu_icon.png b/ShadowsocksX-NG/Assets.xcassets/menu_icon.imageset/menu_icon.png
new file mode 100644
index 0000000..1c1c7eb
Binary files /dev/null and b/ShadowsocksX-NG/Assets.xcassets/menu_icon.imageset/menu_icon.png differ
diff --git a/ShadowsocksX-NG/Assets.xcassets/menu_icon.imageset/menu_icon@2x.png b/ShadowsocksX-NG/Assets.xcassets/menu_icon.imageset/menu_icon@2x.png
new file mode 100644
index 0000000..a6e8531
Binary files /dev/null and b/ShadowsocksX-NG/Assets.xcassets/menu_icon.imageset/menu_icon@2x.png differ
diff --git a/ShadowsocksX-NG/Assets.xcassets/menu_icon_dark_mode.imageset/Contents.json b/ShadowsocksX-NG/Assets.xcassets/menu_icon_dark_mode.imageset/Contents.json
new file mode 100644
index 0000000..c39eb5c
--- /dev/null
+++ b/ShadowsocksX-NG/Assets.xcassets/menu_icon_dark_mode.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "menu_icon_dark_mode.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "menu_icon_dark_mode@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/ShadowsocksX-NG/Assets.xcassets/menu_icon_dark_mode.imageset/menu_icon_dark_mode.png b/ShadowsocksX-NG/Assets.xcassets/menu_icon_dark_mode.imageset/menu_icon_dark_mode.png
new file mode 100644
index 0000000..821e707
Binary files /dev/null and b/ShadowsocksX-NG/Assets.xcassets/menu_icon_dark_mode.imageset/menu_icon_dark_mode.png differ
diff --git a/ShadowsocksX-NG/Assets.xcassets/menu_icon_dark_mode.imageset/menu_icon_dark_mode@2x.png b/ShadowsocksX-NG/Assets.xcassets/menu_icon_dark_mode.imageset/menu_icon_dark_mode@2x.png
new file mode 100644
index 0000000..73a1944
Binary files /dev/null and b/ShadowsocksX-NG/Assets.xcassets/menu_icon_dark_mode.imageset/menu_icon_dark_mode@2x.png differ
diff --git a/ShadowsocksX-NG/Assets.xcassets/menu_icon_disabled.imageset/Contents.json b/ShadowsocksX-NG/Assets.xcassets/menu_icon_disabled.imageset/Contents.json
new file mode 100644
index 0000000..2c21b11
--- /dev/null
+++ b/ShadowsocksX-NG/Assets.xcassets/menu_icon_disabled.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "menu_icon_disabled.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "menu_icon_disabled@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/ShadowsocksX-NG/Assets.xcassets/menu_icon_disabled.imageset/menu_icon_disabled.png b/ShadowsocksX-NG/Assets.xcassets/menu_icon_disabled.imageset/menu_icon_disabled.png
new file mode 100644
index 0000000..2d09313
Binary files /dev/null and b/ShadowsocksX-NG/Assets.xcassets/menu_icon_disabled.imageset/menu_icon_disabled.png differ
diff --git a/ShadowsocksX-NG/Assets.xcassets/menu_icon_disabled.imageset/menu_icon_disabled@2x.png b/ShadowsocksX-NG/Assets.xcassets/menu_icon_disabled.imageset/menu_icon_disabled@2x.png
new file mode 100644
index 0000000..c899fc8
Binary files /dev/null and b/ShadowsocksX-NG/Assets.xcassets/menu_icon_disabled.imageset/menu_icon_disabled@2x.png differ
diff --git a/ShadowsocksX-NG/Assets.xcassets/menu_icon_disabled_dark_mode.imageset/Contents.json b/ShadowsocksX-NG/Assets.xcassets/menu_icon_disabled_dark_mode.imageset/Contents.json
new file mode 100644
index 0000000..d997447
--- /dev/null
+++ b/ShadowsocksX-NG/Assets.xcassets/menu_icon_disabled_dark_mode.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "menu_icon_disabled_dark_mode.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "menu_icon_disabled_dark_mode@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/ShadowsocksX-NG/Assets.xcassets/menu_icon_disabled_dark_mode.imageset/menu_icon_disabled_dark_mode.png b/ShadowsocksX-NG/Assets.xcassets/menu_icon_disabled_dark_mode.imageset/menu_icon_disabled_dark_mode.png
new file mode 100644
index 0000000..4f16437
Binary files /dev/null and b/ShadowsocksX-NG/Assets.xcassets/menu_icon_disabled_dark_mode.imageset/menu_icon_disabled_dark_mode.png differ
diff --git a/ShadowsocksX-NG/Assets.xcassets/menu_icon_disabled_dark_mode.imageset/menu_icon_disabled_dark_mode@2x.png b/ShadowsocksX-NG/Assets.xcassets/menu_icon_disabled_dark_mode.imageset/menu_icon_disabled_dark_mode@2x.png
new file mode 100644
index 0000000..fedaa55
Binary files /dev/null and b/ShadowsocksX-NG/Assets.xcassets/menu_icon_disabled_dark_mode.imageset/menu_icon_disabled_dark_mode@2x.png differ
diff --git a/ShadowsocksX-NG/menu_icon_dark_mode.png b/ShadowsocksX-NG/menu_icon_dark_mode.png
new file mode 100644
index 0000000..821e707
Binary files /dev/null and b/ShadowsocksX-NG/menu_icon_dark_mode.png differ
diff --git a/ShadowsocksX-NG/menu_icon_dark_mode@2x.png b/ShadowsocksX-NG/menu_icon_dark_mode@2x.png
new file mode 100644
index 0000000..73a1944
Binary files /dev/null and b/ShadowsocksX-NG/menu_icon_dark_mode@2x.png differ
diff --git a/ShadowsocksX-NG/menu_icon_disabled_dark_mode.png b/ShadowsocksX-NG/menu_icon_disabled_dark_mode.png
new file mode 100644
index 0000000..4f16437
Binary files /dev/null and b/ShadowsocksX-NG/menu_icon_disabled_dark_mode.png differ
diff --git a/ShadowsocksX-NG/menu_icon_disabled_dark_mode@2x.png b/ShadowsocksX-NG/menu_icon_disabled_dark_mode@2x.png
new file mode 100644
index 0000000..fedaa55
Binary files /dev/null and b/ShadowsocksX-NG/menu_icon_disabled_dark_mode@2x.png differ