diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ea0f9129..4b1aaca5 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -48,8 +48,8 @@
                 <category android:name="android.intent.category.BROWSABLE"/>
 
                 <data
-                    android:host="fast-for-github.firebaseapp.com"
-                    android:scheme="https"/>
+                    android:host="login"
+                    android:scheme="fasthub"/>
             </intent-filter>
         </activity>
         <activity
diff --git a/app/src/main/java/com/fastaccess/helper/GithubConfigHelper.java b/app/src/main/java/com/fastaccess/helper/GithubConfigHelper.java
index 65c22a69..a065260d 100644
--- a/app/src/main/java/com/fastaccess/helper/GithubConfigHelper.java
+++ b/app/src/main/java/com/fastaccess/helper/GithubConfigHelper.java
@@ -7,7 +7,7 @@ import com.fastaccess.BuildConfig;
  */
 
 public class GithubConfigHelper {
-    private static final String REDIRECT_URL = "https://fast-for-github.firebaseapp.com/__/auth/handler";
+    private static final String REDIRECT_URL = "fasthub://login";
 
     private static final String GITHUB_FDROID_CLIENT_ID = "290c67ea4022804763e0";
     private static final String GITHUB_FDROID_SECRET = "02c6a47c2cc25a95f0d58eba90ea1078f74e5740";
diff --git a/app/src/main/java/com/fastaccess/provider/scheme/SchemeParser.java b/app/src/main/java/com/fastaccess/provider/scheme/SchemeParser.java
index 23a450ca..1a222745 100644
--- a/app/src/main/java/com/fastaccess/provider/scheme/SchemeParser.java
+++ b/app/src/main/java/com/fastaccess/provider/scheme/SchemeParser.java
@@ -83,12 +83,11 @@ public class SchemeParser {
                 data = Uri.parse(prefix);
             }
         }
-        if (!data.getPathSegments().isEmpty()) {
+        if (data.getPathSegments() != null && !data.getPathSegments().isEmpty()) {
             if (IGNORED_LIST.contains(data.getPathSegments().get(0))) return null;
-        } else {
-            return null;
+            return getIntentForURI(context, data, showRepoBtn);
         }
-        return getIntentForURI(context, data, showRepoBtn);
+        return null;
     }
 
     @Nullable private static Intent getIntentForURI(@NonNull Context context, @NonNull Uri data, boolean showRepoBtn) {
diff --git a/app/src/main/java/com/fastaccess/provider/scheme/StackBuilderSchemeParser.java b/app/src/main/java/com/fastaccess/provider/scheme/StackBuilderSchemeParser.java
index 6129e1f3..84cb25b8 100644
--- a/app/src/main/java/com/fastaccess/provider/scheme/StackBuilderSchemeParser.java
+++ b/app/src/main/java/com/fastaccess/provider/scheme/StackBuilderSchemeParser.java
@@ -84,12 +84,11 @@ public class StackBuilderSchemeParser {
                 data = Uri.parse(prefix);
             }
         }
-        if (!data.getPathSegments().isEmpty()) {
+        if (data.getPathSegments() != null && !data.getPathSegments().isEmpty()) {
             if (IGNORED_LIST.contains(data.getPathSegments().get(0))) return null;
-        } else {
-            return null;
+            return getIntentForURI(context, data);
         }
-        return getIntentForURI(context, data);
+        return null;
     }
 
     @Nullable private static TaskStackBuilder getIntentForURI(@NonNull Context context, @NonNull Uri data) {
diff --git a/app/src/main/java/com/fastaccess/ui/base/BaseActivity.java b/app/src/main/java/com/fastaccess/ui/base/BaseActivity.java
index 2fbb7d86..ee0fae36 100644
--- a/app/src/main/java/com/fastaccess/ui/base/BaseActivity.java
+++ b/app/src/main/java/com/fastaccess/ui/base/BaseActivity.java
@@ -39,6 +39,7 @@ import com.fastaccess.ui.base.mvp.presenter.BasePresenter;
 import com.fastaccess.ui.modules.about.FastHubAboutActivity;
 import com.fastaccess.ui.modules.changelog.ChangelogBottomSheetDialog;
 import com.fastaccess.ui.modules.gists.GistsListActivity;
+import com.fastaccess.ui.modules.login.LoginActivity;
 import com.fastaccess.ui.modules.login.LoginChooserActivity;
 import com.fastaccess.ui.modules.main.MainActivity;
 import com.fastaccess.ui.modules.main.donation.DonationActivity;
@@ -141,7 +142,7 @@ public abstract class BaseActivity<V extends BaseMvp.FAView, P extends BasePrese
     @Override public void onMessageDialogActionClicked(boolean isOk, @Nullable Bundle bundle) {
         if (isOk && bundle != null) {
             boolean logout = bundle.getBoolean("logout");
-            if (logout){
+            if (logout) {
                 onRequireLogin();
 //                if(App.getInstance().getGoogleApiClient().isConnected())
 //                    Auth.CredentialsApi.disableAutoSignIn(App.getInstance().getGoogleApiClient());
@@ -283,8 +284,8 @@ public abstract class BaseActivity<V extends BaseMvp.FAView, P extends BasePrese
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if(requestCode==REFRESH_CODE)
-            if(resultCode==RESULT_OK)
+        if (requestCode == REFRESH_CODE)
+            if (resultCode == RESULT_OK)
                 recreate();
         super.onActivityResult(requestCode, resultCode, data);
     }
@@ -380,6 +381,7 @@ public abstract class BaseActivity<V extends BaseMvp.FAView, P extends BasePrese
     }
 
     private void setupTheme() {
+        if (this instanceof LoginActivity || this instanceof LoginChooserActivity) return;
         int themeMode = PrefGetter.getThemeType(getApplicationContext());
         int themeColor = PrefGetter.getThemeColor(getApplicationContext());
         if (themeMode == PrefGetter.LIGHT) {
diff --git a/app/src/main/java/com/fastaccess/ui/modules/login/LoginActivity.java b/app/src/main/java/com/fastaccess/ui/modules/login/LoginActivity.java
index 5d0e02bf..1680b550 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/login/LoginActivity.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/login/LoginActivity.java
@@ -74,7 +74,7 @@ public class LoginActivity extends BaseActivity<LoginMvp.View, LoginPresenter> i
 
     @Optional @OnClick(R.id.browserLogin) void onOpenBrowser() {
         Uri uri = getPresenter().getAuthorizationUrl();
-        ActivityHelper.login(this, uri);
+        ActivityHelper.startCustomTab(this, uri);
     }
 
     @Optional @OnClick(R.id.login) public void onClick() {
@@ -256,7 +256,11 @@ public class LoginActivity extends BaseActivity<LoginMvp.View, LoginPresenter> i
     }
 
     @Override public void onBackPressed() {
-        startActivity(new Intent(this, LoginChooserActivity.class));
+        if (!(this instanceof LoginChooserActivity)) {
+            startActivity(new Intent(this, LoginChooserActivity.class));
+        } else {
+            finish();
+        }
     }
 
     @Override public void hideProgress() {
diff --git a/app/src/main/java/com/fastaccess/ui/modules/login/LoginChooserActivity.java b/app/src/main/java/com/fastaccess/ui/modules/login/LoginChooserActivity.java
index 96db9d9b..0893fb80 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/login/LoginChooserActivity.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/login/LoginChooserActivity.java
@@ -24,10 +24,6 @@ public class LoginChooserActivity extends LoginActivity {
         LoginActivity.start(this, true);
     }
 
-    @Override public void onBackPressed() {
-        finish();
-    }
-
     @OnClick(R.id.accessToken) public void onAccessTokenClicked() {
         LoginActivity.start(this, false);
     }
diff --git a/app/src/main/java/com/fastaccess/ui/modules/login/LoginPresenter.java b/app/src/main/java/com/fastaccess/ui/modules/login/LoginPresenter.java
index e4cc9ceb..90d24959 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/login/LoginPresenter.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/login/LoginPresenter.java
@@ -101,7 +101,7 @@ public class LoginPresenter extends BasePresenter<LoginMvp.View> implements Logi
         if (userModel != null) {
             userModel.setToken(PrefGetter.getToken());
             userModel.save(userModel);
-            if(getView()!=null)
+            if (getView() != null)
                 getView().onSuccessfullyLoggedIn(userModel);
             else
                 sendToView(LoginMvp.View::onSuccessfullyLoggedIn);
@@ -115,8 +115,8 @@ public class LoginPresenter extends BasePresenter<LoginMvp.View> implements Logi
         boolean usernameIsEmpty = InputHelper.isEmpty(username);
         boolean passwordIsEmpty = InputHelper.isEmpty(password);
         if (getView() == null) return;
-        getView().onEmptyUserName(!ignore&&usernameIsEmpty);
-        getView().onEmptyPassword(!ignore&&passwordIsEmpty);
+        getView().onEmptyUserName(!ignore && usernameIsEmpty);
+        getView().onEmptyPassword(!ignore && passwordIsEmpty);
         if ((!usernameIsEmpty && !passwordIsEmpty) || ignore) {
             String authToken = Credentials.basic(username, password);
             if (isBasicAuth) {
diff --git a/app/src/main/res/layouts/main_layouts/layout/login_chooser_layout.xml b/app/src/main/res/layouts/main_layouts/layout/login_chooser_layout.xml
index 7e1d3b5a..f444bf15 100644
--- a/app/src/main/res/layouts/main_layouts/layout/login_chooser_layout.xml
+++ b/app/src/main/res/layouts/main_layouts/layout/login_chooser_layout.xml
@@ -146,24 +146,27 @@
         android:id="@+id/language_selector"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/material_grey_200"
-        android:layout_gravity="bottom">
+        android:layout_gravity="bottom"
+        android:background="@color/material_grey_200">
+
         <View
             android:layout_width="match_parent"
             android:layout_height="1dp"
-            android:background="@color/white"
-            android:alpha="0.5"/>
+            android:alpha="0.5"
+            android:background="@color/white"/>
+
         <com.fastaccess.ui.widgets.FontTextView
             android:id="@+id/language_selector_clicker"
+            style="@style/TextAppearance.AppCompat.Medium"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
             android:background="?selectableItemBackground"
             android:clickable="true"
             android:focusable="true"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
             android:gravity="center"
             android:padding="@dimen/spacing_xs_large"
-            android:textAllCaps="true"
-            android:text="@string/choose_language_title"/>
+            android:text="@string/choose_language_title"
+            android:textAllCaps="true"/>
     </RelativeLayout>
 
 </android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-sw720dp/dimens.xml b/app/src/main/res/values-sw720dp/dimens.xml
index ac92969b..8f7a6497 100644
--- a/app/src/main/res/values-sw720dp/dimens.xml
+++ b/app/src/main/res/values-sw720dp/dimens.xml
@@ -2,5 +2,5 @@
 <resources>
     <dimen name="layout_margin">58dp</dimen>
     <dimen name="fab_margin">24dp</dimen>
-    <integer name="small_spans">2</integer>
+    <integer name="small_spans">1</integer>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 261f3481..828e0330 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -6,6 +6,7 @@
         <item name="colorPrimaryDark">@color/material_indigo_900</item>
         <item name="colorAccent">@color/material_blue_accent_700</item>
         <item name="colorControlNormal">?colorAccent</item>
+        <item name="icon_color">@color/white</item>
     </style>
 
     <style name="SplashTheme" parent="Theme.AppCompat.Light.NoActionBar">