Layouts' default background replaced with a proper theme level window background.

Bottom sheet style unified.

src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt

@@ -110,8 +110,8 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity() {
         })
     }
 
-    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
-        menuInflater.inflate(R.menu.menu_apply, menu)
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
+        menuInflater.inflate(R.menu.menu_edit_closed_group, menu)
         return members.isNotEmpty()
     }
     // endregion
@@ -163,7 +163,7 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity() {
     // region Interaction
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when(item.itemId) {
-            R.id.applyButton -> commitChanges()
+            R.id.action_apply -> commitChanges()
         }
         return super.onOptionsItemSelected(item)
     }

src/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt

@@ -259,12 +259,16 @@ class HomeActivity : PassphraseRequiredActionBarActivity, ConversationClickListe
         val thread = view.thread ?: return
         val bottomSheet = ConversationOptionsBottomSheet()
         bottomSheet.recipient = thread.recipient
-        bottomSheet.onBlockOrUnblockTapped = {
+        bottomSheet.onBlockTapped = {
+            bottomSheet.dismiss()
+            if (!thread.recipient.isBlocked) {
+                blockConversation(thread)
+            }
+        }
+        bottomSheet.onUnblockTapped = {
             bottomSheet.dismiss()
             if (thread.recipient.isBlocked) {
                 unblockConversation(thread)
-            } else {
-                blockConversation(thread)
             }
         }
         bottomSheet.onDeleteTapped = {