diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/login/LoginActivity.java b/mifosng-android/src/main/java/com/mifos/mifosxdroid/login/LoginActivity.java
index 1cc0101239..b8529aa031 100755
--- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/login/LoginActivity.java
+++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/login/LoginActivity.java
@@ -13,6 +13,7 @@
 import android.text.TextWatcher;
 import android.view.KeyEvent;
 import android.view.View;
+import android.widget.Button;
 import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@@ -57,7 +58,7 @@ public class LoginActivity extends MifosBaseActivity implements LoginMvpView {
     TextView tv_full_url;
 
     @BindView(R.id.bt_connectionSettings)
-    TextView bt_connectionSettings;
+    Button bt_connectionSettings;
 
     @BindView(R.id.et_tenantIdentifier)
     EditText et_tenantIdentifier;
diff --git a/mifosng-android/src/main/res/layout/activity_login.xml b/mifosng-android/src/main/res/layout/activity_login.xml
index 1ffa96b195..9abf12d909 100755
--- a/mifosng-android/src/main/res/layout/activity_login.xml
+++ b/mifosng-android/src/main/res/layout/activity_login.xml
@@ -33,9 +33,9 @@
                     android:nextFocusDown="@+id/bt_login" />
             </android.support.design.widget.TextInputLayout>
 
-            <TextView
+            <android.support.v7.widget.AppCompatButton
                 android:id="@+id/bt_connectionSettings"
-                style="@style/TextView.ConnectionSettings" />
+                style="@style/Button.ConnectionSettings" />
 
             <LinearLayout
                 android:id="@+id/ll_connectionSettings"
diff --git a/mifosng-android/src/main/res/values/styles_button.xml b/mifosng-android/src/main/res/values/styles_button.xml
index c0b4fa5f54..43cac278c8 100755
--- a/mifosng-android/src/main/res/values/styles_button.xml
+++ b/mifosng-android/src/main/res/values/styles_button.xml
@@ -18,6 +18,12 @@
         <item name="android:layout_width">0dp</item>
     </style>
 
+    <style name="Button.ConnectionSettings">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginTop">10dp</item>
+        <item name="android:text">"Connection settings"</item>
+    </style>
 
     <style name="Button.Login" parent="Button.Base">
         <item name="android:layout_width">match_parent</item>
diff --git a/mifosng-android/src/main/res/values/styles_text.xml b/mifosng-android/src/main/res/values/styles_text.xml
index 9e172f4b3b..eb7d4be6e8 100755
--- a/mifosng-android/src/main/res/values/styles_text.xml
+++ b/mifosng-android/src/main/res/values/styles_text.xml
@@ -45,13 +45,6 @@
         <item name="android:layout_marginLeft">10dp</item>
     </style>
 
-    <style name="TextView.ConnectionSettings" parent="TextView.Base">
-        <item name="android:layout_marginLeft">5dp</item>
-        <item name="android:layout_marginTop">10dp</item>
-        <item name="android:text">"Connection settings"</item>
-        <item name="android:textColor">@color/primary</item>
-    </style>
-
     <style name="TextView.Search" parent="TextView.Base">
         <item name="android:layout_marginTop">10dp</item>
         <item name="android:layout_marginBottom">10dp</item>