diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 0058fca71..f570d7c97 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -225,10 +225,6 @@
android:clearTaskOnLaunch="true"
android:finishOnTaskLaunch="true" />
-
-
diff --git a/res/anim/fade_in.xml b/res/anim/fade_in.xml
deleted file mode 100644
index 8c8557d88..000000000
--- a/res/anim/fade_in.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/res/anim/fade_out.xml b/res/anim/fade_out.xml
deleted file mode 100644
index 09beb8382..000000000
--- a/res/anim/fade_out.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/res/menu/conversation.xml b/res/menu/conversation.xml
index 24d573733..e29402184 100644
--- a/res/menu/conversation.xml
+++ b/res/menu/conversation.xml
@@ -4,7 +4,7 @@
>
+ android:id="@+id/menu_profile"/>
diff --git a/res/menu/conversation_push_group_options.xml b/res/menu/conversation_push_group_options.xml
index db98b623c..bf6b086b7 100644
--- a/res/menu/conversation_push_group_options.xml
+++ b/res/menu/conversation_push_group_options.xml
@@ -1,9 +1,6 @@