diff --git a/app/routes.php b/app/routes.php
index fc436e177..3a621108c 100755
--- a/app/routes.php
+++ b/app/routes.php
@@ -301,7 +301,7 @@ define('NINJA_GATEWAY_ID', GATEWAY_AUTHORIZE_NET);
 define('NINJA_GATEWAY_CONFIG', '{"apiLoginId":"626vWcD5","transactionKey":"4bn26TgL9r4Br4qJ","testMode":"","developerMode":""}');
 define('NINJA_WEB_URL', 'https://www.invoiceninja.com');
 define('NINJA_APP_URL', 'https://app.invoiceninja.com');
-define('NINJA_VERSION', '1.6.1');
+define('NINJA_VERSION', '1.7.0');
 define('NINJA_DATE', '2000-01-01');
 define('NINJA_FROM_EMAIL', 'maildelivery@invoiceninja.com');
 define('RELEASES_URL', 'https://github.com/hillelcoren/invoice-ninja/releases/');
diff --git a/app/views/master.blade.php b/app/views/master.blade.php
index d174c8739..748513979 100755
--- a/app/views/master.blade.php
+++ b/app/views/master.blade.php
@@ -18,9 +18,9 @@
     <meta name="csrf-token" content="<?= csrf_token() ?>">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
-    <link href='//fonts.googleapis.com/css?family=Roboto:400,700,900,100' rel='stylesheet' type='text/css'>
-    <link href='//fonts.googleapis.com/css?family=Roboto+Slab:400,300,700' rel='stylesheet' type='text/css'>
-    <link href="{{ asset('favicon.ico') }}" rel="icon" type="image/x-icon">
+    <link href="//fonts.googleapis.com/css?family=Roboto:400,700,900,100" rel="stylesheet" type="text/css">
+    <link href="//fonts.googleapis.com/css?family=Roboto+Slab:400,300,700" rel="stylesheet" type="text/css">
+    <link href="{{ asset('favicon.png') }}" rel="shortcut icon">
     <link rel="canonical" href="{{ NINJA_APP_URL }}/{{ Request::path() }}"></link>
 
     <script src="{{ asset('built.js') }}?no_cache={{ NINJA_VERSION }}" type="text/javascript"></script>
diff --git a/public/favicon.gif b/public/favicon.gif
deleted file mode 100644
index a41889380..000000000
Binary files a/public/favicon.gif and /dev/null differ
diff --git a/public/favicon.ico b/public/favicon.ico
deleted file mode 100644
index 20bc39679..000000000
Binary files a/public/favicon.ico and /dev/null differ
diff --git a/public/favicon.png b/public/favicon.png
new file mode 100755
index 000000000..8032c422b
Binary files /dev/null and b/public/favicon.png differ