diff --git a/res/drawable-hdpi/ic_action_edit_dark.png b/res/drawable-hdpi/ic_action_edit_dark.png
new file mode 100644
index 00000000..5f7c6eff
Binary files /dev/null and b/res/drawable-hdpi/ic_action_edit_dark.png differ
diff --git a/res/drawable-mdpi/ic_action_edit_dark.png b/res/drawable-mdpi/ic_action_edit_dark.png
new file mode 100644
index 00000000..650b4d89
Binary files /dev/null and b/res/drawable-mdpi/ic_action_edit_dark.png differ
diff --git a/res/drawable-xhdpi/ic_action_edit_dark.png b/res/drawable-xhdpi/ic_action_edit_dark.png
new file mode 100644
index 00000000..8ab436d8
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_edit_dark.png differ
diff --git a/res/drawable-xxhdpi/ic_action_edit_dark.png b/res/drawable-xxhdpi/ic_action_edit_dark.png
new file mode 100644
index 00000000..f2b2078b
Binary files /dev/null and b/res/drawable-xxhdpi/ic_action_edit_dark.png differ
diff --git a/res/layout/activity_muc_details.xml b/res/layout/activity_muc_details.xml
index 15f09c7c..d47c6b6e 100644
--- a/res/layout/activity_muc_details.xml
+++ b/res/layout/activity_muc_details.xml
@@ -2,147 +2,128 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ android:background="@color/primarybackground" >
-
-
-
-
-
+ android:orientation="vertical" >
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/layout/edit_contact_name.xml b/res/layout/edit_contact_name.xml
deleted file mode 100644
index 42f0fb88..00000000
--- a/res/layout/edit_contact_name.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/res/layout/quickedit.xml b/res/layout/quickedit.xml
new file mode 100644
index 00000000..07a7ac3b
--- /dev/null
+++ b/res/layout/quickedit.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
diff --git a/res/menu/muc_details.xml b/res/menu/muc_details.xml
index 4f9b6da0..685109cd 100644
--- a/res/menu/muc_details.xml
+++ b/res/menu/muc_details.xml
@@ -1,5 +1,11 @@