diff --git a/assets/vikunja_logo_full.png b/assets/vikunja_logo_full.png
index 57e4652..7fd28cf 100644
Binary files a/assets/vikunja_logo_full.png and b/assets/vikunja_logo_full.png differ
diff --git a/assets/vikunja_logo_full_white.png b/assets/vikunja_logo_full_white.png
new file mode 100644
index 0000000..850f993
Binary files /dev/null and b/assets/vikunja_logo_full_white.png differ
diff --git a/lib/main.dart b/lib/main.dart
index 440a37a..89cc5c4 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -61,6 +61,7 @@ class VikunjaApp extends StatelessWidget {
     return new MaterialApp(
       title: 'Vikunja',
       theme: buildVikunjaTheme(),
+      darkTheme: buildVikunjaDarkTheme(),
       home: this.home,
     );
   }
diff --git a/lib/pages/user/login.dart b/lib/pages/user/login.dart
index aca7e76..fbcae00 100644
--- a/lib/pages/user/login.dart
+++ b/lib/pages/user/login.dart
@@ -34,7 +34,9 @@ class _LoginPageState extends State<LoginPage> {
                     Padding(
                       padding: EdgeInsets.symmetric(vertical: 30),
                       child: Image(
-                        image: AssetImage('assets/vikunja_logo_full.png'),
+                        image: Theme.of(context).brightness == Brightness.dark
+                            ? AssetImage('assets/vikunja_logo_full_white.png')
+                            : AssetImage('assets/vikunja_logo_full.png'),
                         height: 85.0,
                         semanticLabel: 'Vikunja Logo',
                       ),
diff --git a/lib/theme/button.dart b/lib/theme/button.dart
index a49812b..79b70a4 100644
--- a/lib/theme/button.dart
+++ b/lib/theme/button.dart
@@ -24,7 +24,9 @@ class FancyButton extends StatelessWidget {
           height: height,
           decoration: BoxDecoration(boxShadow: [
             BoxShadow(
-              color: vButtonShadow,
+              color: Theme.of(context).brightness == Brightness.dark
+                  ? vButtonShadowDark
+                  : vButtonShadow,
               offset: Offset(-5, 5),
               blurRadius: 10,
             ),
diff --git a/lib/theme/constants.dart b/lib/theme/constants.dart
index 8272190..dbd1a3f 100644
--- a/lib/theme/constants.dart
+++ b/lib/theme/constants.dart
@@ -15,6 +15,7 @@ const vGreen = Color(0xFF00CE6E);
 
 const vButtonColor = vPrimary;
 const vButtonTextColor = vWhite;
+const vButtonShadowDark = Color(0xFF0b2a4a);
 const vButtonShadow = Color(0xFFb2d9ff);
 
 ///////////
diff --git a/lib/theme/theme.dart b/lib/theme/theme.dart
index 55ba656..f342a1e 100644
--- a/lib/theme/theme.dart
+++ b/lib/theme/theme.dart
@@ -1,8 +1,16 @@
 import 'package:flutter/material.dart';
 import 'package:vikunja_app/theme/constants.dart';
 
-ThemeData buildVikunjaTheme() {
-  var base = ThemeData.light();
+ThemeData buildVikunjaTheme() => _buildVikunjaTheme(ThemeData.light());
+
+ThemeData buildVikunjaDarkTheme() {
+  ThemeData base = _buildVikunjaTheme(ThemeData.dark());
+  return base.copyWith(
+    accentColor: vWhite,
+  );
+}
+
+ThemeData _buildVikunjaTheme(ThemeData base) {
   return base.copyWith(
     errorColor: vRed,
     primaryColor: vPrimaryDark,
diff --git a/pubspec.yaml b/pubspec.yaml
index 2ee8255..9ce7b6f 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -34,6 +34,7 @@ flutter:
     - assets/graphics/hypnotize.png
     - assets/vikunja_logo.png
     - assets/vikunja_logo_full.png
+    - assets/vikunja_logo_full_white.png
   fonts:
     - family: Quicksand
       fonts: