diff --git a/README.md b/README.md
index e4616fa91cc5..8b58496c2147 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
 [![Docs](https://readthedocs.org/projects/invoice-ninja/badge/?version=latest)](http://docs.invoiceninja.com/en/latest/?badge=latest)
 [![Join the chat at https://gitter.im/hillelcoren/invoice-ninja](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/hillelcoren/invoice-ninja?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-## [Hosted](https://www.invoiceninja.com) | [Self-hosted](https://www.invoiceninja.org) | [iPhone](https://itunes.apple.com/WebObjects/MZStore.woa/wa/viewSoftware?id=1072566815&mt=8)
+## [Hosted](https://www.invoiceninja.com) | [Self-hosted](https://www.invoiceninja.org) | [iPhone](https://itunes.apple.com/WebObjects/MZStore.woa/wa/viewSoftware?id=1072566815&mt=8) | [Android (Beta)](https://play.google.com/apps/testing/com.echoman.invoiceninja)
 
 Watch this [YouTube Video](https://www.youtube.com/watch?v=xHGKvadapbA) for an overview of the app's features.
 
diff --git a/resources/views/accounts/localization.blade.php b/resources/views/accounts/localization.blade.php
index fecfb8086a6b..b248770fd089 100644
--- a/resources/views/accounts/localization.blade.php
+++ b/resources/views/accounts/localization.blade.php
@@ -82,8 +82,8 @@
             if ( ! currency || ! currency.symbol) {
                 $('.currrency_radio').hide();
             } else {
-                symbolExample = formatMoney(1000, currencyId, {{ Auth::user()->account->country_id }}, '{{ CURRENCY_DECORATOR_SYMBOL }}');
-                codeExample = formatMoney(1000, currencyId, {{ Auth::user()->account->country_id }}, '{{ CURRENCY_DECORATOR_CODE }}');
+                symbolExample = formatMoney(1000, currencyId, {{ Auth::user()->account->country_id ?: DEFAULT_COUNTRY }}, '{{ CURRENCY_DECORATOR_SYMBOL }}');
+                codeExample = formatMoney(1000, currencyId, {{ Auth::user()->account->country_id ?: DEFAULT_COUNTRY }}, '{{ CURRENCY_DECORATOR_CODE }}');
                 $('.currrency_radio').show();
             }
 
diff --git a/resources/views/invoices/edit.blade.php b/resources/views/invoices/edit.blade.php
index aadc48d183d8..ce634d319a15 100644
--- a/resources/views/invoices/edit.blade.php
+++ b/resources/views/invoices/edit.blade.php
@@ -129,7 +129,7 @@
                             @if (Utils::isConfirmed())
 	                            <span style="vertical-align:text-top;color:red" class="fa fa-exclamation-triangle"
 	                                    data-bind="visible: $data.email_error, tooltip: {title: $data.email_error}"></span>
-	                            <span style="vertical-align:text-top" class="fa fa-info-circle"
+	                            <span style="vertical-align:text-top;padding-top:2px" class="fa fa-info-circle"
 	                                    data-bind="visible: $data.invitation_status, tooltip: {title: $data.invitation_status, html: true},
 	                                    style: {color: $data.info_color}"></span>
 								<span class="signature-wrapper">&nbsp;