diff --git a/assets/images/logo.png b/assets/images/icon.png
similarity index 100%
rename from assets/images/logo.png
rename to assets/images/icon.png
diff --git a/lib/ui/app/confirm_email.dart b/lib/ui/app/confirm_email.dart
index a11b19327..ce5e9ed04 100644
--- a/lib/ui/app/confirm_email.dart
+++ b/lib/ui/app/confirm_email.dart
@@ -27,6 +27,11 @@ class ConfirmEmail extends StatelessWidget {
               mainAxisAlignment: MainAxisAlignment.center,
               crossAxisAlignment: CrossAxisAlignment.center,
               children: [
+                Image.asset(
+                  'assets/images/icon.png',
+                  height: 80,
+                ),
+                SizedBox(height: 80),
                 Text(
                   localization.confirmYourEmailAddress,
                   style: Theme.of(context).textTheme.headline6,
diff --git a/lib/ui/app/main_screen.dart b/lib/ui/app/main_screen.dart
index 90c5ad061..ed33e36b2 100644
--- a/lib/ui/app/main_screen.dart
+++ b/lib/ui/app/main_screen.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/foundation.dart';
 import 'package:invoiceninja_flutter/constants.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_redux/flutter_redux.dart';
@@ -84,7 +85,7 @@ class MainScreen extends StatelessWidget {
           child: LoadingIndicator(),
           color: Theme.of(context).cardColor,
         );
-      } else if (!state.isUserConfirmed) {
+      } else if (!state.isUserConfirmed || !kReleaseMode) {
         return ConfirmEmailBuilder();
       }
 
diff --git a/lib/ui/app/menu_drawer.dart b/lib/ui/app/menu_drawer.dart
index 3f0177170..cf5237353 100644
--- a/lib/ui/app/menu_drawer.dart
+++ b/lib/ui/app/menu_drawer.dart
@@ -69,7 +69,7 @@ class MenuDrawer extends StatelessWidget {
             width: MenuDrawer.LOGO_WIDTH,
             url: company.settings.companyLogo,
           )
-        : Image.asset('assets/images/logo.png', width: MenuDrawer.LOGO_WIDTH);
+        : Image.asset('assets/images/icon.png', width: MenuDrawer.LOGO_WIDTH);
 
     Widget _companyListItem(CompanyEntity company) {
       final userCompany = state.userCompanyStates
@@ -896,7 +896,7 @@ void _showAbout(BuildContext context) async {
 
   final appLegalese = '© ${DateTime.now().year} Invoice Ninja';
   final apppIcon = Image.asset(
-    'assets/images/logo.png',
+    'assets/images/icon.png',
     width: 40.0,
     height: 40.0,
   );
diff --git a/lib/ui/app/resources/cached_image.dart b/lib/ui/app/resources/cached_image.dart
index b082b93a3..8cab3fd2e 100644
--- a/lib/ui/app/resources/cached_image.dart
+++ b/lib/ui/app/resources/cached_image.dart
@@ -44,7 +44,7 @@ class CachedImage extends StatelessWidget {
       imageUrl: url,
       placeholder: (context, url) => CircularProgressIndicator(),
       errorWidget: (context, url, Object error) =>
-          Image.asset('assets/images/logo.png', width: 32, height: 30),
+          Image.asset('assets/images/icon.png', width: 32, height: 30),
     );
   }
 }
diff --git a/lib/ui/auth/init_screen.dart b/lib/ui/auth/init_screen.dart
index fcbe834a3..d11d20ef2 100644
--- a/lib/ui/auth/init_screen.dart
+++ b/lib/ui/auth/init_screen.dart
@@ -17,7 +17,7 @@ class InitScreen extends StatelessWidget {
               mainAxisSize: MainAxisSize.max,
               children: <Widget>[
                 Expanded(
-                  child: Center(child: Image.asset('assets/images/logo.png')),
+                  child: Center(child: Image.asset('assets/images/icon.png')),
                 ),
                 SizedBox(
                   height: 4.0,
diff --git a/lib/ui/auth/login_view.dart b/lib/ui/auth/login_view.dart
index bc7c03826..c1bdad2fb 100644
--- a/lib/ui/auth/login_view.dart
+++ b/lib/ui/auth/login_view.dart
@@ -288,7 +288,7 @@ class _LoginState extends State<LoginView> {
               padding: EdgeInsets.only(top: 20.0, bottom: 20.0),
               child: Center(
                 child: InkWell(
-                  child: Image.asset('assets/images/logo.png',
+                  child: Image.asset('assets/images/icon.png',
                       width: 100, height: 100),
                   onTap: () {
                     launch(kSiteUrl, forceSafariVC: false, forceWebView: false);
diff --git a/pubspec.foss.yaml b/pubspec.foss.yaml
index 00ff3c9e9..2934866f3 100644
--- a/pubspec.foss.yaml
+++ b/pubspec.foss.yaml
@@ -12,7 +12,7 @@ environment:
 flutter_icons:
   android: "launcher_icon"
   ios: false
-  image_path: "assets/images/logo.png"
+  image_path: "assets/images/icon.png"
 
 dependencies:
   flutter:
@@ -84,6 +84,6 @@ flutter:
   uses-material-design: true
 
   assets:
-    - assets/images/logo.png
+    - assets/images/icon.png
     - assets/images/google-icon.png
     - assets/images/payment_types/
diff --git a/pubspec.yaml b/pubspec.yaml
index 495402186..596e0380d 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -12,7 +12,7 @@ environment:
 flutter_icons:
   android: "launcher_icon"
   ios: false
-  image_path: "assets/images/logo.png"
+  image_path: "assets/images/icon.png"
 
 dependencies:
   flutter:
@@ -103,6 +103,6 @@ flutter:
   uses-material-design: true
 
   assets:
-    - assets/images/logo.png
+    - assets/images/icon.png
     - assets/images/google-icon.png
     - assets/images/payment_types/
\ No newline at end of file