11 files changed, 25 insertions, 2 deletions
diff --git a/res/drawable-hdpi/ic_action_add_person.png b/res/drawable-hdpi/ic_action_add_person.png
new file mode 100644
index 000000000..5ebac9706
--- /dev/null
+++ b/res/drawable-hdpi/ic_action_add_person.png
diff --git a/res/drawable-hdpi/ic_action_delete.png b/res/drawable-hdpi/ic_action_delete.png
new file mode 100644
index 000000000..e9ce89e04
--- /dev/null
+++ b/res/drawable-hdpi/ic_action_delete.png
diff --git a/res/drawable-mdpi/ic_action_add_person.png b/res/drawable-mdpi/ic_action_add_person.png
new file mode 100644
index 000000000..c43cf6553
--- /dev/null
+++ b/res/drawable-mdpi/ic_action_add_person.png
diff --git a/res/drawable-mdpi/ic_action_delete.png b/res/drawable-mdpi/ic_action_delete.png
new file mode 100644
index 000000000..cedb1085b
--- /dev/null
+++ b/res/drawable-mdpi/ic_action_delete.png
diff --git a/res/drawable-xhdpi/ic_action_add_person.png b/res/drawable-xhdpi/ic_action_add_person.png
new file mode 100644
index 000000000..91434a47b
--- /dev/null
+++ b/res/drawable-xhdpi/ic_action_add_person.png
diff --git a/res/drawable-xhdpi/ic_action_delete.png b/res/drawable-xhdpi/ic_action_delete.png
new file mode 100644
index 000000000..98c73da1f
--- /dev/null
+++ b/res/drawable-xhdpi/ic_action_delete.png
diff --git a/res/drawable-xxhdpi/ic_action_add_person.png b/res/drawable-xxhdpi/ic_action_add_person.png
new file mode 100644
index 000000000..f18aa6144
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_add_person.png
diff --git a/res/layout/account_row.xml b/res/layout/account_row.xml
index 92e179f8a..402cb9658 100644
--- a/res/layout/account_row.xml
+++ b/res/layout/account_row.xml
@@ -2,7 +2,8 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="8dp">
+    android:padding="8dp"
+    android:background="?android:attr/activatedBackgroundIndicator">
 
  
 
diff --git a/res/menu/manageaccounts.xml b/res/menu/manageaccounts.xml
index 63441919e..1d81ba3c6 100644
--- a/res/menu/manageaccounts.xml
+++ b/res/menu/manageaccounts.xml
@@ -2,7 +2,8 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
     <item android:id="@+id/action_add_account"
         android:showAsAction="always"
-        android:title="@string/action_add_account"/>
+        android:title="@string/action_add_account"
+        android:icon="@drawable/ic_action_add_person"/>
  <item
         android:id="@+id/action_settings"
         android:orderInCategory="100"
diff --git a/res/menu/manageaccounts_context.xml b/res/menu/manageaccounts_context.xml
new file mode 100644
index 000000000..30ba747d0
--- /dev/null
+++ b/res/menu/manageaccounts_context.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:icon="@drawable/ic_action_delete"
+        android:title="Delete"
+        android:showAsAction="always"
+        />
+    <item
+        android:id="@+id/account_disable"
+        android:title="Temporarily disable"
+        android:showAsAction="always"/>
+    <item
+        android:id="@+id/account_enable"
+        android:title="Enable"
+        android:showAsAction="always"
+        android:visible="false"/>
+
+</menu>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 592007ba4..b8135cdea 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -10,4 +10,8 @@
         <item>pgp</item>
         <item>otr</item>
     </array>
+    <array name="manage_account_options">
+        <item>Delete</item>
+        <item>Disable</item>
+    </array>
 </resources>