diff --git a/client/fonts/Lato-Hairline.ttf b/client/fonts/Lato-Hairline.ttf
new file mode 100644
index 000000000..bc06473a7
Binary files /dev/null and b/client/fonts/Lato-Hairline.ttf differ
diff --git a/client/fonts/Lato-HairlineItalic.ttf b/client/fonts/Lato-HairlineItalic.ttf
new file mode 100644
index 000000000..d680800af
Binary files /dev/null and b/client/fonts/Lato-HairlineItalic.ttf differ
diff --git a/client/fonts/Lato-Heavy.ttf b/client/fonts/Lato-Heavy.ttf
new file mode 100644
index 000000000..4a56a97cf
Binary files /dev/null and b/client/fonts/Lato-Heavy.ttf differ
diff --git a/client/fonts/Lato-HeavyItalic.ttf b/client/fonts/Lato-HeavyItalic.ttf
new file mode 100644
index 000000000..b25f78d1f
Binary files /dev/null and b/client/fonts/Lato-HeavyItalic.ttf differ
diff --git a/client/fonts/Lato-Medium.ttf b/client/fonts/Lato-Medium.ttf
new file mode 100644
index 000000000..a208b9912
Binary files /dev/null and b/client/fonts/Lato-Medium.ttf differ
diff --git a/client/fonts/Lato-MediumItalic.ttf b/client/fonts/Lato-MediumItalic.ttf
new file mode 100644
index 000000000..ac0ee4c9c
Binary files /dev/null and b/client/fonts/Lato-MediumItalic.ttf differ
diff --git a/client/fonts/Lato-Semibold.ttf b/client/fonts/Lato-Semibold.ttf
new file mode 100644
index 000000000..0b95c6430
Binary files /dev/null and b/client/fonts/Lato-Semibold.ttf differ
diff --git a/client/fonts/Lato-SemiboldItalic.ttf b/client/fonts/Lato-SemiboldItalic.ttf
new file mode 100644
index 000000000..ed70b6759
Binary files /dev/null and b/client/fonts/Lato-SemiboldItalic.ttf differ
diff --git a/client/images/controls/checkbox_hover.png b/client/images/controls/checkbox_hover.png
deleted file mode 100644
index c6415422d..000000000
Binary files a/client/images/controls/checkbox_hover.png and /dev/null differ
diff --git a/client/images/controls/checkbox_unchecked.png b/client/images/controls/checkbox_unchecked.png
deleted file mode 100644
index 657d15dd6..000000000
Binary files a/client/images/controls/checkbox_unchecked.png and /dev/null differ
diff --git a/client/images/icon.png b/client/images/icon.png
new file mode 100644
index 000000000..b7d5d4232
Binary files /dev/null and b/client/images/icon.png differ
diff --git a/client/images/main.ico b/client/images/main.ico
new file mode 100644
index 000000000..e64d04d54
Binary files /dev/null and b/client/images/main.ico differ
diff --git a/client/platform_win/amnezia-client.exe.manifest b/client/platform_win/amnezia-client.exe.manifest
new file mode 100644
index 000000000..418f78d7c
--- /dev/null
+++ b/client/platform_win/amnezia-client.exe.manifest
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <assemblyIdentity name="amneziavpn.amneziavpn" version="0.0.0.1" processorArchitecture="x86" type="win32" />
+  <description>amneziavpn</description>
+  <!-- Identify the application security requirements. -->
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel
+          level="requireAdministrator"
+          uiAccess="false"/>
+        </requestedPrivileges>
+       </security>
+   </trustInfo>
+</assembly>
diff --git a/client/publib/macos_functions.mm b/client/publib/macos_functions.mm
new file mode 100644
index 000000000..9be8668fb
--- /dev/null
+++ b/client/publib/macos_functions.mm
@@ -0,0 +1,37 @@
+#include "macos_functions.h"
+#include <QDebug>
+#import <AppKit/AppKit.h>
+
+MacOSFunctions &MacOSFunctions::instance()
+{
+    static MacOSFunctions s;
+    return s;
+}
+
+MacOSFunctions::MacOSFunctions()
+{
+    registerThemeNotification();
+}
+
+bool MacOSFunctions::isMenuBarUseDarkTheme() const
+{
+    NSDictionary *dict = [[NSUserDefaults standardUserDefaults] persistentDomainForName:NSGlobalDomain];
+    id style = [dict objectForKey:@"AppleInterfaceStyle"];
+    BOOL darkModeOn = ( style && [style isKindOfClass:[NSString class]] && NSOrderedSame == [style caseInsensitiveCompare:@"dark"] );
+
+    return darkModeOn;
+}
+
+
+void MacOSFunctions::registerThemeNotification()
+{
+  // [[NSDistributedNotificationCenter defaultCenter] addObserver:self selector:@selector(darkModeChanged:) name:@"AppleInterfaceThemeChangedNotification" object:nil];
+}
+
+
+void darkModeChanged(NSNotification*notif)
+{
+    Q_UNUSED(notif);
+    qDebug() << "Dark mode changed" << MacOSFunctions::instance().isMenuBarUseDarkTheme();
+}
+
diff --git a/client/res.qrc b/client/res.qrc
index cf0eaa83b..13226c9be 100644
--- a/client/res.qrc
+++ b/client/res.qrc
@@ -12,8 +12,6 @@
         <file>images/controls/radio_on.png</file>
         <file>images/download.png</file>
         <file>images/upload.png</file>
-        <file>images/controls/checkbox_hover.png</file>
-        <file>images/controls/checkbox_unchecked.png</file>
         <file>images/tray/active.png</file>
         <file>images/tray/default.png</file>
         <file>images/tray/error.png</file>