diff --git a/app/res/drawable-ldpi/clear_btn.png b/app/res/drawable-ldpi/clear_btn.png
new file mode 100644
index 000000000..2bdcc84df
Binary files /dev/null and b/app/res/drawable-ldpi/clear_btn.png differ
diff --git a/app/res/drawable-mdpi/clear_btn.png b/app/res/drawable-mdpi/clear_btn.png
index bc3b98507..c25ead000 100644
Binary files a/app/res/drawable-mdpi/clear_btn.png and b/app/res/drawable-mdpi/clear_btn.png differ
diff --git a/app/res/drawable/numeric_button.xml b/app/res/drawable/numeric_button.xml
new file mode 100644
index 000000000..610ad3499
--- /dev/null
+++ b/app/res/drawable/numeric_button.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+ Copyright (c) 2014 Oleksandr Tyshkovets <olexandr.tyshkovets@gmail.com>
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" >
+        <shape>
+            <solid
+                android:color="@color/default_line_indicator_selected_color" />
+            <corners
+                android:radius="200dp" />
+            <stroke
+                android:width="1dp"
+                android:color="@color/abs__bright_foreground_disabled_holo_light" />
+        </shape>
+    </item>
+    <item android:state_enabled="false" >
+        <shape>
+            <solid
+                android:color="@color/abs__primary_text_disable_only_holo_dark" />
+            <corners
+                android:radius="200dp" />
+            <stroke
+                android:width="1dp"
+                android:color="@color/abs__bright_foreground_disabled_holo_light" />
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <solid android:color="@android:color/transparent" />
+            <corners
+                android:radius="200dp" />
+            <stroke
+                android:width="1dp"
+                android:color="@color/abs__bright_foreground_disabled_holo_light" />
+        </shape>
+    </item>
+</selector>
diff --git a/app/res/layout/fragment_numeric_keyboard.xml b/app/res/layout/fragment_numeric_keyboard.xml
index e4a007df8..7319f3359 100644
--- a/app/res/layout/fragment_numeric_keyboard.xml
+++ b/app/res/layout/fragment_numeric_keyboard.xml
@@ -16,216 +16,160 @@
  limitations under the License.
 -->
 
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_alignParentBottom="true"
-                android:layout_centerHorizontal="true">
-
-    <LinearLayout
-        android:id="@+id/zero"
-        android:layout_width="match_parent"
-        android:layout_height="55dp"
-        android:layout_alignParentBottom="true"
-        android:orientation="horizontal"
-        android:weightSum="3" >
-
-        <Button
-            android:id="@+id/empty_btn"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:text=""
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              android:orientation="vertical"
+              android:weightSum="2">
+
+    <LinearLayout android:layout_width="fill_parent"
+                  android:layout_height="fill_parent"
+                  android:orientation="vertical"
+                  android:gravity="center"
+                  android:layout_weight="0.8"
+                  android:weightSum="1">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/ic_launcher"
+            android:layout_weight="0.1" />
+
+        <TextView
+            android:id="@+id/passcode_label"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="Enter passcode"
             android:textSize="25sp"
-            android:enabled="false" />
-
-        <Button
-            android:id="@+id/zero_btn"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:text="0"
-            android:textSize="25sp"/>
-
-        <ImageButton
-            android:id="@+id/delete_btn"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:src="@drawable/clear_btn" />
+            android:layout_weight="0.1" />
 
-    </LinearLayout>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:gravity="center"
+            android:layout_weight="0.1" >
 
-    <LinearLayout
-        android:id="@+id/seven_to_nine"
-        android:layout_width="match_parent"
-        android:layout_height="55dp"
-        android:layout_above="@+id/zero"
-        android:orientation="horizontal"
-        android:weightSum="3" >
-
-        <Button
-            android:id="@+id/seven_btn"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:text="7"
-            android:textSize="25sp" />
-
-        <Button
-            android:id="@+id/eight_btn"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:text="8"
-            android:textSize="25sp" />
-
-        <Button
-            android:id="@+id/nine_btn"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:text="9"
-            android:textSize="25sp" />
-    </LinearLayout>
+            <EditText
+                android:id="@+id/passcode1"
+                style="@style/PasscodeEditText" />
 
-    <LinearLayout
-        android:id="@+id/four_to_six"
-        android:layout_width="match_parent"
-        android:layout_height="55dp"
-        android:layout_above="@+id/seven_to_nine"
-        android:orientation="horizontal"
-        android:weightSum="3" >
-
-        <Button
-            android:id="@+id/four_btn"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:text="4"
-            android:textSize="25sp" />
-
-        <Button
-            android:id="@+id/five_btn"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:text="5"
-            android:textSize="25sp" />
-
-        <Button
-            android:id="@+id/six_btn"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:text="6"
-            android:textSize="25sp" />
-    </LinearLayout>
+            <EditText
+                android:id="@+id/passcode2"
+                style="@style/PasscodeEditText" />
 
-    <LinearLayout
-        android:id="@+id/one_to_three"
-        android:layout_width="match_parent"
-        android:layout_height="55dp"
-        android:layout_above="@+id/four_to_six"
-        android:orientation="horizontal"
-        android:weightSum="3" >
-
-        <Button
-            android:id="@+id/one_btn"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:text="1"
-            android:textSize="25sp" />
-
-        <Button
-            android:id="@+id/two_btn"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:text="2"
-            android:textSize="25sp" />
-
-        <Button
-            android:id="@+id/three_btn"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:text="3"
-            android:textSize="25sp" />
-    </LinearLayout>
+            <EditText
+                android:id="@+id/passcode3"
+                style="@style/PasscodeEditText" />
 
-    <LinearLayout
-        android:id="@+id/pass_label"
-        android:layout_width="match_parent"
-        android:layout_height="100dp"
-        android:orientation="horizontal" >
+            <EditText
+                android:id="@+id/passcode4"
+                style="@style/PasscodeEditText" />
 
-        <TextView
-            android:id="@+id/passcode_label"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:gravity="center"
-            android:text="Enter passcode"
-            android:textSize="25sp" />
+        </LinearLayout>
 
     </LinearLayout>
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="70dp"
-        android:layout_below="@+id/pass_label"
-        android:orientation="horizontal"
-        android:gravity="center" >
-
-        <EditText
-            android:id="@+id/passcode1"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:cursorVisible="false"
-            android:focusableInTouchMode="false"
-            android:hint="*"
-            android:inputType="textPassword|number"
-            android:password="true"
-            android:maxLength="1"
-            android:textSize="33sp" />
-
-        <EditText
-            android:id="@+id/passcode2"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:cursorVisible="false"
-            android:focusableInTouchMode="false"
-            android:hint="*"
-            android:inputType="textPassword|number"
-            android:password="true"
-            android:maxLength="1"
-            android:textSize="33sp" />
-
-        <EditText
-            android:id="@+id/passcode3"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:cursorVisible="false"
-            android:focusableInTouchMode="false"
-            android:hint="*"
-            android:inputType="textPassword|number"
-            android:password="true"
-            android:maxLength="1"
-            android:textSize="33sp" />
-
-        <EditText
-            android:id="@+id/passcode4"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:cursorVisible="false"
-            android:focusableInTouchMode="false"
-            android:hint="*"
-            android:inputType="textPassword|number"
-            android:password="true"
-            android:maxLength="1"
-            android:textSize="33sp" />
+    <LinearLayout android:layout_width="fill_parent"
+                  android:layout_height="fill_parent"
+                  android:orientation="vertical"
+                  android:layout_weight="1.2"
+                  android:weightSum="4">
+
+        <LinearLayout android:id="@+id/one_to_three"
+                      android:layout_width="match_parent"
+                      android:layout_height="fill_parent"
+                      android:orientation="horizontal"
+                      android:weightSum="3"
+                      android:layout_weight="1">
+
+            <Button
+                android:id="@+id/one_btn"
+                android:text="1"
+                style="@style/NumericButton" />
+
+            <Button
+                android:id="@+id/two_btn"
+                android:text="2"
+                style="@style/NumericButton" />
+
+            <Button
+                android:id="@+id/three_btn"
+                android:text="3"
+                style="@style/NumericButton" />
+        </LinearLayout>
+
+        <LinearLayout android:id="@+id/four_to_six"
+                      android:layout_width="match_parent"
+                      android:layout_height="fill_parent"
+                      android:orientation="horizontal"
+                      android:weightSum="3"
+                      android:layout_weight="1">
+
+            <Button
+                android:id="@+id/four_btn"
+                android:text="4"
+                style="@style/NumericButton" />
+
+            <Button
+                android:id="@+id/five_btn"
+                android:text="5"
+                style="@style/NumericButton" />
+
+            <Button
+                android:id="@+id/six_btn"
+                android:text="6"
+                style="@style/NumericButton" />
+        </LinearLayout>
+
+        <LinearLayout android:id="@+id/seven_to_nine"
+                      android:layout_width="match_parent"
+                      android:layout_height="fill_parent"
+                      android:orientation="horizontal"
+                      android:weightSum="3"
+                      android:layout_weight="1">
+
+            <Button
+                android:id="@+id/seven_btn"
+                android:text="7"
+                style="@style/NumericButton" />
+
+            <Button
+                android:id="@+id/eight_btn"
+                android:text="8"
+                style="@style/NumericButton" />
+
+            <Button
+                android:id="@+id/nine_btn"
+                android:text="9"
+                style="@style/NumericButton" />
+        </LinearLayout>
+
+        <LinearLayout android:id="@+id/zero"
+                      android:layout_width="match_parent"
+                      android:layout_height="fill_parent"
+                      android:orientation="horizontal"
+                      android:weightSum="3"
+                      android:layout_weight="1">
+
+            <Button
+                android:id="@+id/empty_btn"
+                android:text=""
+                android:enabled="false"
+                style="@style/NumericButton" />
+
+            <Button
+                android:id="@+id/zero_btn"
+                android:text="0"
+                style="@style/NumericButton" />
+
+            <ImageButton
+                android:id="@+id/delete_btn"
+                android:src="@drawable/clear_btn"
+                style="@style/NumericButton" />
+        </LinearLayout>
 
     </LinearLayout>
 
-</RelativeLayout>
+</LinearLayout>
diff --git a/app/res/values/strings.xml b/app/res/values/strings.xml
index e0efaa65e..4bd8e5b90 100644
--- a/app/res/values/strings.xml
+++ b/app/res/values/strings.xml
@@ -278,7 +278,8 @@
 	<string name="toast_no_transactions_to_export">There are no transactions available to export</string>
     <string name="header_passcode_settings">Passcode</string>
     <string name="title_passcode_preferences">Passcode Preferences</string>
-    <string name="title_enable_passcode">Turn On/Off Passcode</string>
+    <string name="title_passcode_enabled">Passcode Turned On</string>
+    <string name="title_passcode_disabled">Passcode Turned Off</string>
     <string name="title_change_passcode">Change Passcode</string>
 	<string name="title_about_gnucash">About GnuCash</string>
 	<string name="summary_about_gnucash">Gnucash is a mobile finance expense tracker application for Android.\n
diff --git a/app/res/values/styles.xml b/app/res/values/styles.xml
index 19b863a2b..4a528ce78 100644
--- a/app/res/values/styles.xml
+++ b/app/res/values/styles.xml
@@ -90,4 +90,25 @@
         <item name="android:orientation">vertical</item>
         <item name="android:layout_marginBottom">@dimen/form_row_bottom_margin</item>
     </style>
+
+    <style name="NumericButton" parent="@android:style/Widget.Button">
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:layout_weight">1</item>
+        <item name="android:layout_margin">1dp</item>
+        <item name="android:textSize">25sp</item>
+        <item name="android:background">@drawable/numeric_button</item>
+    </style>
+
+    <style name="PasscodeEditText" parent="@android:style/Widget.EditText">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:cursorVisible">false</item>
+        <item name="android:focusableInTouchMode">false</item>
+        <item name="android:inputType">textPassword|number</item>
+        <item name="android:password">true</item>
+        <item name="android:maxLength">1</item>
+        <item name="android:hint">*</item>
+        <item name="android:textSize">33sp</item>
+    </style>
 </resources>
\ No newline at end of file
diff --git a/app/res/xml/fragment_passcode_preferences.xml b/app/res/xml/fragment_passcode_preferences.xml
index 027aa0884..e81d9a1d7 100755
--- a/app/res/xml/fragment_passcode_preferences.xml
+++ b/app/res/xml/fragment_passcode_preferences.xml
@@ -17,8 +17,7 @@
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
     <PreferenceCategory android:title="@string/title_passcode_preferences"/>
-    <CheckBoxPreference android:title="@string/title_enable_passcode"
-                        android:key="@string/key_enable_passcode" />
+    <CheckBoxPreference android:key="@string/key_enable_passcode" />
     <Preference android:key="@string/key_change_passcode"
                 android:title="@string/title_change_passcode"
                 android:dependency="@string/key_enable_passcode" />
diff --git a/app/src/org/gnucash/android/ui/settings/PasscodePreferenceFragment.java b/app/src/org/gnucash/android/ui/settings/PasscodePreferenceFragment.java
index 52744e07c..e4ccc7dbc 100644
--- a/app/src/org/gnucash/android/ui/settings/PasscodePreferenceFragment.java
+++ b/app/src/org/gnucash/android/ui/settings/PasscodePreferenceFragment.java
@@ -67,11 +67,16 @@ public void onResume() {
         final Intent intent = new Intent(getActivity(), PasscodePreferenceActivity.class);
 
         checkBoxPreference = (CheckBoxPreference) findPreference(getString(R.string.key_enable_passcode));
+        final String passcodeEnabled = getString(R.string.title_passcode_enabled);
+        final String passcodeDisabled = getString(R.string.title_passcode_disabled);
+        checkBoxPreference.setTitle(checkBoxPreference.isChecked() ? passcodeEnabled : passcodeDisabled);
         checkBoxPreference.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
                     @Override
                     public boolean onPreferenceChange(Preference preference, Object newValue) {
                         if ((Boolean) newValue) {
                             startActivityForResult(intent, PASSCODE_REQUEST_CODE);
+                        } else {
+                            checkBoxPreference.setTitle(passcodeDisabled);
                         }
                         editor.putBoolean(UxArgument.ENABLED_PASSCODE, (Boolean) newValue);
                         editor.commit();
@@ -95,6 +100,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (resultCode == Activity.RESULT_OK && requestCode == PASSCODE_REQUEST_CODE && data!= null) {
             editor.putString(UxArgument.PASSCODE, data.getStringExtra(UxArgument.PASSCODE));
             Toast.makeText(getActivity(), R.string.toast_passcode_set, Toast.LENGTH_SHORT).show();
+            checkBoxPreference.setTitle(getString(R.string.title_passcode_enabled));
         } else {
             editor.putBoolean(UxArgument.ENABLED_PASSCODE, false);
             checkBoxPreference.setChecked(false);
diff --git a/app/src/org/gnucash/android/ui/settings/SettingsActivity.java b/app/src/org/gnucash/android/ui/settings/SettingsActivity.java
index 596d71df6..2749caec0 100644
--- a/app/src/org/gnucash/android/ui/settings/SettingsActivity.java
+++ b/app/src/org/gnucash/android/ui/settings/SettingsActivity.java
@@ -149,7 +149,9 @@ protected void onCreate(Bundle savedInstanceState) {
 
             pref = findPreference(getString(R.string.key_enable_passcode));
             pref.setOnPreferenceChangeListener(this);
-		}
+            pref.setTitle(((CheckBoxPreference) pref).isChecked() ?
+                    getString(R.string.title_passcode_enabled) : getString(R.string.title_passcode_disabled));
+        }
 	}
 
     @Override
@@ -195,6 +197,8 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
             if ((Boolean) newValue) {
                 startActivityForResult(new Intent(this, PasscodePreferenceActivity.class),
                         PasscodePreferenceFragment.PASSCODE_REQUEST_CODE);
+            } else {
+                preference.setTitle(getString(R.string.title_passcode_disabled));
             }
             PreferenceManager.getDefaultSharedPreferences(getApplicationContext())
                     .edit()
@@ -357,6 +361,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
                             .putString(UxArgument.PASSCODE, data.getStringExtra(UxArgument.PASSCODE))
                             .commit();
                     Toast.makeText(getApplicationContext(), R.string.toast_passcode_set, Toast.LENGTH_SHORT).show();
+                    findPreference(getString(R.string.key_enable_passcode)).setTitle(getString(R.string.title_passcode_enabled));
                 }
                 break;
         }