diff --git a/AirBitz/airbitz/src/main/java/com/airbitz/adapters/TransactionAdapter.java b/AirBitz/airbitz/src/main/java/com/airbitz/adapters/TransactionAdapter.java
index 71d42216f..933199bd0 100644
--- a/AirBitz/airbitz/src/main/java/com/airbitz/adapters/TransactionAdapter.java
+++ b/AirBitz/airbitz/src/main/java/com/airbitz/adapters/TransactionAdapter.java
@@ -137,16 +137,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
             viewHolder = (ViewHolderItem) convertView.getTag();
         }
 
-
-        if (0 == position && mListTransaction.size() == 1) {
-            convertView.setBackground(mContext.getResources().getDrawable(R.drawable.wallet_list_solo));
-        } else if (0 == position) {
-            convertView.setBackground(mContext.getResources().getDrawable(R.drawable.wallet_list_top_archive));
-        } else if (mListTransaction.size() - 1 == position) {
-            convertView.setBackground(mContext.getResources().getDrawable(R.drawable.wallet_list_bottom));
-        } else {
-            convertView.setBackground(mContext.getResources().getDrawable(R.drawable.wallet_list_standard));
-        }
+        convertView.setBackground(mContext.getResources().getDrawable(R.drawable.wallet_list_standard));
 
         Transaction transaction = mListTransaction.get(position);
 
diff --git a/AirBitz/airbitz/src/main/java/com/airbitz/fragments/settings/SettingFragment.java b/AirBitz/airbitz/src/main/java/com/airbitz/fragments/settings/SettingFragment.java
index 989d3c3f1..2bee18697 100644
--- a/AirBitz/airbitz/src/main/java/com/airbitz/fragments/settings/SettingFragment.java
+++ b/AirBitz/airbitz/src/main/java/com/airbitz/fragments/settings/SettingFragment.java
@@ -45,7 +45,6 @@
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
-import android.os.Handler;
 import android.provider.Settings;
 import android.util.Log;
 import android.view.ContextThemeWrapper;
@@ -60,7 +59,6 @@
 import android.widget.NumberPicker;
 import android.widget.RadioButton;
 import android.widget.RadioGroup;
-import android.widget.RelativeLayout;
 import android.widget.Switch;
 import android.widget.TextView;
 
@@ -72,13 +70,11 @@
 import com.airbitz.api.core;
 import com.airbitz.api.tABC_AccountSettings;
 import com.airbitz.api.tABC_BitcoinDenomination;
-import com.airbitz.api.tABC_CC;
 import com.airbitz.fragments.BaseFragment;
 import com.airbitz.fragments.HelpFragment;
 import com.airbitz.fragments.login.SignUpFragment;
 import com.airbitz.fragments.settings.twofactor.TwoFactorShowFragment;
 import com.airbitz.objects.BleUtil;
-import com.airbitz.objects.HighlightOnPressButton;
 import com.airbitz.objects.HighlightOnPressImageButton;
 
 import java.util.ArrayList;
@@ -105,9 +101,9 @@ public class SettingFragment extends BaseFragment {
     AlertDialog mCurrencyDialog;
     AlertDialog mDefaultExchangeDialog;
     AlertDialog mDistanceDialog;
-    private RelativeLayout mCategoryContainer;
-    private RelativeLayout mSpendingLimitContainer;
-    private RelativeLayout mTwoFactorContainer;
+    private Button mCategoryButton;
+    private Button mSpendingLimitButton;
+    private Button mTwoFactorButton;
     private View mNFCSwitchLayout;
     private View mBLESwitchLayout;
     private HighlightOnPressImageButton mHelpButton;
@@ -116,9 +112,9 @@ public class SettingFragment extends BaseFragment {
     private RadioButton mBitcoinButton;
     private RadioButton mmBitcoinButton;
     private RadioButton muBitcoinButton;
-    private HighlightOnPressButton mChangePasswordButton;
-    private HighlightOnPressButton mChangePINButton;
-    private HighlightOnPressButton mChangeRecoveryButton;
+    private Button mChangePasswordButton;
+    private Button mChangePINButton;
+    private Button mChangeRecoveryButton;
     private Switch mSendNameSwitch;
     private Switch mMerchantModeSwitch;
     private Switch mPinReloginSwitch;
@@ -127,17 +123,16 @@ public class SettingFragment extends BaseFragment {
     private EditText mFirstEditText;
     private EditText mLastEditText;
     private EditText mNicknameEditText;
-    private HighlightOnPressButton mAutoLogoffButton;
-    private HighlightOnPressButton mDebugButton;
-    private HighlightOnPressButton mDefaultCurrencyButton;
-    private HighlightOnPressButton mDefaultDistanceButton;
+    private Button mAutoLogoffButton;
+    private Button mDebugButton;
+    private Button mDefaultCurrencyButton;
+    private Button mDefaultDistanceButton;
     private TextView mAccountTitle;
-    private HighlightOnPressButton mUSDollarButton;
-    private HighlightOnPressButton mCanadianDollarButton;
-    private HighlightOnPressButton mEuroButton;
-    private HighlightOnPressButton mPesoButton;
-    private HighlightOnPressButton mYuanButton;
-    private HighlightOnPressButton mLogoutButton;
+    private Button mUSDollarButton;
+    private Button mCanadianDollarButton;
+    private Button mEuroButton;
+    private Button mPesoButton;
+    private Button mYuanButton;
     private AutoLogoffDialogManager mAutoLogoffManager;
     private String[] mCurrencyItems;
     private String[] mDistanceItems;
@@ -190,34 +185,25 @@ public void onCheckedChanged(RadioGroup group, int checkedId) {
             }
         });
 
-        mChangePasswordButton = (HighlightOnPressButton) mView.findViewById(R.id.settings_button_change_password);
-        mChangePINButton = (HighlightOnPressButton) mView.findViewById(R.id.settings_button_pin);
-        mChangeRecoveryButton = (HighlightOnPressButton) mView.findViewById(R.id.settings_button_recovery);
+        mChangePasswordButton = (Button) mView.findViewById(R.id.settings_button_change_password);
+        mChangePINButton = (Button) mView.findViewById(R.id.settings_button_pin);
+        mChangeRecoveryButton = (Button) mView.findViewById(R.id.settings_button_recovery);
 
         mFirstEditText = (EditText) mView.findViewById(R.id.settings_edit_first_name);
         mLastEditText = (EditText) mView.findViewById(R.id.settings_edit_last_name);
         mNicknameEditText = (EditText) mView.findViewById(R.id.settings_edit_nick_name);
-        mAutoLogoffButton = (HighlightOnPressButton) mView.findViewById(R.id.settings_button_auto_logoff);
+        mAutoLogoffButton = (Button) mView.findViewById(R.id.settings_button_auto_logoff);
         mAutoLogoffManager = new AutoLogoffDialogManager(mAutoLogoffButton, getActivity());
-        mDefaultCurrencyButton = (HighlightOnPressButton) mView.findViewById(R.id.settings_button_currency);
-        mDefaultDistanceButton = (HighlightOnPressButton) mView.findViewById(R.id.settings_button_distance);
+        mDefaultCurrencyButton = (Button) mView.findViewById(R.id.settings_button_currency);
+        mDefaultDistanceButton = (Button) mView.findViewById(R.id.settings_button_distance);
 
-        mUSDollarButton = (HighlightOnPressButton) mView.findViewById(R.id.settings_button_usd);
-        mCanadianDollarButton = (HighlightOnPressButton) mView.findViewById(R.id.settings_button_canadian);
-        mEuroButton = (HighlightOnPressButton) mView.findViewById(R.id.settings_button_euro);
-        mPesoButton = (HighlightOnPressButton) mView.findViewById(R.id.settings_button_peso);
-        mYuanButton = (HighlightOnPressButton) mView.findViewById(R.id.settings_button_yuan);
+        mUSDollarButton = (Button) mView.findViewById(R.id.settings_button_usd);
+        mCanadianDollarButton = (Button) mView.findViewById(R.id.settings_button_canadian);
+        mEuroButton = (Button) mView.findViewById(R.id.settings_button_euro);
+        mPesoButton = (Button) mView.findViewById(R.id.settings_button_peso);
+        mYuanButton = (Button) mView.findViewById(R.id.settings_button_yuan);
 
-        mLogoutButton = (HighlightOnPressButton) mView.findViewById(R.id.settings_button_logout);
-        mLogoutButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                saveCurrentSettings();
-                ((NavigationActivity) getActivity()).Logout(false);
-            }
-        });
-
-        mDebugButton = (HighlightOnPressButton) mView.findViewById(R.id.settings_button_debug);
+        mDebugButton = (Button) mView.findViewById(R.id.settings_button_debug);
         mDebugButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
@@ -226,8 +212,8 @@ public void onClick(View view) {
             }
         });
 
-        mCategoryContainer = (RelativeLayout) mView.findViewById(R.id.category_container);
-        mCategoryContainer.setOnClickListener(new View.OnClickListener() {
+        mCategoryButton = (Button) mView.findViewById(R.id.settings_button_category);
+        mCategoryButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
                 Fragment fragment = new CategoryFragment();
@@ -235,8 +221,8 @@ public void onClick(View view) {
             }
         });
 
-        mSpendingLimitContainer = (RelativeLayout) mView.findViewById(R.id.settings_spending_limits_container);
-        mSpendingLimitContainer.setOnClickListener(new View.OnClickListener() {
+        mSpendingLimitButton = (Button) mView.findViewById(R.id.settings_button_spending_limits);
+        mSpendingLimitButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
                 Fragment fragment = new SpendingLimitsFragment();
@@ -244,8 +230,8 @@ public void onClick(View view) {
             }
         });
 
-        mTwoFactorContainer = (RelativeLayout) mView.findViewById(R.id.settings_two_factor_container);
-        mTwoFactorContainer.setOnClickListener(new View.OnClickListener() {
+        mTwoFactorButton = (Button) mView.findViewById(R.id.settings_button_two_factor_authentication);
+        mTwoFactorButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
                 Fragment fragment = new TwoFactorShowFragment();
@@ -752,13 +738,13 @@ static class AutoLogoffDialogManager {
         private int mNumberSelection;
         private int mTextSelection;
         private AlertDialog mDialog;
-        private Button mButton;
+        private TextView mButton;
         private Activity mActivity;
         private int mMinutes;
         private NumberPicker mNumberPicker;
         private NumberPicker mTextPicker;
 
-        AutoLogoffDialogManager(Button button, Activity activity) {
+        AutoLogoffDialogManager(TextView button, Activity activity) {
             this.mButton = button;
             this.mActivity = activity;
             mAutoLogoffStrings.add(mActivity.getString(R.string.settings_days));
diff --git a/AirBitz/airbitz/src/main/res/color/listitem_background.xml b/AirBitz/airbitz/src/main/res/color/listitem_background.xml
new file mode 100644
index 000000000..85414c8c1
--- /dev/null
+++ b/AirBitz/airbitz/src/main/res/color/listitem_background.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/listitem_normal"
+        android:state_pressed="false"
+        android:state_focused="false"/>
+    <item android:color="@color/selected_highlight" /> <!-- pressed or focused-->
+</selector>
\ No newline at end of file
diff --git a/AirBitz/airbitz/src/main/res/drawable/wallet_list_bottom.xml b/AirBitz/airbitz/src/main/res/drawable/wallet_list_bottom.xml
index 4ad562727..3324c6f3c 100644
--- a/AirBitz/airbitz/src/main/res/drawable/wallet_list_bottom.xml
+++ b/AirBitz/airbitz/src/main/res/drawable/wallet_list_bottom.xml
@@ -7,7 +7,7 @@
         android:right=".5dp"
         android:top=".5dp">
         <shape>
-            <solid android:color="@color/listitem_normal" />
+            <solid android:color="@color/listitem_background" />
             <corners
                 android:bottomLeftRadius="6dp"
                 android:bottomRightRadius="6dp" />
diff --git a/AirBitz/airbitz/src/main/res/drawable/wallet_list_solo.xml b/AirBitz/airbitz/src/main/res/drawable/wallet_list_solo.xml
index f36cf8be2..7a9cd5301 100644
--- a/AirBitz/airbitz/src/main/res/drawable/wallet_list_solo.xml
+++ b/AirBitz/airbitz/src/main/res/drawable/wallet_list_solo.xml
@@ -4,7 +4,7 @@
     <item>
 
         <shape>
-            <solid android:color="@color/listitem_normal" />
+            <solid android:color="@color/listitem_background" />
             <corners android:radius="6dp" />
         </shape>
     </item>
diff --git a/AirBitz/airbitz/src/main/res/drawable/wallet_list_solo_archived.xml b/AirBitz/airbitz/src/main/res/drawable/wallet_list_solo_archived.xml
index 03c76ae55..f50fa5f1b 100644
--- a/AirBitz/airbitz/src/main/res/drawable/wallet_list_solo_archived.xml
+++ b/AirBitz/airbitz/src/main/res/drawable/wallet_list_solo_archived.xml
@@ -7,7 +7,7 @@
         android:right=".5dp"
         android:top=".5dp">
         <shape>
-            <solid android:color="@color/listitem_normal" />
+            <solid android:color="@color/listitem_background" />
             <corners android:radius="6dp" />
         </shape>
     </item>
diff --git a/AirBitz/airbitz/src/main/res/drawable/wallet_list_standard.xml b/AirBitz/airbitz/src/main/res/drawable/wallet_list_standard.xml
index 5c1ab5d18..7df548ed4 100644
--- a/AirBitz/airbitz/src/main/res/drawable/wallet_list_standard.xml
+++ b/AirBitz/airbitz/src/main/res/drawable/wallet_list_standard.xml
@@ -7,7 +7,7 @@
         android:right=".5dp"
         android:top=".5dp">
         <shape>
-            <solid android:color="@color/listitem_normal" />
+            <solid android:color="@color/listitem_background" />
         </shape>
     </item>
 </layer-list>
\ No newline at end of file
diff --git a/AirBitz/airbitz/src/main/res/drawable/wallet_list_top.xml b/AirBitz/airbitz/src/main/res/drawable/wallet_list_top.xml
index 33e424289..f0fda5178 100644
--- a/AirBitz/airbitz/src/main/res/drawable/wallet_list_top.xml
+++ b/AirBitz/airbitz/src/main/res/drawable/wallet_list_top.xml
@@ -7,7 +7,7 @@
         android:right=".5dp"
         android:top=".5dp">
         <shape>
-            <solid android:color="@color/blue_highlight" />
+            <solid android:color="@color/listitem_background" />
             <corners
                 android:topLeftRadius="6dp"
                 android:topRightRadius="6dp" />
diff --git a/AirBitz/airbitz/src/main/res/drawable/wallet_list_top_archive.xml b/AirBitz/airbitz/src/main/res/drawable/wallet_list_top_archive.xml
index 5af0beb1f..f0fda5178 100644
--- a/AirBitz/airbitz/src/main/res/drawable/wallet_list_top_archive.xml
+++ b/AirBitz/airbitz/src/main/res/drawable/wallet_list_top_archive.xml
@@ -7,7 +7,7 @@
         android:right=".5dp"
         android:top=".5dp">
         <shape>
-            <solid android:color="@color/listitem_normal" />
+            <solid android:color="@color/listitem_background" />
             <corners
                 android:topLeftRadius="6dp"
                 android:topRightRadius="6dp" />
diff --git a/AirBitz/airbitz/src/main/res/layout/fragment_setting.xml b/AirBitz/airbitz/src/main/res/layout/fragment_setting.xml
index e537f1df3..79d562895 100644
--- a/AirBitz/airbitz/src/main/res/layout/fragment_setting.xml
+++ b/AirBitz/airbitz/src/main/res/layout/fragment_setting.xml
@@ -70,7 +70,7 @@
                         android:paddingTop="13dp"
                         android:text="@string/settings_denomination_buttons_bitcoin"
                         android:textColor="@color/settings_button_text"
-                        android:textSize="13dp" />
+                        android:textSize="@dimen/text_size_h4" />
 
                     <RadioButton
                         android:id="@+id/settings_denomination_buttons_mbitcoin"
@@ -87,7 +87,7 @@
                         android:paddingTop="13dp"
                         android:text="@string/settings_denomination_buttons_mbitcoin"
                         android:textColor="@color/settings_button_text"
-                        android:textSize="13dp" />
+                        android:textSize="@dimen/text_size_h4" />
 
                     <RadioButton
                         android:id="@+id/settings_denomination_buttons_ubitcoin"
@@ -103,7 +103,7 @@
                         android:paddingTop="13dp"
                         android:text="@string/settings_denomination_buttons_ubitcoin"
                         android:textColor="@color/settings_button_text"
-                        android:textSize="13dp" />
+                        android:textSize="@dimen/text_size_h4" />
 
                 </RadioGroup>
 
@@ -139,12 +139,11 @@
                     android:background="@android:color/transparent"
                     android:orientation="vertical">
 
-                    <com.airbitz.objects.HighlightOnPressButton
+                    <Button
                         android:id="@+id/settings_button_change_password"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:background="@drawable/wallet_list_top_archive"
-                        android:drawableRight="@drawable/arrow_right"
                         android:gravity="left"
                         android:paddingBottom="13dp"
                         android:paddingLeft="15dp"
@@ -152,14 +151,13 @@
                         android:paddingTop="13dp"
                         android:text="@string/settings_button_change_password"
                         android:textColor="@color/settings_button_text"
-                        android:textSize="13dp" />
+                        android:textSize="@dimen/text_size_h4" />
 
-                    <com.airbitz.objects.HighlightOnPressButton
+                    <Button
                         android:id="@+id/settings_button_pin"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:background="@drawable/wallet_list_standard"
-                        android:drawableRight="@drawable/arrow_right"
                         android:gravity="left"
                         android:paddingBottom="13dp"
                         android:paddingLeft="15dp"
@@ -167,14 +165,13 @@
                         android:paddingTop="13dp"
                         android:text="@string/settings_button_pin"
                         android:textColor="@color/settings_button_text"
-                        android:textSize="13dp" />
+                        android:textSize="@dimen/text_size_h4" />
 
-                    <com.airbitz.objects.HighlightOnPressButton
+                    <Button
                         android:id="@+id/settings_button_recovery"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:background="@drawable/wallet_list_bottom"
-                        android:drawableRight="@drawable/arrow_right"
                         android:gravity="left"
                         android:paddingBottom="13dp"
                         android:paddingLeft="15dp"
@@ -182,7 +179,7 @@
                         android:paddingTop="13dp"
                         android:text="@string/settings_button_recovery"
                         android:textColor="@color/settings_button_text"
-                        android:textSize="13dp" />
+                        android:textSize="@dimen/text_size_h4" />
 
                 </LinearLayout>
 
@@ -239,7 +236,7 @@
                             android:textColor="@color/settings_button_text"
                             android:textOff=""
                             android:textOn=""
-                            android:textSize="13dp"
+                            android:textSize="@dimen/text_size_h4"
                             android:thumb="@drawable/btn_toggle_thumb"
                             android:track="@drawable/toggle_selector" />
 
@@ -328,13 +325,11 @@
             </LinearLayout>
 
 
-
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_marginTop="5dp"
-                android:orientation="vertical"
-                android:visibility="visible">
+                android:orientation="vertical">
 
                 <TextView
                     android:id="@+id/settings_general_title"
@@ -359,279 +354,162 @@
                     android:background="@android:color/transparent"
                     android:orientation="vertical">
 
-                    <LinearLayout
+                    <FrameLayout
                         android:layout_width="match_parent"
                         android:layout_height="44.1dp"
-                        android:background="@drawable/wallet_list_solo"
+                        android:background="@drawable/wallet_list_top_archive"
+                        android:clickable="true"
                         android:orientation="horizontal">
 
                         <TextView
-                            android:id="@+id/settings_title_auto_logoff"
-                            android:layout_width="160dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
+                            android:layout_width="wrap_content"
+                            android:layout_height="match_parent"
                             android:background="@android:color/transparent"
-                            android:drawablePadding="15dp"
-                            android:gravity="left"
-                            android:paddingBottom="13dp"
+                            android:gravity="left|center_vertical"
                             android:paddingLeft="15dp"
-                            android:paddingRight="13dp"
-                            android:paddingTop="13dp"
                             android:text="@string/settings_title_auto_logoff"
                             android:textColor="@color/settings_button_text"
-                            android:textSize="13dp" />
+                            android:textSize="@dimen/text_size_h4"/>
 
-                        <com.airbitz.objects.HighlightOnPressButton
+                        <Button
                             android:id="@+id/settings_button_auto_logoff"
-                            android:layout_width="100dp"
-                            android:layout_height="25.2dp"
-                            android:layout_marginLeft="5dp"
-                            android:layout_marginRight="5dp"
-                            android:layout_weight="1"
-                            android:background="@drawable/bg_btn_blue_stretch"
-                            android:textSize="16dp"
-                            android:textColor="@android:color/white" />
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="3dp"
-                        android:background="@android:color/transparent"
-                        android:orientation="vertical" />
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:background="@android:color/transparent"
+                            android:gravity="right|center_vertical"
+                            android:paddingRight="15dp"
+                            android:textColor="@color/settings_button_value"
+                            android:textSize="13dp" />
+                    </FrameLayout>
 
-                    <LinearLayout
+                    <FrameLayout
                         android:layout_width="match_parent"
                         android:layout_height="44.1dp"
-                        android:background="@drawable/wallet_list_solo_archived"
+                        android:background="@drawable/wallet_list_standard"
+                        android:clickable="true"
                         android:orientation="horizontal">
 
                         <TextView
-                            android:id="@+id/settings_title_currency"
-                            android:layout_width="160dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
+                            android:layout_width="wrap_content"
+                            android:layout_height="match_parent"
                             android:background="@android:color/transparent"
-                            android:drawablePadding="15dp"
-                            android:gravity="left"
-                            android:paddingBottom="13dp"
+                            android:gravity="left|center_vertical"
                             android:paddingLeft="15dp"
-                            android:paddingRight="13dp"
-                            android:paddingTop="13dp"
                             android:text="@string/settings_title_currency"
                             android:textColor="@color/settings_button_text"
-                            android:textSize="13dp" />
+                            android:textSize="@dimen/text_size_h4" />
 
-                        <com.airbitz.objects.HighlightOnPressButton
+                        <Button
                             android:id="@+id/settings_button_currency"
-                            android:layout_width="100dp"
-                            android:layout_height="25.2dp"
-                            android:layout_marginLeft="5dp"
-                            android:layout_marginRight="5dp"
-                            android:layout_weight="1"
-                            android:background="@drawable/bg_btn_blue_stretch"
-                            android:textSize="16dp"
-                            android:textColor="@android:color/white" />
-                    </LinearLayout>
-
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="3dp"
-                        android:background="@android:color/transparent"
-                        android:orientation="vertical" />
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:background="@android:color/transparent"
+                            android:gravity="right|center_vertical"
+                            android:paddingRight="15dp"
+                            android:textColor="@color/settings_button_value"
+                            android:textSize="13dp" />
+                    </FrameLayout>
 
-                    <LinearLayout
+                    <FrameLayout
                         android:layout_width="match_parent"
                         android:layout_height="44.1dp"
-                        android:background="@drawable/wallet_list_solo_archived"
+                        android:background="@drawable/wallet_list_standard"
+                        android:clickable="true"
                         android:orientation="horizontal">
 
                         <TextView
-                            android:id="@+id/settings_title_distance"
-                            android:layout_width="160dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
+                            android:layout_width="wrap_content"
+                            android:layout_height="match_parent"
                             android:background="@android:color/transparent"
-                            android:drawablePadding="15dp"
-                            android:gravity="left"
-                            android:paddingBottom="13dp"
+                            android:gravity="left|center_vertical"
                             android:paddingLeft="15dp"
-                            android:paddingRight="13dp"
-                            android:paddingTop="13dp"
                             android:text="@string/settings_title_distance"
                             android:textColor="@color/settings_button_text"
-                            android:textSize="13dp" />
+                            android:textSize="@dimen/text_size_h4" />
 
-                        <com.airbitz.objects.HighlightOnPressButton
+                        <Button
                             android:id="@+id/settings_button_distance"
-                            android:layout_width="100dp"
-                            android:layout_height="25.2dp"
-                            android:layout_marginLeft="5dp"
-                            android:layout_marginRight="5dp"
-                            android:layout_weight="1"
-                            android:background="@drawable/bg_btn_blue_stretch"
-                            android:textSize="16dp"
-                            android:textColor="@android:color/white" />
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="3dp"
-                        android:background="@android:color/transparent"
-                        android:orientation="vertical" />
-
-                    <RelativeLayout
-                        android:id="@+id/category_container"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:background="@drawable/wallet_list_solo_archived">
-
-                        <TextView
-                            android:id="@+id/settings_title_categories"
-                            android:layout_width="160dp"
-                            android:layout_height="wrap_content"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
                             android:background="@android:color/transparent"
-                            android:clickable="false"
-                            android:drawablePadding="15dp"
-                            android:focusable="false"
-                            android:focusableInTouchMode="false"
-                            android:gravity="left"
-                            android:paddingBottom="13dp"
-                            android:paddingLeft="15dp"
-                            android:paddingRight="13dp"
-                            android:paddingTop="13dp"
-                            android:text="@string/settings_button_change_categories"
-                            android:textColor="@color/settings_button_text"
+                            android:gravity="right|center_vertical"
+                            android:paddingRight="15dp"
+                            android:textColor="@color/settings_button_value"
                             android:textSize="13dp" />
+                    </FrameLayout>
 
-                        <com.airbitz.objects.HighlightOnPressButton
-                            android:id="@+id/settings_button_category"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_alignParentRight="true"
-                            android:layout_centerVertical="true"
-                            android:layout_marginRight="9.45dp"
-                            android:background="@drawable/arrow_right"
-                            android:clickable="false"
-                            android:focusable="false"
-                            android:focusableInTouchMode="false" />
-                    </RelativeLayout>
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="3dp"
-                        android:background="@android:color/transparent"
-                        android:orientation="vertical" />
-
-                    <RelativeLayout
-                        android:id="@+id/settings_spending_limits_container"
+                    <Button
+                        android:id="@+id/settings_button_category"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:background="@drawable/wallet_list_solo_archived">
-
-                        <TextView
-                            android:id="@+id/settings_title_spending_limits"
-                            android:layout_width="160dp"
-                            android:layout_height="wrap_content"
-                            android:background="@android:color/transparent"
-                            android:clickable="false"
-                            android:drawablePadding="15dp"
-                            android:focusable="false"
-                            android:focusableInTouchMode="false"
-                            android:gravity="start"
-                            android:paddingBottom="13dp"
-                            android:paddingLeft="15dp"
-                            android:paddingRight="13dp"
-                            android:paddingTop="13dp"
-                            android:text="@string/settings_button_change_spending_limits"
-                            android:textColor="@color/settings_button_text"
-                            android:textSize="13dp" />
-
-                        <com.airbitz.objects.HighlightOnPressButton
-                            android:id="@+id/settings_button_spending_limits"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_alignParentRight="true"
-                            android:layout_centerVertical="true"
-                            android:layout_marginRight="9.45dp"
-                            android:background="@drawable/arrow_right"
-                            android:clickable="false"
-                            android:focusable="false"
-                            android:focusableInTouchMode="false" />
-                    </RelativeLayout>
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="3dp"
-                        android:background="@android:color/transparent"
-                        android:orientation="vertical" />
+                        android:background="@drawable/wallet_list_standard"
+                        android:focusable="false"
+                        android:focusableInTouchMode="false"
+                        android:gravity="left"
+                        android:paddingBottom="13dp"
+                        android:paddingLeft="15dp"
+                        android:paddingRight="13dp"
+                        android:paddingTop="13dp"
+                        android:text="@string/settings_button_change_categories"
+                        android:textColor="@color/settings_button_text"
+                        android:textSize="@dimen/text_size_h4" />
 
-                    <RelativeLayout
-                        android:id="@+id/settings_two_factor_container"
+                    <Button
+                        android:id="@+id/settings_button_spending_limits"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:background="@drawable/wallet_list_solo_archived">
-
-                        <TextView
-                            android:id="@+id/settings_title_two_factor_authentication"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:background="@android:color/transparent"
-                            android:clickable="false"
-                            android:drawablePadding="15dp"
-                            android:focusable="false"
-                            android:focusableInTouchMode="false"
-                            android:gravity="start"
-                            android:paddingBottom="13dp"
-                            android:paddingLeft="15dp"
-                            android:paddingRight="13dp"
-                            android:paddingTop="13dp"
-                            android:text="@string/settings_button_two_factor_authentication"
-                            android:textColor="@color/settings_button_text"
-                            android:textSize="13dp" />
-
-                        <com.airbitz.objects.HighlightOnPressButton
-                            android:id="@+id/settings_button_two_factor_authentication"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_alignParentRight="true"
-                            android:layout_centerVertical="true"
-                            android:layout_marginRight="9.45dp"
-                            android:background="@drawable/arrow_right"
-                            android:clickable="false"
-                            android:focusable="false"
-                            android:focusableInTouchMode="false" />
-                    </RelativeLayout>
+                        android:background="@drawable/wallet_list_standard"
+                        android:focusable="false"
+                        android:focusableInTouchMode="false"
+                        android:gravity="start"
+                        android:paddingBottom="13dp"
+                        android:paddingLeft="15dp"
+                        android:paddingRight="13dp"
+                        android:paddingTop="13dp"
+                        android:text="@string/settings_button_change_spending_limits"
+                        android:textColor="@color/settings_button_text"
+                        android:textSize="@dimen/text_size_h4" />
 
-                    <LinearLayout
+                    <Button
+                        android:id="@+id/settings_button_two_factor_authentication"
                         android:layout_width="match_parent"
-                        android:layout_height="3dp"
-                        android:background="@android:color/transparent"
-                        android:orientation="vertical" />
+                        android:layout_height="wrap_content"
+                        android:background="@drawable/wallet_list_standard"
+                        android:focusable="false"
+                        android:focusableInTouchMode="false"
+                        android:gravity="start"
+                        android:paddingBottom="13dp"
+                        android:paddingLeft="15dp"
+                        android:paddingRight="13dp"
+                        android:paddingTop="13dp"
+                        android:text="@string/settings_button_two_factor_authentication"
+                        android:textColor="@color/settings_button_text"
+                        android:textSize="@dimen/text_size_h4" />
 
                     <RelativeLayout
                         android:layout_width="match_parent"
                         android:layout_height="44.1dp"
-                        android:background="@drawable/wallet_list_solo_archived"
+                        android:background="@drawable/wallet_list_standard"
                         android:orientation="horizontal">
 
                         <Switch
                             android:id="@+id/settings_toggle_merchant_mode"
                             android:layout_width="match_parent"
-                            android:layout_height="match_parent"
+                            android:layout_height="44.1dp"
                             android:layout_alignParentRight="true"
                             android:layout_gravity="center_vertical"
-                            android:layout_marginLeft="15dp"
-                            android:layout_marginRight="9.45dp"
                             android:background="@android:color/transparent"
                             android:checked="false"
+                            android:clickable="true"
                             android:gravity="center_vertical"
+                            android:paddingLeft="15dp"
+                            android:paddingRight="9.45dp"
                             android:switchMinWidth="0dp"
                             android:text="@string/settings_title_merchant_mode"
                             android:textColor="@color/settings_button_text"
                             android:textOff=""
                             android:textOn=""
-                            android:textSize="13dp"
+                            android:textSize="@dimen/text_size_h4"
                             android:thumb="@drawable/btn_toggle_thumb"
                             android:track="@drawable/toggle_selector" />
 
@@ -641,20 +519,14 @@
                         android:id="@+id/settings_nfc_layout"
                         android:layout_width="match_parent"
                         android:layout_height="44.1dp"
+                        android:background="@drawable/wallet_list_standard"
                         android:visibility="gone"
                         android:orientation="vertical">
 
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="3dp"
-                            android:background="@android:color/transparent"
-                            android:orientation="vertical" />
-
                         <Switch
                             android:id="@+id/settings_toggle_nfc"
                             android:layout_width="match_parent"
                             android:layout_height="match_parent"
-                            android:background="@drawable/wallet_list_solo_archived"
                             android:layout_alignParentRight="true"
                             android:layout_gravity="center_vertical"
                             android:paddingLeft="15dp"
@@ -666,7 +538,7 @@
                             android:textColor="@color/settings_button_text"
                             android:textOff=""
                             android:textOn=""
-                            android:textSize="13dp"
+                            android:textSize="@dimen/text_size_h4"
                             android:thumb="@drawable/btn_toggle_thumb"
                             android:track="@drawable/toggle_selector" />
 
@@ -676,47 +548,35 @@
                         android:id="@+id/settings_ble_layout"
                         android:layout_width="match_parent"
                         android:layout_height="44.1dp"
+                        android:background="@drawable/wallet_list_standard"
                         android:visibility="gone"
                         android:orientation="vertical">
 
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="3dp"
-                            android:background="@android:color/transparent"
-                            android:orientation="vertical" />
-
                         <Switch
                             android:id="@+id/settings_toggle_ble"
                             android:layout_width="match_parent"
                             android:layout_height="match_parent"
-                            android:background="@drawable/wallet_list_solo_archived"
                             android:layout_alignParentRight="true"
-                            android:paddingLeft="15dp"
-                            android:paddingRight="9.45dp"
                             android:layout_gravity="center_vertical"
                             android:checked="false"
                             android:gravity="center_vertical"
+                            android:paddingLeft="15dp"
+                            android:paddingRight="9.45dp"
                             android:switchMinWidth="0dp"
                             android:text="@string/settings_title_ble"
                             android:textColor="@color/settings_button_text"
                             android:textOff=""
                             android:textOn=""
-                            android:textSize="13dp"
+                            android:textSize="@dimen/text_size_h4"
                             android:thumb="@drawable/btn_toggle_thumb"
                             android:track="@drawable/toggle_selector" />
 
                     </LinearLayout>
 
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="3dp"
-                        android:background="@android:color/transparent"
-                        android:orientation="vertical" />
-
                     <RelativeLayout
                         android:layout_width="match_parent"
                         android:layout_height="44.1dp"
-                        android:background="@drawable/wallet_list_solo_archived"
+                        android:background="@drawable/wallet_list_bottom"
                         android:orientation="horizontal">
 
                         <Switch
@@ -735,7 +595,7 @@
                             android:textColor="@color/settings_button_text"
                             android:textOff=""
                             android:textOn=""
-                            android:textSize="13dp"
+                            android:textSize="@dimen/text_size_h4"
                             android:thumb="@drawable/btn_toggle_thumb"
                             android:track="@drawable/toggle_selector" />
 
@@ -775,206 +635,168 @@
                     android:background="@android:color/transparent"
                     android:orientation="vertical">
 
-                    <LinearLayout
+                    <FrameLayout
                         android:layout_width="match_parent"
                         android:layout_height="44.1dp"
                         android:background="@drawable/wallet_list_top_archive"
+                        android:clickable="true"
                         android:orientation="horizontal">
 
                         <TextView
-                            android:id="@+id/settings_title_usd"
-                            android:layout_width="120dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
+                            android:layout_width="wrap_content"
+                            android:layout_height="match_parent"
                             android:background="@android:color/transparent"
-                            android:drawablePadding="15dp"
-                            android:gravity="start"
-                            android:paddingBottom="13dp"
+                            android:gravity="left|center_vertical"
                             android:paddingLeft="15dp"
-                            android:paddingRight="13dp"
-                            android:paddingTop="13dp"
                             android:text="@string/settings_title_usd"
                             android:textColor="@color/settings_button_text"
-                            android:textSize="13dp" />
+                            android:textSize="@dimen/text_size_h4" />
 
-                        <com.airbitz.objects.HighlightOnPressButton
+                        <Button
                             android:id="@+id/settings_button_usd"
-                            android:layout_width="120dp"
-                            android:layout_height="25.2dp"
-                            android:layout_marginLeft="5dp"
-                            android:layout_marginRight="5dp"
-                            android:layout_weight="1"
-                            android:background="@drawable/bg_btn_blue_stretch"
-                            android:textSize="16dp"
-                            android:textColor="@android:color/white" />
-                    </LinearLayout>
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:background="@android:color/transparent"
+                            android:gravity="right|center_vertical"
+                            android:paddingRight="15dp"
+                            android:textColor="@color/settings_button_value"
+                            android:textSize="13dp" />
+                    </FrameLayout>
 
-                    <LinearLayout
+                    <FrameLayout
                         android:layout_width="match_parent"
                         android:layout_height="44.1dp"
                         android:background="@drawable/wallet_list_standard"
+                        android:clickable="true"
                         android:orientation="horizontal">
 
                         <TextView
-                            android:id="@+id/settings_title_canadian"
-                            android:layout_width="120dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
+                            android:layout_width="wrap_content"
+                            android:layout_height="match_parent"
                             android:background="@android:color/transparent"
-                            android:drawablePadding="15dp"
-                            android:gravity="start"
-                            android:paddingBottom="13dp"
+                            android:gravity="left|center_vertical"
                             android:paddingLeft="15dp"
-                            android:paddingRight="13dp"
-                            android:paddingTop="13dp"
                             android:text="@string/settings_title_canadian"
                             android:textColor="@color/settings_button_text"
-                            android:textSize="13dp" />
+                            android:textSize="@dimen/text_size_h4" />
 
-                        <com.airbitz.objects.HighlightOnPressButton
+                        <Button
                             android:id="@+id/settings_button_canadian"
-                            android:layout_width="120dp"
-                            android:layout_height="25.2dp"
-                            android:layout_marginLeft="5dp"
-                            android:layout_marginRight="5dp"
-                            android:layout_weight="1"
-                            android:background="@drawable/bg_btn_blue_stretch"
-                            android:textSize="16dp"
-                            android:textColor="@android:color/white" />
-                    </LinearLayout>
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:background="@android:color/transparent"
+                            android:gravity="right|center_vertical"
+                            android:paddingRight="15dp"
+                            android:textColor="@color/settings_button_value"
+                            android:textSize="13dp" />
+                    </FrameLayout>
 
-                    <LinearLayout
+                    <FrameLayout
                         android:layout_width="match_parent"
                         android:layout_height="44.1dp"
                         android:background="@drawable/wallet_list_standard"
+                        android:clickable="true"
                         android:orientation="horizontal">
 
                         <TextView
-                            android:id="@+id/settings_title_euro"
-                            android:layout_width="120dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
+                            android:layout_width="wrap_content"
+                            android:layout_height="match_parent"
                             android:background="@android:color/transparent"
-                            android:drawablePadding="15dp"
-                            android:gravity="start"
-                            android:paddingBottom="13dp"
+                            android:gravity="left|center_vertical"
                             android:paddingLeft="15dp"
-                            android:paddingRight="13dp"
-                            android:paddingTop="13dp"
                             android:text="@string/settings_title_euro"
                             android:textColor="@color/settings_button_text"
-                            android:textSize="13dp" />
+                            android:textSize="@dimen/text_size_h4" />
 
-                        <com.airbitz.objects.HighlightOnPressButton
+                        <Button
                             android:id="@+id/settings_button_euro"
-                            android:layout_width="120dp"
-                            android:layout_height="25.2dp"
-                            android:layout_marginLeft="5dp"
-                            android:layout_marginRight="5dp"
-                            android:layout_weight="1"
-                            android:background="@drawable/bg_btn_blue_stretch"
-                            android:textSize="16dp"
-                            android:textColor="@android:color/white" />
-                    </LinearLayout>
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:background="@android:color/transparent"
+                            android:gravity="right|center_vertical"
+                            android:paddingRight="15dp"
+                            android:textColor="@color/settings_button_value"
+                            android:textSize="13dp" />
+                    </FrameLayout>
 
-                    <LinearLayout
+                    <FrameLayout
                         android:layout_width="match_parent"
                         android:layout_height="44.1dp"
                         android:background="@drawable/wallet_list_standard"
+                        android:clickable="true"
                         android:orientation="horizontal">
 
                         <TextView
-                            android:id="@+id/settings_title_peso"
-                            android:layout_width="120dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
+                            android:layout_width="wrap_content"
+                            android:layout_height="match_parent"
                             android:background="@android:color/transparent"
-                            android:drawablePadding="15dp"
-                            android:gravity="start"
-                            android:paddingBottom="13dp"
+                            android:gravity="left|center_vertical"
                             android:paddingLeft="15dp"
-                            android:paddingTop="13dp"
                             android:text="@string/settings_title_peso"
                             android:textColor="@color/settings_button_text"
-                            android:textSize="13dp" />
+                            android:textSize="@dimen/text_size_h4" />
 
-                        <com.airbitz.objects.HighlightOnPressButton
+                        <Button
                             android:id="@+id/settings_button_peso"
-                            android:layout_width="120dp"
-                            android:layout_height="25.2dp"
-                            android:layout_marginLeft="5dp"
-                            android:layout_marginRight="5dp"
-                            android:layout_weight="1"
-                            android:background="@drawable/bg_btn_blue_stretch"
-                            android:textSize="16dp"
-                            android:textColor="@android:color/white" />
-                    </LinearLayout>
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:background="@android:color/transparent"
+                            android:gravity="right|center_vertical"
+                            android:paddingRight="15dp"
+                            android:textColor="@color/settings_button_value"
+                            android:textSize="13dp" />
+                    </FrameLayout>
 
-                    <LinearLayout
+                    <FrameLayout
                         android:layout_width="match_parent"
                         android:layout_height="44.1dp"
                         android:background="@drawable/wallet_list_bottom"
+                        android:clickable="true"
                         android:orientation="horizontal">
 
                         <TextView
-                            android:id="@+id/settings_title_yuan"
-                            android:layout_width="120dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
+                            android:layout_width="wrap_content"
+                            android:layout_height="match_parent"
                             android:background="@android:color/transparent"
-                            android:drawablePadding="15dp"
-                            android:gravity="start"
-                            android:paddingBottom="13dp"
+                            android:gravity="left|center_vertical"
                             android:paddingLeft="15dp"
-                            android:paddingRight="13dp"
-                            android:paddingTop="13dp"
                             android:text="@string/settings_title_yuan"
                             android:textColor="@color/settings_button_text"
-                            android:textSize="13dp" />
+                            android:textSize="@dimen/text_size_h4" />
 
-                        <com.airbitz.objects.HighlightOnPressButton
+                        <Button
                             android:id="@+id/settings_button_yuan"
-                            android:layout_width="120dp"
-                            android:layout_height="25.2dp"
-                            android:layout_marginLeft="5dp"
-                            android:layout_marginRight="5dp"
-                            android:layout_weight="1"
-                            android:background="@drawable/bg_btn_blue_stretch"
-                            android:textSize="16dp"
-                            android:textColor="@android:color/white" />
-                    </LinearLayout>
-                </LinearLayout>
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:background="@android:color/transparent"
+                            android:gravity="right|center_vertical"
+                            android:paddingRight="15dp"
+                            android:textColor="@color/settings_button_value"
+                            android:textSize="13dp" />
+                    </FrameLayout>
 
-            </LinearLayout>
+                </LinearLayout>
 
-            <com.airbitz.objects.HighlightOnPressButton
-                android:id="@+id/settings_button_logout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="20dp"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
-                android:background="@drawable/bg_button_orange"
-                android:padding="5dp"
-                android:text="@string/settings_button_logout"
-                android:textColor="@android:color/white"
-                android:textSize="18dp"
-                android:textStyle="normal" />
-
-            <com.airbitz.objects.HighlightOnPressButton
-                android:id="@+id/settings_button_debug"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="10dp"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
-                android:background="@drawable/bg_button_orange"
-                android:padding="5dp"
-                android:text="@string/settings_button_debug"
-                android:textColor="@android:color/white"
-                android:textSize="18dp"
-                android:textStyle="normal" />
+                <Button
+                    android:id="@+id/settings_button_debug"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="30dp"
+                    android:layout_marginLeft="15dp"
+                    android:layout_marginRight="15dp"
+                    android:layout_marginTop="0dp"
+                    android:background="@drawable/wallet_list_solo"
+                    android:focusableInTouchMode="false"
+                    android:gravity="start"
+                    android:paddingBottom="13dp"
+                    android:paddingLeft="15dp"
+                    android:paddingRight="13dp"
+                    android:paddingTop="13dp"
+                    android:text="@string/settings_button_debug"
+                    android:textColor="@color/settings_button_text"
+                    android:textSize="@dimen/text_size_h4" />
 
+            </LinearLayout>
         </LinearLayout>
     </ScrollView>
 
diff --git a/AirBitz/airbitz/src/main/res/layout/inc_directory_categories.xml b/AirBitz/airbitz/src/main/res/layout/inc_directory_categories.xml
index bb5c92e1e..3b6bfddd0 100644
--- a/AirBitz/airbitz/src/main/res/layout/inc_directory_categories.xml
+++ b/AirBitz/airbitz/src/main/res/layout/inc_directory_categories.xml
@@ -1,85 +1,73 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/layout_listview_business"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical">
+    android:background="@drawable/actionbar_shadow_bottom"
+    android:orientation="vertical"
+    android:paddingBottom="10dp"
+    android:paddingLeft="15dp"
+    android:paddingRight="15dp"
+    android:paddingTop="10dp">
 
     <LinearLayout
-        android:id="@+id/layout_listview_business"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@drawable/actionbar_shadow_bottom"
+        android:layout_height="match_parent"
+        android:background="@drawable/rounded_edge_blue"
+        android:divider="@drawable/gray_white_divider"
         android:orientation="vertical"
-        android:paddingBottom="8dp"
-        android:paddingLeft="15dp"
-        android:paddingRight="15dp"
-        android:paddingTop="10dp">
+        android:showDividers="middle">
 
-        <LinearLayout
+        <TextView
+            android:id="@+id/button_restaurant"
+            style="@style/CategoryItemTop"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:minHeight="44dp"
+            android:drawableLeft="@drawable/ico_restaurant"
+            android:paddingLeft="16dp"
+            android:textSize="14dp"
+            android:text="@string/restaurant_and_food_trucks" />
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="@drawable/rounded_edge_blue"
-                android:divider="@drawable/gray_white_divider"
-                android:orientation="vertical"
-                android:showDividers="middle">
-
-                <TextView
-                    android:id="@+id/button_restaurant"
-                    style="@style/CategoryItemTop"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:drawableLeft="@drawable/ico_restaurant"
-                    android:paddingLeft="16dp"
-                    android:textSize="14dp"
-                    android:text="@string/restaurant_and_food_trucks" />
-
-                <TextView
-                    android:id="@+id/button_bar"
-                    style="@style/CategoryItem"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:drawableLeft="@drawable/ico_bar"
-                    android:drawablePadding="28dp"
-                    android:paddingLeft="20dp"
-                    android:textSize="14dp"
-                    android:text="@string/bars_and_nightclubs" />
-
-                <TextView
-                    android:id="@+id/button_coffee_tea"
-                    style="@style/CategoryItem"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:drawableLeft="@drawable/ico_coffee"
-                    android:drawablePadding="28dp"
-                    android:paddingLeft="16dp"
-                    android:textSize="14dp"
-                    android:text="@string/coffee_and_tea" />
-
-                <TextView
-                    android:id="@+id/button_more"
-                    style="@style/CategoryItemBottom"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:drawableLeft="@drawable/ico_more"
-                    android:paddingLeft="16dp"
-                    android:textSize="14dp"
-                    android:text="@string/more_categories" />
-            </LinearLayout>
+        <TextView
+            android:id="@+id/button_bar"
+            style="@style/CategoryItem"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:drawableLeft="@drawable/ico_bar"
+            android:drawablePadding="28dp"
+            android:paddingLeft="20dp"
+            android:textSize="14dp"
+            android:text="@string/bars_and_nightclubs" />
 
-            <com.airbitz.widgets.NoDefaultSpinner
-                android:id="@+id/spinner_more_categories"
-                android:layout_width="match_parent"
-                android:layout_height="5dp"
-                android:background="@android:color/transparent"
-                android:visibility="invisible" />
-        </LinearLayout>
+        <TextView
+            android:id="@+id/button_coffee_tea"
+            style="@style/CategoryItem"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:drawableLeft="@drawable/ico_coffee"
+            android:drawablePadding="28dp"
+            android:paddingLeft="16dp"
+            android:textSize="14dp"
+            android:text="@string/coffee_and_tea" />
 
+        <TextView
+            android:id="@+id/button_more"
+            style="@style/CategoryItemBottom"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:drawableLeft="@drawable/ico_more"
+            android:paddingLeft="16dp"
+            android:textSize="14dp"
+            android:text="@string/more_categories" />
     </LinearLayout>
 
+    <com.airbitz.widgets.NoDefaultSpinner
+        android:id="@+id/spinner_more_categories"
+        android:layout_width="match_parent"
+        android:layout_height="5dp"
+        android:background="@android:color/transparent"
+        android:visibility="invisible" />
+
 </LinearLayout>
 
diff --git a/AirBitz/airbitz/src/main/res/layout/item_listview_business.xml b/AirBitz/airbitz/src/main/res/layout/item_listview_business.xml
index 0c13d1afb..4acbfbe47 100644
--- a/AirBitz/airbitz/src/main/res/layout/item_listview_business.xml
+++ b/AirBitz/airbitz/src/main/res/layout/item_listview_business.xml
@@ -18,29 +18,16 @@
         android:scaleType="fitXY"
         android:src="@drawable/ico_dots" />
 
-    <ImageView
-        android:id="@+id/imageview_arrow"
-        android:layout_width="22dp"
-        android:layout_height="22dp"
-        android:layout_alignParentRight="true"
-        android:layout_centerVertical="true"
-        android:layout_margin="10dp"
-        android:adjustViewBounds="true"
-        android:scaleType="centerCrop"
-        android:src="@drawable/arrow_right" />
-
     <TextView
         android:id="@+id/textview_business_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
         android:layout_margin="10dp"
-        android:layout_toLeftOf="@id/imageview_arrow"
         android:layout_toRightOf="@id/imageview_icon"
         android:ellipsize="none"
         android:singleLine="false"
         android:textColor="@android:color/holo_blue_dark"
         android:textSize="15dp" />
 
-
 </RelativeLayout>
diff --git a/AirBitz/airbitz/src/main/res/layout/item_listview_transaction.xml b/AirBitz/airbitz/src/main/res/layout/item_listview_transaction.xml
index 0815581a3..73c91dce3 100644
--- a/AirBitz/airbitz/src/main/res/layout/item_listview_transaction.xml
+++ b/AirBitz/airbitz/src/main/res/layout/item_listview_transaction.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="#ccffffff"
@@ -12,9 +13,8 @@
         android:layout_width="50dp"
         android:layout_height="50dp"
         android:layout_gravity="center"
-        android:layout_marginLeft="6dp"
-        android:layout_marginRight="0dp"
-        android:visibility="visible">
+        android:layout_marginLeft="7dp"
+        android:layout_marginRight="0dp">
 
         <ImageView
             android:id="@+id/imageview_contact_pic"
@@ -35,11 +35,11 @@
         android:id="@+id/layout_text"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="14dp"
+        android:layout_marginLeft="9dp"
         android:layout_weight="1"
         android:orientation="vertical"
         android:paddingBottom="8dp"
-        android:paddingTop="8dp"
+        android:paddingTop="10dp"
         android:weightSum="3">
 
         <TextView
@@ -49,8 +49,9 @@
             android:layout_height="wrap_content"
             android:paddingBottom="1.5dp"
             android:textColor="@color/dark_blue_text"
-            android:textSize="10dp"
-            android:textStyle="bold" />
+            android:textSize="11dp"
+            android:textStyle="bold"
+            tools:text="Apr 20 2015, 20:46 PM" />
 
         <TextView
             android:id="@+id/textview_name"
@@ -62,19 +63,20 @@
             android:paddingTop="0.5dp"
             android:singleLine="true"
             android:textColor="@android:color/black"
-            android:textSize="14dp" />
+            android:textSize="13dp"
+            tools:text="John Doe" />
 
         <TextView
             android:id="@+id/textview_confirmations"
-            style="@style/WhiteDropShadow"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:ellipsize="end"
             android:paddingBottom="0.5dp"
-            android:paddingTop="1.5dp"
+            android:paddingTop="1dp"
             android:singleLine="true"
             android:textColor="@color/green_text_dark"
-            android:textSize="10dp" />
+            android:textSize="12dp"
+            tools:text="Confirmed" />
 
     </LinearLayout>
 
@@ -83,48 +85,34 @@
         android:id="@+id/item_listview_transaction_creditdebit_layout"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:orientation="horizontal">
+        android:layout_marginRight="9dp"
+        android:orientation="vertical">
 
-        <LinearLayout
+        <TextView
+            android:id="@+id/textview_amount_kredit"
+            style="@style/WhiteDropShadow"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/textview_amount_kredit"
-                style="@style/WhiteDropShadow"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="right"
-                android:gravity="right"
-                android:paddingBottom="7.5dp"
-                android:paddingTop="0.5dp"
-                android:shadowColor="#00000000"
-                android:textColor="@color/green_text_dark"
-                android:textSize="14dp" />
-
-            <TextView
-                android:id="@+id/textview_amount_running_total"
-                style="@style/WhiteDropShadow"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="right"
-                android:layout_marginBottom="0.5dp"
-                android:layout_marginTop="7.5dp"
-                android:gravity="right"
-                android:textColor="@color/gray_text"
-                android:textSize="12dp" />
-
-        </LinearLayout>
+            android:layout_gravity="right"
+            android:gravity="right"
+            android:paddingBottom="7.5dp"
+            android:shadowColor="#00000000"
+            android:textColor="@color/green_text_dark"
+            android:textSize="14dp"
+            tools:text="mB 16.39721" />
 
-        <ImageView
-            android:id="@+id/imageview_icon"
+        <TextView
+            android:id="@+id/textview_amount_running_total"
+            style="@style/WhiteDropShadow"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_marginLeft="6dp"
-            android:layout_marginRight="7dp"
-            android:src="@drawable/arrow_right" />
+            android:layout_gravity="right"
+            android:layout_marginBottom="0.5dp"
+            android:layout_marginTop="7.5dp"
+            android:gravity="right"
+            android:textColor="@color/gray_text"
+            android:textSize="12dp"
+            tools:text="mB 20.39721" />
 
     </LinearLayout>
 </LinearLayout>
diff --git a/AirBitz/airbitz/src/main/res/layout/item_listview_wallets.xml b/AirBitz/airbitz/src/main/res/layout/item_listview_wallets.xml
index 23957e2c5..ae1eacb05 100644
--- a/AirBitz/airbitz/src/main/res/layout/item_listview_wallets.xml
+++ b/AirBitz/airbitz/src/main/res/layout/item_listview_wallets.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="44.1dp"
     android:background="@color/listitem_normal"
@@ -19,7 +20,8 @@
         android:gravity="center_vertical"
         android:singleLine="true"
         android:textColor="@color/gray_text"
-        android:textSize="15dp" />
+        android:textSize="15dp"
+        tools:text="My Wallet"/>
 
     <TextView
         android:id="@+id/textview_amount"
@@ -27,22 +29,10 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:layout_marginEnd="1dp"
-        android:layout_marginRight="1dp"
+        android:layout_marginEnd="12dp"
+        android:layout_marginRight="12dp"
         android:textColor="@color/dark_blue_text"
-        android:textSize="14dp" />
-
-    <ImageView
-        android:id="@+id/imageview_icon"
-        android:layout_width="22.8dp"
-        android:layout_height="28.8dp"
-        android:layout_gravity="center_vertical"
-        android:adjustViewBounds="true"
-        android:paddingBottom="9.45dp"
-        android:paddingLeft="5.45dp"
-        android:paddingTop="9.45dp"
-        android:layout_marginRight="10dp"
-        android:scaleType="centerCrop"
-        android:src="@drawable/arrow_right" />
+        android:textSize="14dp"
+        tools:text = "mB 20.12345"/>
 
 </LinearLayout>
diff --git a/AirBitz/airbitz/src/main/res/values/colors.xml b/AirBitz/airbitz/src/main/res/values/colors.xml
index 883792598..32fd21131 100644
--- a/AirBitz/airbitz/src/main/res/values/colors.xml
+++ b/AirBitz/airbitz/src/main/res/values/colors.xml
@@ -15,7 +15,8 @@
     <color name="listitem_normal">#88ffffff</color>
     <color name="selected_highlight">#aaffffff</color>
     <color name="semi_black_text">#99000000</color>
-    <color name="settings_button_text">#CC333333</color>
+    <color name="settings_button_text">#CC111111</color>
+    <color name="settings_button_value">#CC444444</color>
     <color name="settings_edit_text">#FFEEEEEE</color>
     <color name="settings_edit_hint">#FF999999</color>
     <color name="settings_edit_text_field">#FF444444</color>
diff --git a/AirBitz/airbitz/src/main/res/values/strings.xml b/AirBitz/airbitz/src/main/res/values/strings.xml
index d92199b9e..37a2f126a 100644
--- a/AirBitz/airbitz/src/main/res/values/strings.xml
+++ b/AirBitz/airbitz/src/main/res/values/strings.xml
@@ -8,6 +8,8 @@
     <string name="string_ok">OK</string>
     <string name="string_yes">Yes</string>
     <string name="string_no">No</string>
+    <string name="on">On</string>
+    <string name="off">Off</string>
     <string name="string_cancel">CANCEL</string>
     <string name="string_search">Search</string>
     <string name="string_done">DONE</string>
diff --git a/AirBitz/airbitz/src/main/res/values/styles.xml b/AirBitz/airbitz/src/main/res/values/styles.xml
index d3c676925..67aeb7c3a 100644
--- a/AirBitz/airbitz/src/main/res/values/styles.xml
+++ b/AirBitz/airbitz/src/main/res/values/styles.xml
@@ -9,7 +9,6 @@
     <style name="CategoryItem">
         <item name="android:gravity">left|center_vertical</item>
         <item name="android:background">@drawable/transparent_until_pressed</item>
-        <item name="android:drawableRight">@drawable/arrow_right</item>
         <item name="android:textColor">@color/dark_gray_text</item>
         <item name="android:textSize">@dimen/text_size_h4</item>
         <item name="android:shadowColor">@android:color/white</item>
@@ -26,7 +25,6 @@
     <style name="CategoryItemTop">
         <item name="android:gravity">left|center_vertical</item>
         <item name="android:background">@drawable/transparent_until_pressed_top</item>
-        <item name="android:drawableRight">@drawable/arrow_right</item>
         <item name="android:textColor">@color/dark_gray_text</item>
         <item name="android:textSize">@dimen/text_size_h4</item>
         <item name="android:shadowColor">@android:color/white</item>
@@ -43,7 +41,6 @@
     <style name="CategoryItemBottom">
         <item name="android:gravity">left|center_vertical</item>
         <item name="android:background">@drawable/transparent_until_pressed_bottom</item>
-        <item name="android:drawableRight">@drawable/arrow_right</item>
         <item name="android:textColor">@color/dark_gray_text</item>
         <item name="android:textSize">@dimen/text_size_h4</item>
         <item name="android:shadowColor">@android:color/white</item>
@@ -60,7 +57,6 @@
     <style name="CategoryItemDetail">
         <item name="android:gravity">left|center_vertical</item>
         <item name="android:background">@drawable/transparent_until_pressed</item>
-        <item name="android:drawableRight">@drawable/arrow_right</item>
         <item name="android:textColor">@color/dark_gray_text</item>
         <item name="android:textSize">@dimen/text_size_h4</item>
         <item name="android:drawablePadding">@dimen/content_padding_2</item>
@@ -75,7 +71,6 @@
     <style name="CategoryItemDetailTop">
         <item name="android:gravity">left|center_vertical</item>
         <item name="android:background">@drawable/transparent_until_pressed_top</item>
-        <item name="android:drawableRight">@drawable/arrow_right</item>
         <item name="android:textColor">@color/dark_gray_text</item>
         <item name="android:textSize">@dimen/text_size_h4</item>
         <item name="android:drawablePadding">@dimen/content_padding_2</item>