diff --git a/Podfile.lock b/Podfile.lock
index 467c1bc8..3b343236 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -1,9 +1,9 @@
 PODS:
   - Alamofire (5.0.5)
-  - CryptoSwift (1.3.1)
-  - Kingfisher (5.14.1):
-    - Kingfisher/Core (= 5.14.1)
-  - Kingfisher/Core (5.14.1)
+  - CryptoSwift (1.3.3)
+  - Kingfisher (5.15.4):
+    - Kingfisher/Core (= 5.15.4)
+  - Kingfisher/Core (5.15.4)
   - libminipng (0.5.6)
   - LoginServiceKit (2.2.0)
   - MASShortcut (2.4.0)
@@ -55,19 +55,19 @@ EXTERNAL SOURCES:
 
 CHECKOUT OPTIONS:
   CryptoSwift:
-    :commit: e793a595747c8f9b97b8de4ebde7b2a440f2d594
+    :commit: e2bc81be54d71d566a52ca17c3983d141c30aa70
     :git: https://github.com/krzyzanowskim/CryptoSwift
   LoginServiceKit:
-    :commit: 17a916dc09f1aab0f13e6edd1f77cdecee4d0ae8
+    :commit: cf58b91b0ac247bd8bf5dccb5434ca60a930c1e1
     :git: https://github.com/Clipy/LoginServiceKit.git
   SwiftyXMLParser:
-    :commit: 9d82653e535a13a518b411934c0a5c0c84406c22
+    :commit: ec7f183642adf429babd867d1a38c5c6912408ba
     :git: https://github.com/yahoojapan/SwiftyXMLParser.git
 
 SPEC CHECKSUMS:
   Alamofire: df2f8f826963b08b9a870791ad48e07a10090b2e
-  CryptoSwift: 27c1f79acf3410c697981c2443076ad0880a62b4
-  Kingfisher: 8050bc6f7f68cbf3908bd04df7ccbac188f6d6d6
+  CryptoSwift: fedfc9f8362163ca381a78897ad810982e18d464
+  Kingfisher: 657dc1077e5bbbfff864194c79f29e35b722d062
   libminipng: a44c35d06b9d54d6640acdf97f4500c034748abb
   LoginServiceKit: 3c86ce2f2bcd1e373326839d6d863d8a6a5915b4
   MASShortcut: d9e4909e878661cc42877cc9d6efbe638273ab57
@@ -75,7 +75,7 @@ SPEC CHECKSUMS:
   Sparkle: 55b1a87ba69d56913375a281546b7c82dec95bb0
   SQLiteRepairKit: 35aaae5a8838adb85f5b1eb4d796055be6060a4b
   SwiftyJSON: 36413e04c44ee145039d332b4f4e2d3e8d6c4db7
-  SwiftyXMLParser: 8271497e0a37b5c04b0b167c77b4896e36175a21
+  SwiftyXMLParser: 23b5a9321a8adf72aae29046ea58c3d097b4ac17
   WCDB.swift: 05d509d7a0e60fb6e11c34eb7e4027c0fab5849f
   WCDBOptimizedSQLCipher: baf44493b0c7a3d49e97bc5b64a3856f6428ddd1
 
diff --git a/uPic.sketch b/uPic.sketch
index 4e48e460..a2bc1139 100755
Binary files a/uPic.sketch and b/uPic.sketch differ
diff --git a/uPic.xcodeproj/project.pbxproj b/uPic.xcodeproj/project.pbxproj
index 21b95d1b..46533c09 100644
--- a/uPic.xcodeproj/project.pbxproj
+++ b/uPic.xcodeproj/project.pbxproj
@@ -1249,7 +1249,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 20201002;
+				CURRENT_PROJECT_VERSION = 20201114;
 				DEVELOPMENT_TEAM = W863J6W8DZ;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = "$(SRCROOT)/uPic/Supporting Files/Info.plist";
@@ -1258,7 +1258,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
-				MARKETING_VERSION = 0.20.1;
+				MARKETING_VERSION = 0.21.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.svend.uPic;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1279,7 +1279,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 20201002;
+				CURRENT_PROJECT_VERSION = 20201114;
 				DEVELOPMENT_TEAM = W863J6W8DZ;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = "$(SRCROOT)/uPic/Supporting Files/Info.plist";
@@ -1288,7 +1288,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
-				MARKETING_VERSION = 0.20.1;
+				MARKETING_VERSION = 0.21.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.svend.uPic;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1305,7 +1305,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 20201002;
+				CURRENT_PROJECT_VERSION = 20201114;
 				DEVELOPMENT_TEAM = W863J6W8DZ;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = uPicFinderExtension/Info.plist;
@@ -1315,7 +1315,7 @@
 					"@executable_path/../../../../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
-				MARKETING_VERSION = 0.20.1;
+				MARKETING_VERSION = 0.21.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.svend.uPic.uPicFinderExtension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1332,7 +1332,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 20201002;
+				CURRENT_PROJECT_VERSION = 20201114;
 				DEVELOPMENT_TEAM = W863J6W8DZ;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = uPicFinderExtension/Info.plist;
@@ -1342,7 +1342,7 @@
 					"@executable_path/../../../../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
-				MARKETING_VERSION = 0.20.1;
+				MARKETING_VERSION = 0.21.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.svend.uPic.uPicFinderExtension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
diff --git a/uPic.xcodeproj/xcshareddata/xcschemes/uPic.xcscheme b/uPic.xcodeproj/xcshareddata/xcschemes/uPic.xcscheme
index 353142a7..0425b8c9 100644
--- a/uPic.xcodeproj/xcshareddata/xcschemes/uPic.xcscheme
+++ b/uPic.xcodeproj/xcshareddata/xcschemes/uPic.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1200"
+   LastUpgradeVersion = "1220"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/uPic/Assets.xcassets/AppIcon.appiconset/Contents.json b/uPic/Assets.xcassets/AppIcon.appiconset/Contents.json
index b91a0506..6adbbd7e 100644
--- a/uPic/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/uPic/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,68 +1,68 @@
 {
   "images" : [
     {
-      "size" : "16x16",
-      "idiom" : "mac",
       "filename" : "mac-16x16.png",
-      "scale" : "1x"
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "16x16"
     },
     {
-      "size" : "16x16",
-      "idiom" : "mac",
       "filename" : "mac-16x16@2x.png",
-      "scale" : "2x"
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "16x16"
     },
     {
-      "size" : "32x32",
-      "idiom" : "mac",
       "filename" : "mac-32x32.png",
-      "scale" : "1x"
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "32x32"
     },
     {
-      "size" : "32x32",
-      "idiom" : "mac",
       "filename" : "mac-32x32@2x.png",
-      "scale" : "2x"
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "32x32"
     },
     {
-      "size" : "128x128",
-      "idiom" : "mac",
       "filename" : "mac-128x128.png",
-      "scale" : "1x"
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "128x128"
     },
     {
-      "size" : "128x128",
-      "idiom" : "mac",
       "filename" : "mac-128x128@2x.png",
-      "scale" : "2x"
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "128x128"
     },
     {
-      "size" : "256x256",
-      "idiom" : "mac",
       "filename" : "mac-256x256.png",
-      "scale" : "1x"
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "256x256"
     },
     {
-      "size" : "256x256",
-      "idiom" : "mac",
       "filename" : "mac-256x256@2x.png",
-      "scale" : "2x"
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "256x256"
     },
     {
-      "size" : "512x512",
-      "idiom" : "mac",
       "filename" : "mac-512x512.png",
-      "scale" : "1x"
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "512x512"
     },
     {
-      "size" : "512x512",
-      "idiom" : "mac",
       "filename" : "mac-512x512@2x.png",
-      "scale" : "2x"
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "512x512"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}
diff --git a/uPic/Assets.xcassets/AppIcon.appiconset/mac-128x128.png b/uPic/Assets.xcassets/AppIcon.appiconset/mac-128x128.png
index 1c0868be..2426b448 100644
Binary files a/uPic/Assets.xcassets/AppIcon.appiconset/mac-128x128.png and b/uPic/Assets.xcassets/AppIcon.appiconset/mac-128x128.png differ
diff --git a/uPic/Assets.xcassets/AppIcon.appiconset/mac-128x128@2x.png b/uPic/Assets.xcassets/AppIcon.appiconset/mac-128x128@2x.png
index c89fbdee..78a49d55 100644
Binary files a/uPic/Assets.xcassets/AppIcon.appiconset/mac-128x128@2x.png and b/uPic/Assets.xcassets/AppIcon.appiconset/mac-128x128@2x.png differ
diff --git a/uPic/Assets.xcassets/AppIcon.appiconset/mac-16x16.png b/uPic/Assets.xcassets/AppIcon.appiconset/mac-16x16.png
index 5688bd79..04ca3564 100644
Binary files a/uPic/Assets.xcassets/AppIcon.appiconset/mac-16x16.png and b/uPic/Assets.xcassets/AppIcon.appiconset/mac-16x16.png differ
diff --git a/uPic/Assets.xcassets/AppIcon.appiconset/mac-16x16@2x.png b/uPic/Assets.xcassets/AppIcon.appiconset/mac-16x16@2x.png
index 6c9e669b..8ba958c6 100644
Binary files a/uPic/Assets.xcassets/AppIcon.appiconset/mac-16x16@2x.png and b/uPic/Assets.xcassets/AppIcon.appiconset/mac-16x16@2x.png differ
diff --git a/uPic/Assets.xcassets/AppIcon.appiconset/mac-256x256.png b/uPic/Assets.xcassets/AppIcon.appiconset/mac-256x256.png
index c89fbdee..78a49d55 100644
Binary files a/uPic/Assets.xcassets/AppIcon.appiconset/mac-256x256.png and b/uPic/Assets.xcassets/AppIcon.appiconset/mac-256x256.png differ
diff --git a/uPic/Assets.xcassets/AppIcon.appiconset/mac-256x256@2x.png b/uPic/Assets.xcassets/AppIcon.appiconset/mac-256x256@2x.png
index 0e66df9c..19afe7f8 100644
Binary files a/uPic/Assets.xcassets/AppIcon.appiconset/mac-256x256@2x.png and b/uPic/Assets.xcassets/AppIcon.appiconset/mac-256x256@2x.png differ
diff --git a/uPic/Assets.xcassets/AppIcon.appiconset/mac-32x32.png b/uPic/Assets.xcassets/AppIcon.appiconset/mac-32x32.png
index 6c9e669b..8ba958c6 100644
Binary files a/uPic/Assets.xcassets/AppIcon.appiconset/mac-32x32.png and b/uPic/Assets.xcassets/AppIcon.appiconset/mac-32x32.png differ
diff --git a/uPic/Assets.xcassets/AppIcon.appiconset/mac-32x32@2x.png b/uPic/Assets.xcassets/AppIcon.appiconset/mac-32x32@2x.png
index 0beadc21..9d7d099b 100644
Binary files a/uPic/Assets.xcassets/AppIcon.appiconset/mac-32x32@2x.png and b/uPic/Assets.xcassets/AppIcon.appiconset/mac-32x32@2x.png differ
diff --git a/uPic/Assets.xcassets/AppIcon.appiconset/mac-512x512.png b/uPic/Assets.xcassets/AppIcon.appiconset/mac-512x512.png
index 0e66df9c..19afe7f8 100644
Binary files a/uPic/Assets.xcassets/AppIcon.appiconset/mac-512x512.png and b/uPic/Assets.xcassets/AppIcon.appiconset/mac-512x512.png differ
diff --git a/uPic/Assets.xcassets/AppIcon.appiconset/mac-512x512@2x.png b/uPic/Assets.xcassets/AppIcon.appiconset/mac-512x512@2x.png
index 27a315f2..d5f1797f 100644
Binary files a/uPic/Assets.xcassets/AppIcon.appiconset/mac-512x512@2x.png and b/uPic/Assets.xcassets/AppIcon.appiconset/mac-512x512@2x.png differ
diff --git a/uPic/Assets.xcassets/Contents.json b/uPic/Assets.xcassets/Contents.json
index da4a164c..73c00596 100644
--- a/uPic/Assets.xcassets/Contents.json
+++ b/uPic/Assets.xcassets/Contents.json
@@ -1,6 +1,6 @@
 {
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}
diff --git a/uPic/Assets.xcassets/Finder Extension/Contents.json b/uPic/Assets.xcassets/Finder Extension/Contents.json
new file mode 100644
index 00000000..73c00596
--- /dev/null
+++ b/uPic/Assets.xcassets/Finder Extension/Contents.json	
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/uPic/Assets.xcassets/color.imageset/Contents.json b/uPic/Assets.xcassets/Finder Extension/color.imageset/Contents.json
similarity index 100%
rename from uPic/Assets.xcassets/color.imageset/Contents.json
rename to uPic/Assets.xcassets/Finder Extension/color.imageset/Contents.json
diff --git a/uPic/Assets.xcassets/color.imageset/color.png b/uPic/Assets.xcassets/Finder Extension/color.imageset/color.png
similarity index 100%
rename from uPic/Assets.xcassets/color.imageset/color.png
rename to uPic/Assets.xcassets/Finder Extension/color.imageset/color.png
diff --git a/uPic/Assets.xcassets/color.imageset/color@2x.png b/uPic/Assets.xcassets/Finder Extension/color.imageset/color@2x.png
similarity index 100%
rename from uPic/Assets.xcassets/color.imageset/color@2x.png
rename to uPic/Assets.xcassets/Finder Extension/color.imageset/color@2x.png
diff --git a/uPic/Assets.xcassets/color.imageset/color@3x.png b/uPic/Assets.xcassets/Finder Extension/color.imageset/color@3x.png
similarity index 100%
rename from uPic/Assets.xcassets/color.imageset/color@3x.png
rename to uPic/Assets.xcassets/Finder Extension/color.imageset/color@3x.png
diff --git a/uPic/Assets.xcassets/single.imageset/Contents.json b/uPic/Assets.xcassets/Finder Extension/single.imageset/Contents.json
similarity index 100%
rename from uPic/Assets.xcassets/single.imageset/Contents.json
rename to uPic/Assets.xcassets/Finder Extension/single.imageset/Contents.json
diff --git a/uPic/Assets.xcassets/single.imageset/single.png b/uPic/Assets.xcassets/Finder Extension/single.imageset/single.png
similarity index 100%
rename from uPic/Assets.xcassets/single.imageset/single.png
rename to uPic/Assets.xcassets/Finder Extension/single.imageset/single.png
diff --git a/uPic/Assets.xcassets/single.imageset/single@2x.png b/uPic/Assets.xcassets/Finder Extension/single.imageset/single@2x.png
similarity index 100%
rename from uPic/Assets.xcassets/single.imageset/single@2x.png
rename to uPic/Assets.xcassets/Finder Extension/single.imageset/single@2x.png
diff --git a/uPic/Assets.xcassets/single.imageset/single@3x.png b/uPic/Assets.xcassets/Finder Extension/single.imageset/single@3x.png
similarity index 100%
rename from uPic/Assets.xcassets/single.imageset/single@3x.png
rename to uPic/Assets.xcassets/Finder Extension/single.imageset/single@3x.png
diff --git a/uPic/Assets.xcassets/Finder Extension/single_new.imageset/Contents.json b/uPic/Assets.xcassets/Finder Extension/single_new.imageset/Contents.json
new file mode 100644
index 00000000..144b4684
--- /dev/null
+++ b/uPic/Assets.xcassets/Finder Extension/single_new.imageset/Contents.json	
@@ -0,0 +1,26 @@
+{
+  "images" : [
+    {
+      "filename" : "single.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "single@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "single@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
diff --git a/uPic/Assets.xcassets/Finder Extension/single_new.imageset/single.png b/uPic/Assets.xcassets/Finder Extension/single_new.imageset/single.png
new file mode 100644
index 00000000..34b1873e
Binary files /dev/null and b/uPic/Assets.xcassets/Finder Extension/single_new.imageset/single.png differ
diff --git a/uPic/Assets.xcassets/Finder Extension/single_new.imageset/single@2x.png b/uPic/Assets.xcassets/Finder Extension/single_new.imageset/single@2x.png
new file mode 100644
index 00000000..bc805011
Binary files /dev/null and b/uPic/Assets.xcassets/Finder Extension/single_new.imageset/single@2x.png differ
diff --git a/uPic/Assets.xcassets/Finder Extension/single_new.imageset/single@3x.png b/uPic/Assets.xcassets/Finder Extension/single_new.imageset/single@3x.png
new file mode 100644
index 00000000..c4fb6126
Binary files /dev/null and b/uPic/Assets.xcassets/Finder Extension/single_new.imageset/single@3x.png differ
diff --git a/uPic/PreferencesWindow/AboutPreferencesViewController.swift b/uPic/PreferencesWindow/AboutPreferencesViewController.swift
index b744702a..4c92e786 100644
--- a/uPic/PreferencesWindow/AboutPreferencesViewController.swift
+++ b/uPic/PreferencesWindow/AboutPreferencesViewController.swift
@@ -33,6 +33,13 @@ class AboutPreferencesViewController: PreferencesViewController {
         NSWorkspace.shared.open(url)
     }
     
+    @IBAction func tgButtonClicked(_ sender: NSButton) {
+        guard let url = URL(string: "https://t.me/upic_host") else {
+            return
+        }
+        NSWorkspace.shared.open(url)
+    }
+    
     @IBAction func homePageButtonClicked(_ sender: NSButton) {
         guard let url = URL(string: "https://svend.cc") else {
             return
diff --git a/uPic/PreferencesWindow/AdvancedPreferencesViewController.swift b/uPic/PreferencesWindow/AdvancedPreferencesViewController.swift
index b75573d5..6ddeba49 100644
--- a/uPic/PreferencesWindow/AdvancedPreferencesViewController.swift
+++ b/uPic/PreferencesWindow/AdvancedPreferencesViewController.swift
@@ -10,7 +10,7 @@ import Cocoa
 import MASShortcut
 
 class AdvancedPreferencesViewController: PreferencesViewController {
-
+    
     @IBOutlet weak var selectFileShortcut: MASShortcutView!
     @IBOutlet weak var pasteboardShortcut: MASShortcutView!
     @IBOutlet weak var screenshotShortcut: MASShortcutView!
@@ -22,9 +22,9 @@ class AdvancedPreferencesViewController: PreferencesViewController {
     @IBOutlet weak var historyRecordFileNameScrollWaitTime: NSTextField!
     @IBOutlet weak var finderExtensionIcon: NSPopUpButton!
     @IBOutlet weak var resetPreferencesButton: NSButton!
-
+    
     // MARK: Lifecycle
-
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         
@@ -51,8 +51,12 @@ class AdvancedPreferencesViewController: PreferencesViewController {
     
     func setFinderExtensionIconDefaultValue() {
         finderExtensionIcon.selectItem(at: FinderUtil.getIcon())
+        
+        if #available(macOS 11, *) {
+            finderExtensionIcon.item(at: 1)!.image = NSImage(named: "single_new")
+        }
     }
-
+    
     @IBAction func didClickHistoryRecordConfigurationResetButton(_ sender: NSButton) {
         
         Defaults.removeObject(forKey: Keys.historyRecordWidth)
@@ -79,7 +83,7 @@ class AdvancedPreferencesViewController: PreferencesViewController {
         
         ConfigNotifier.postNotification(.changeHistoryList)
     }
-
+    
     @IBAction func didChangeFinderExtensionIcon(_ sender: NSPopUpButton) {
         FinderUtil.setIcon(sender.indexOfSelectedItem)
     }
@@ -92,19 +96,19 @@ class AdvancedPreferencesViewController: PreferencesViewController {
     
     @IBAction func resetPreferencesButtonClicked(_ sender: NSButton) {
         let alert = NSAlert()
-
+        
         alert.messageText = "Reset User Preferences?".localized
         alert.informativeText = "⚠️ Note that this will reset all user preferences".localized
-
+        
         // Add button and avoid the focus ring
         let cancelString = "Cancel".localized
         alert.addButton(withTitle: cancelString).refusesFirstResponder = true
-
+        
         let yesString = "Yes".localized
         alert.addButton(withTitle: yesString).refusesFirstResponder = true
-
+        
         let modalResult = alert.runModal()
-
+        
         switch modalResult {
         case .alertFirstButtonReturn:
             print("Cancel Resetting User Preferences")
@@ -123,5 +127,4 @@ class AdvancedPreferencesViewController: PreferencesViewController {
             print("Cancel Resetting User Preferences")
         }
     }
-
 }
diff --git a/uPic/PreferencesWindow/Base.lproj/Preferences.storyboard b/uPic/PreferencesWindow/Base.lproj/Preferences.storyboard
index c0f12d87..5fca1c11 100644
--- a/uPic/PreferencesWindow/Base.lproj/Preferences.storyboard
+++ b/uPic/PreferencesWindow/Base.lproj/Preferences.storyboard
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="oOf-8k-ODW">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="17506" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="oOf-8k-ODW">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="16097.2"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17506"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -185,10 +185,10 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <stackView distribution="fill" orientation="vertical" alignment="leading" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="cTF-y0-mpo">
-                                <rect key="frame" x="20" y="23" width="303" height="422"/>
+                                <rect key="frame" x="20" y="24" width="303" height="421"/>
                                 <subviews>
                                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9fR-JD-Uqd">
-                                        <rect key="frame" x="-2" y="406" width="69" height="16"/>
+                                        <rect key="frame" x="-2" y="405" width="69" height="16"/>
                                         <textFieldCell key="cell" lineBreakMode="clipping" title="Shortcuts" id="FpP-Q9-flS">
                                             <font key="font" metaFont="systemBold"/>
                                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -196,7 +196,7 @@
                                         </textFieldCell>
                                     </textField>
                                     <stackView distribution="fill" orientation="horizontal" alignment="centerY" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Blx-CX-ALw">
-                                        <rect key="frame" x="20" y="379" width="283" height="19"/>
+                                        <rect key="frame" x="20" y="378" width="283" height="19"/>
                                         <subviews>
                                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ZQn-nx-aAX">
                                                 <rect key="frame" x="-2" y="2" width="154" height="16"/>
@@ -223,7 +223,7 @@
                                         </customSpacing>
                                     </stackView>
                                     <stackView distribution="fill" orientation="horizontal" alignment="centerY" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="bEn-Ey-rPa">
-                                        <rect key="frame" x="0.0" y="352" width="303" height="19"/>
+                                        <rect key="frame" x="0.0" y="351" width="303" height="19"/>
                                         <subviews>
                                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="PV3-X0-nd3">
                                                 <rect key="frame" x="-2" y="2" width="174" height="16"/>
@@ -250,7 +250,7 @@
                                         </customSpacing>
                                     </stackView>
                                     <stackView distribution="fill" orientation="horizontal" alignment="centerY" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="jFP-BA-QYL">
-                                        <rect key="frame" x="20" y="325" width="283" height="19"/>
+                                        <rect key="frame" x="20" y="324" width="283" height="19"/>
                                         <subviews>
                                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2f4-ck-NPM">
                                                 <rect key="frame" x="-2" y="2" width="154" height="16"/>
@@ -277,7 +277,7 @@
                                         </customSpacing>
                                     </stackView>
                                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="vlv-hH-XLv">
-                                        <rect key="frame" x="-2" y="301" width="98" height="16"/>
+                                        <rect key="frame" x="-2" y="300" width="98" height="16"/>
                                         <textFieldCell key="cell" lineBreakMode="clipping" title="History record" id="UN0-Iq-Cop">
                                             <font key="font" metaFont="systemBold"/>
                                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -285,7 +285,7 @@
                                         </textFieldCell>
                                     </textField>
                                     <stackView distribution="fill" orientation="horizontal" alignment="centerY" spacing="30" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="15f-GQ-Vwi">
-                                        <rect key="frame" x="20" y="271" width="283" height="22"/>
+                                        <rect key="frame" x="20" y="270" width="283" height="22"/>
                                         <subviews>
                                             <stackView distribution="fill" orientation="horizontal" alignment="centerY" spacing="3" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="pp7-od-zxP">
                                                 <rect key="frame" x="0.0" y="0.0" width="121" height="22"/>
@@ -364,7 +364,7 @@
                                         </customSpacing>
                                     </stackView>
                                     <stackView distribution="fill" orientation="horizontal" alignment="top" spacing="30" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="TQj-aQ-CQ4">
-                                        <rect key="frame" x="20" y="241" width="283" height="22"/>
+                                        <rect key="frame" x="20" y="240" width="283" height="22"/>
                                         <subviews>
                                             <stackView distribution="fill" orientation="horizontal" alignment="centerY" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2Xi-Lc-GuI">
                                                 <rect key="frame" x="0.0" y="0.0" width="121" height="22"/>
@@ -443,7 +443,7 @@
                                         </customSpacing>
                                     </stackView>
                                     <stackView distribution="fill" orientation="horizontal" alignment="centerY" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="dB3-6e-Cmz">
-                                        <rect key="frame" x="20" y="211" width="283" height="22"/>
+                                        <rect key="frame" x="20" y="210" width="283" height="22"/>
                                         <subviews>
                                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="hkO-T2-ssM">
                                                 <rect key="frame" x="-2" y="3" width="219" height="16"/>
@@ -476,7 +476,7 @@
                                         </customSpacing>
                                     </stackView>
                                     <stackView distribution="fill" orientation="horizontal" alignment="centerY" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="3bh-W7-0P4">
-                                        <rect key="frame" x="20" y="181" width="283" height="22"/>
+                                        <rect key="frame" x="20" y="180" width="283" height="22"/>
                                         <subviews>
                                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Vrl-zg-MLH">
                                                 <rect key="frame" x="-2" y="3" width="219" height="16"/>
@@ -509,7 +509,7 @@
                                         </customSpacing>
                                     </stackView>
                                     <stackView distribution="fillEqually" orientation="horizontal" alignment="top" spacing="10" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="dh7-0x-IlD">
-                                        <rect key="frame" x="183" y="153" width="120" height="20"/>
+                                        <rect key="frame" x="183" y="152" width="120" height="20"/>
                                         <subviews>
                                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="L5s-lw-kQc">
                                                 <rect key="frame" x="-7" y="-7" width="69" height="32"/>
@@ -545,7 +545,7 @@
                                         </customSpacing>
                                     </stackView>
                                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="TcO-F2-69m">
-                                        <rect key="frame" x="-2" y="129" width="112" height="16"/>
+                                        <rect key="frame" x="-2" y="128" width="112" height="16"/>
                                         <textFieldCell key="cell" lineBreakMode="clipping" title="Finder extension" id="XtR-28-Jft">
                                             <font key="font" metaFont="systemBold"/>
                                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -553,10 +553,10 @@
                                         </textFieldCell>
                                     </textField>
                                     <stackView distribution="fill" orientation="horizontal" alignment="centerY" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="hpV-OT-Zx9">
-                                        <rect key="frame" x="20" y="100" width="136" height="21"/>
+                                        <rect key="frame" x="20" y="100" width="134" height="20"/>
                                         <subviews>
                                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="zSd-NZ-L7B">
-                                                <rect key="frame" x="-2" y="3" width="34" height="16"/>
+                                                <rect key="frame" x="-2" y="2" width="34" height="16"/>
                                                 <textFieldCell key="cell" lineBreakMode="clipping" title="Icon:" id="ugx-B2-gPe">
                                                     <font key="font" metaFont="message"/>
                                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -564,7 +564,7 @@
                                                 </textFieldCell>
                                             </textField>
                                             <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="pHb-90-42w">
-                                                <rect key="frame" x="36" y="-3" width="103" height="25"/>
+                                                <rect key="frame" x="35" y="-4" width="103" height="25"/>
                                                 <popUpButtonCell key="cell" type="push" title="Single" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" tag="1" imageScaling="proportionallyDown" inset="2" selectedItem="dGv-rY-F7Z" id="ETf-eR-mih">
                                                     <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                                     <font key="font" metaFont="menu"/>
@@ -630,7 +630,7 @@
                                         </textFieldCell>
                                     </textField>
                                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="qri-L6-ZRL">
-                                        <rect key="frame" x="19" y="20" width="121" height="23"/>
+                                        <rect key="frame" x="19" y="20" width="127" height="23"/>
                                         <buttonCell key="cell" type="roundTextured" title="Reset preferences" bezelStyle="texturedRounded" alignment="center" lineBreakMode="truncatingTail" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="jyI-H7-qN3">
                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                             <font key="font" metaFont="system"/>
@@ -737,17 +737,17 @@
             <objects>
                 <viewController title="About" id="k6X-N1-mVu" customClass="AboutPreferencesViewController" customModule="uPic" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" id="rHs-sx-r6F">
-                        <rect key="frame" x="0.0" y="0.0" width="308" height="224"/>
+                        <rect key="frame" x="0.0" y="0.0" width="308" height="250"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <subviews>
                             <stackView distribution="fill" orientation="vertical" alignment="leading" spacing="15" horizontalStackHuggingPriority="160" verticalStackHuggingPriority="160" horizontalHuggingPriority="160" verticalHuggingPriority="160" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="4es-k1-K2c">
-                                <rect key="frame" x="20" y="20" width="268" height="184"/>
+                                <rect key="frame" x="20" y="20" width="268" height="210"/>
                                 <subviews>
                                     <stackView distribution="fill" orientation="horizontal" alignment="top" spacing="12" horizontalStackHuggingPriority="250" verticalStackHuggingPriority="216" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="yY2-Uz-6lI">
-                                        <rect key="frame" x="0.0" y="155" width="93" height="29"/>
+                                        <rect key="frame" x="0.0" y="186" width="93" height="24"/>
                                         <subviews>
                                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="PJu-EB-sSS">
-                                                <rect key="frame" x="-2" y="6" width="44" height="23"/>
+                                                <rect key="frame" x="-2" y="0.0" width="44" height="24"/>
                                                 <textFieldCell key="cell" lineBreakMode="clipping" title="uPic" id="mOB-su-ZM1">
                                                     <font key="font" metaFont="systemSemibold" size="20"/>
                                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -755,7 +755,7 @@
                                                 </textFieldCell>
                                             </textField>
                                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="GS4-or-3hj">
-                                                <rect key="frame" x="50" y="6" width="45" height="23"/>
+                                                <rect key="frame" x="50" y="0.0" width="45" height="24"/>
                                                 <textFieldCell key="cell" lineBreakMode="clipping" title="0.1.0" id="Jnf-AX-bIr">
                                                     <font key="font" metaFont="system" size="20"/>
                                                     <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
@@ -773,7 +773,7 @@
                                         </customSpacing>
                                     </stackView>
                                     <stackView distribution="fill" orientation="horizontal" alignment="top" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="F5k-92-BmU">
-                                        <rect key="frame" x="0.0" y="124" width="262" height="16"/>
+                                        <rect key="frame" x="0.0" y="155" width="262" height="16"/>
                                         <subviews>
                                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="FCw-yO-sfT">
                                                 <rect key="frame" x="-2" y="0.0" width="73" height="16"/>
@@ -805,7 +805,7 @@
                                         </customSpacing>
                                     </stackView>
                                     <stackView distribution="fill" orientation="horizontal" alignment="top" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="MuS-Gl-ip2">
-                                        <rect key="frame" x="0.0" y="93" width="159" height="16"/>
+                                        <rect key="frame" x="0.0" y="124" width="159" height="16"/>
                                         <subviews>
                                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ruh-p7-eW7">
                                                 <rect key="frame" x="-2" y="0.0" width="97" height="16"/>
@@ -837,7 +837,7 @@
                                         </customSpacing>
                                     </stackView>
                                     <stackView distribution="fill" orientation="horizontal" alignment="top" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Kp8-FV-lYw">
-                                        <rect key="frame" x="0.0" y="62" width="153" height="16"/>
+                                        <rect key="frame" x="0.0" y="93" width="153" height="16"/>
                                         <subviews>
                                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="PTf-CP-tw5">
                                                 <rect key="frame" x="-2" y="0.0" width="73" height="16"/>
@@ -868,6 +868,38 @@
                                             <real value="3.4028234663852886e+38"/>
                                         </customSpacing>
                                     </stackView>
+                                    <stackView distribution="fill" orientation="horizontal" alignment="top" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="LBo-Zi-R8f">
+                                        <rect key="frame" x="0.0" y="62" width="136" height="16"/>
+                                        <subviews>
+                                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="uLj-4I-Xpk">
+                                                <rect key="frame" x="-2" y="0.0" width="87" height="16"/>
+                                                <textFieldCell key="cell" lineBreakMode="clipping" title="💬 Telegram:" id="yO0-9g-BJK">
+                                                    <font key="font" usesAppearanceFont="YES"/>
+                                                    <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                                    <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                </textFieldCell>
+                                            </textField>
+                                            <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="0Sj-N8-2vb" customClass="LinkButton" customModule="uPic" customModuleProvider="target">
+                                                <rect key="frame" x="91" y="0.0" width="45" height="16"/>
+                                                <buttonCell key="cell" type="bevel" title="iSvend" bezelStyle="regularSquare" alignment="center" inset="2" id="BoF-vP-aWK">
+                                                    <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                                    <font key="font" metaFont="system"/>
+                                                </buttonCell>
+                                                <color key="contentTintColor" name="systemBlueColor" catalog="System" colorSpace="catalog"/>
+                                                <connections>
+                                                    <action selector="tgButtonClicked:" target="k6X-N1-mVu" id="b7X-IW-4G1"/>
+                                                </connections>
+                                            </button>
+                                        </subviews>
+                                        <visibilityPriorities>
+                                            <integer value="1000"/>
+                                            <integer value="1000"/>
+                                        </visibilityPriorities>
+                                        <customSpacing>
+                                            <real value="3.4028234663852886e+38"/>
+                                            <real value="3.4028234663852886e+38"/>
+                                        </customSpacing>
+                                    </stackView>
                                     <stackView distribution="fill" orientation="horizontal" alignment="top" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Les-vT-sUr">
                                         <rect key="frame" x="0.0" y="31" width="231" height="16"/>
                                         <subviews>
@@ -966,6 +998,7 @@
                                     <integer value="1000"/>
                                     <integer value="1000"/>
                                     <integer value="1000"/>
+                                    <integer value="1000"/>
                                 </visibilityPriorities>
                                 <customSpacing>
                                     <real value="3.4028234663852886e+38"/>
@@ -974,6 +1007,7 @@
                                     <real value="3.4028234663852886e+38"/>
                                     <real value="3.4028234663852886e+38"/>
                                     <real value="3.4028234663852886e+38"/>
+                                    <real value="3.4028234663852886e+38"/>
                                 </customSpacing>
                             </stackView>
                         </subviews>
@@ -1041,7 +1075,7 @@
                                 <rect key="frame" x="10" y="10" width="434" height="120"/>
                                 <subviews>
                                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="M3i-Qr-Okm">
-                                        <rect key="frame" x="3" y="87" width="151" height="32"/>
+                                        <rect key="frame" x="3" y="87" width="139" height="32"/>
                                         <buttonCell key="cell" type="push" title="Add Header Field" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Ckh-A7-mxC">
                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                             <font key="font" usesAppearanceFont="YES"/>
@@ -1074,7 +1108,7 @@ DQ
                                         </connections>
                                     </button>
                                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="YWU-oU-UGk">
-                                        <rect key="frame" x="271" y="-3" width="88" height="32"/>
+                                        <rect key="frame" x="283" y="-3" width="76" height="32"/>
                                         <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="q1H-P0-jix">
                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                             <font key="font" metaFont="system"/>
@@ -1170,7 +1204,7 @@ Gw
                                                                     <tableViewGridLines key="gridStyleMask" horizontal="YES"/>
                                                                     <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                                                     <tableColumns>
-                                                                        <tableColumn width="175" minWidth="40" maxWidth="1000" id="QBV-DA-FYg">
+                                                                        <tableColumn width="137" minWidth="40" maxWidth="1000" id="QBV-DA-FYg">
                                                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border">
                                                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                                                 <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
@@ -1183,18 +1217,18 @@ Gw
                                                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                                                             <prototypeCellViews>
                                                                                 <tableCellView identifier="ServerCellID" id="nIa-8G-vHd">
-                                                                                    <rect key="frame" x="1" y="1" width="175" height="30"/>
+                                                                                    <rect key="frame" x="11" y="1" width="146" height="30"/>
                                                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                                                     <subviews>
                                                                                         <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="1tR-tl-dfg">
-                                                                                            <rect key="frame" x="3" y="0.0" width="30" height="30"/>
+                                                                                            <rect key="frame" x="3" y="-3" width="30" height="36"/>
                                                                                             <constraints>
                                                                                                 <constraint firstAttribute="width" constant="30" id="N43-NK-A2A"/>
                                                                                             </constraints>
                                                                                             <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="NSActionTemplate" id="Lia-3w-qef"/>
                                                                                         </imageView>
                                                                                         <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsExpansionToolTips="YES" translatesAutoresizingMaskIntoConstraints="NO" id="iJI-17-SIb">
-                                                                                            <rect key="frame" x="35" y="5" width="140" height="20"/>
+                                                                                            <rect key="frame" x="35" y="5" width="111" height="20"/>
                                                                                             <constraints>
                                                                                                 <constraint firstAttribute="height" constant="20" id="UBA-cs-5zt"/>
                                                                                             </constraints>
@@ -1387,7 +1421,7 @@ Gw
                                                 </connections>
                                             </button>
                                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="YZD-zT-qZX">
-                                                <rect key="frame" x="347" y="3" width="103" height="32"/>
+                                                <rect key="frame" x="359" y="3" width="91" height="32"/>
                                                 <buttonCell key="cell" type="push" title="⚠️ Reset" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="TD4-LI-X9U">
                                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                     <font key="font" metaFont="system"/>
@@ -1445,15 +1479,15 @@ Gw
         </scene>
     </scenes>
     <resources>
-        <image name="NSActionTemplate" width="14" height="14"/>
+        <image name="NSActionTemplate" width="15" height="15"/>
         <image name="NSAdvanced" width="32" height="32"/>
         <image name="NSPreferencesGeneral" width="32" height="32"/>
-        <image name="NSRemoveTemplate" width="11" height="11"/>
+        <image name="NSRemoveTemplate" width="14" height="4"/>
         <image name="about" width="512" height="513"/>
         <image name="color" width="22" height="22"/>
         <image name="downloadOnAppStore" width="120" height="40"/>
         <image name="host" width="64" height="64"/>
-        <image name="single" width="16" height="16"/>
+        <image name="single" width="22" height="22"/>
         <image name="uPicForiOS" width="64" height="64"/>
     </resources>
 </document>
diff --git a/uPicFinderExtension/Assets.xcassets/Contents.json b/uPicFinderExtension/Assets.xcassets/Contents.json
index da4a164c..73c00596 100644
--- a/uPicFinderExtension/Assets.xcassets/Contents.json
+++ b/uPicFinderExtension/Assets.xcassets/Contents.json
@@ -1,6 +1,6 @@
 {
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}
diff --git a/uPicFinderExtension/Assets.xcassets/single_new.imageset/Contents.json b/uPicFinderExtension/Assets.xcassets/single_new.imageset/Contents.json
new file mode 100644
index 00000000..37281660
--- /dev/null
+++ b/uPicFinderExtension/Assets.xcassets/single_new.imageset/Contents.json
@@ -0,0 +1,56 @@
+{
+  "images" : [
+    {
+      "filename" : "single.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "single-dark.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "single@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "single-dark@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "single@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "single-dark@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/uPicFinderExtension/Assets.xcassets/single_new.imageset/single-dark.png b/uPicFinderExtension/Assets.xcassets/single_new.imageset/single-dark.png
new file mode 100644
index 00000000..787da196
Binary files /dev/null and b/uPicFinderExtension/Assets.xcassets/single_new.imageset/single-dark.png differ
diff --git a/uPicFinderExtension/Assets.xcassets/single_new.imageset/single-dark@2x.png b/uPicFinderExtension/Assets.xcassets/single_new.imageset/single-dark@2x.png
new file mode 100644
index 00000000..4ba4460f
Binary files /dev/null and b/uPicFinderExtension/Assets.xcassets/single_new.imageset/single-dark@2x.png differ
diff --git a/uPicFinderExtension/Assets.xcassets/single_new.imageset/single-dark@3x.png b/uPicFinderExtension/Assets.xcassets/single_new.imageset/single-dark@3x.png
new file mode 100644
index 00000000..9204e747
Binary files /dev/null and b/uPicFinderExtension/Assets.xcassets/single_new.imageset/single-dark@3x.png differ
diff --git a/uPicFinderExtension/Assets.xcassets/single_new.imageset/single.png b/uPicFinderExtension/Assets.xcassets/single_new.imageset/single.png
new file mode 100644
index 00000000..954a8d63
Binary files /dev/null and b/uPicFinderExtension/Assets.xcassets/single_new.imageset/single.png differ
diff --git a/uPicFinderExtension/Assets.xcassets/single_new.imageset/single@2x.png b/uPicFinderExtension/Assets.xcassets/single_new.imageset/single@2x.png
new file mode 100644
index 00000000..a894cee6
Binary files /dev/null and b/uPicFinderExtension/Assets.xcassets/single_new.imageset/single@2x.png differ
diff --git a/uPicFinderExtension/Assets.xcassets/single_new.imageset/single@3x.png b/uPicFinderExtension/Assets.xcassets/single_new.imageset/single@3x.png
new file mode 100644
index 00000000..2ef700de
Binary files /dev/null and b/uPicFinderExtension/Assets.xcassets/single_new.imageset/single@3x.png differ
diff --git a/uPicFinderExtension/FinderSync.swift b/uPicFinderExtension/FinderSync.swift
index 942a5166..cdcb6e5d 100644
--- a/uPicFinderExtension/FinderSync.swift
+++ b/uPicFinderExtension/FinderSync.swift
@@ -10,7 +10,7 @@ import Cocoa
 import FinderSync
 
 class FinderSync: FIFinderSync {
-
+    
     override init() {
         super.init()
         // Set up the directory we are syncing.
@@ -26,29 +26,37 @@ class FinderSync: FIFinderSync {
             }
         }
     }
-
+    
     // MARK: - Menu and toolbar item support
-
+    
     override var toolbarItemName: String {
         return "uPic"
     }
-
+    
     override var toolbarItemToolTip: String {
         return "Upload selected files via uPic".localized
     }
-
+    
     override var toolbarItemImage: NSImage {
+        var image:NSImage? = nil
         switch FinderUtil.getIcon() {
         case 2:
-            return NSImage(named: "color")!
+            image = NSImage(named: "color")
         default:
-            return NSImage(named: "single")!
+            if #available(macOS 11, *) {
+                image = NSImage(named: "single_new")
+            } else {
+                image = NSImage(named: "single")
+            }
         }
+        
+        image?.isTemplate = true
+        return image!
     }
-
+    
     override func menu(for menuKind: FIMenuKind) -> NSMenu? {
         // Produce a menu for the extension.
-
+        
         switch menuKind {
         case .contextualMenuForItems, .toolbarItemMenu:
             let menu = NSMenu(title: "")
@@ -60,20 +68,24 @@ class FinderSync: FIFinderSync {
             case 2:
                 uploadMenuItem.image = NSImage(named: "color")
             default:
-                uploadMenuItem.image = NSImage(named: "single")
+                if #available(macOS 11, *) {
+                    uploadMenuItem.image = NSImage(named: "single_new")
+                } else {
+                    uploadMenuItem.image = NSImage(named: "single")
+                }
             }
             
+            uploadMenuItem.image?.isTemplate = true
             menu.addItem(uploadMenuItem)
-
+            
             return menu
         default:
             break
         }
-
+        
         return nil
-
     }
-
+    
     @IBAction func uploadFile(_ sender: AnyObject?) {
         if let items = FIFinderSyncController.default().selectedItemURLs() {
             var path = ""
@@ -88,9 +100,6 @@ class FinderSync: FIFinderSync {
             } else {
                 UploadNotifier.postNotification(.uploadFiles, object: path)
             }
-            
         }
     }
-
 }
-