diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/managegroup/ManageGroupActivity.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/managegroup/ManageGroupActivity.java
index a859b81940..b6b02b02d4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/managegroup/ManageGroupActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/managegroup/ManageGroupActivity.java
@@ -5,7 +5,6 @@ import android.content.Intent;
 import android.os.Bundle;
 
 import androidx.annotation.NonNull;
-import androidx.appcompat.widget.Toolbar;
 
 import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity;
 import org.thoughtcrime.securesms.R;
@@ -39,10 +38,6 @@ public class ManageGroupActivity extends PassphraseRequiredActionBarActivity {
                                  .replace(R.id.container, ManageGroupFragment.newInstance(getIntent().getStringExtra(GROUP_ID)))
                                  .commitNow();
     }
-    Toolbar toolbar = findViewById(R.id.toolbar);
-    setSupportActionBar(toolbar);
-    //noinspection ConstantConditions
-    getSupportActionBar().setDisplayHomeAsUpEnabled(true);
   }
 
   @Override
@@ -50,10 +45,4 @@ public class ManageGroupActivity extends PassphraseRequiredActionBarActivity {
     super.onResume();
     dynamicTheme.onResume(this);
   }
-
-  @Override
-  public boolean onSupportNavigateUp() {
-    onBackPressed();
-    return true;
-  }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/managegroup/ManageGroupFragment.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/managegroup/ManageGroupFragment.java
index c60a5f2211..373e7e0322 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/managegroup/ManageGroupFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/managegroup/ManageGroupFragment.java
@@ -16,6 +16,7 @@ import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.widget.Toolbar;
 import androidx.core.view.ViewCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
@@ -62,7 +63,7 @@ public class ManageGroupFragment extends Fragment {
   private ManageGroupViewModel               viewModel;
   private GroupMemberListView                groupMemberList;
   private View                               listPending;
-  private TextView                           groupTitle;
+  private Toolbar                            toolbar;
   private TextView                           memberCountUnderAvatar;
   private TextView                           memberCountAboveList;
   private AvatarImageView                    avatar;
@@ -119,7 +120,7 @@ public class ManageGroupFragment extends Fragment {
     View view = inflater.inflate(R.layout.group_manage_fragment, container, false);
 
     avatar                      = view.findViewById(R.id.group_avatar);
-    groupTitle                  = view.findViewById(R.id.group_title);
+    toolbar                     = view.findViewById(R.id.toolbar);
     memberCountUnderAvatar      = view.findViewById(R.id.member_count);
     memberCountAboveList        = view.findViewById(R.id.member_count_2);
     groupMemberList             = view.findViewById(R.id.group_members);
@@ -185,7 +186,9 @@ public class ManageGroupFragment extends Fragment {
 
     avatar.setFallbackPhotoProvider(fallbackPhotoProvider);
 
-    viewModel.getTitle().observe(getViewLifecycleOwner(), groupTitle::setText);
+    toolbar.setNavigationOnClickListener(v -> requireActivity().finish());
+
+    viewModel.getTitle().observe(getViewLifecycleOwner(), toolbar::setTitle);
     viewModel.getMemberCountSummary().observe(getViewLifecycleOwner(), memberCountUnderAvatar::setText);
     viewModel.getFullMemberCountSummary().observe(getViewLifecycleOwner(), memberCountAboveList::setText);
     viewModel.getGroupRecipient().observe(getViewLifecycleOwner(), avatar::setRecipient);
diff --git a/app/src/main/res/layout/group_manage_activity.xml b/app/src/main/res/layout/group_manage_activity.xml
index 9bc5e51f35..7c7d00a6bc 100644
--- a/app/src/main/res/layout/group_manage_activity.xml
+++ b/app/src/main/res/layout/group_manage_activity.xml
@@ -7,15 +7,6 @@
     android:orientation="vertical"
     tools:context=".groups.ui.managegroup.ManageGroupActivity">
 
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:theme="@style/ThemeOverlay.AppCompat.ActionBar"
-        app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
-        app:title=" "
-        app:titleTextColor="?attr/title_text_color_primary" />
-
     <FrameLayout
         android:id="@+id/container"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/group_manage_fragment.xml b/app/src/main/res/layout/group_manage_fragment.xml
index 2e01a5e5c5..68baaea9ff 100644
--- a/app/src/main/res/layout/group_manage_fragment.xml
+++ b/app/src/main/res/layout/group_manage_fragment.xml
@@ -1,28 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/pending_member_background"
-    android:fillViewport="true"
     tools:context=".groups.ui.managegroup.ManageGroupFragment">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:background="?android:attr/windowBackground"
+        android:elevation="4dp"
+        android:fitsSystemWindows="true">
 
-        <androidx.cardview.widget.CardView
-            android:id="@+id/group_title_card"
+        <com.google.android.material.appbar.CollapsingToolbarLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:cardBackgroundColor="?android:attr/windowBackground"
-            app:layout_constraintTop_toTopOf="parent">
+            android:background="@null"
+            app:scrimAnimationDuration="200"
+            app:contentScrim="?android:attr/windowBackground"
+            app:expandedTitleGravity="center_horizontal"
+            app:expandedTitleMarginTop="156dp"
+            app:expandedTitleTextAppearance="@style/TextAppearance.Signal.Body1.Bold"
+            app:layout_scrollFlags="scroll|exitUntilCollapsed">
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
+                android:paddingTop="16dp"
                 android:paddingBottom="16dp">
 
                 <org.thoughtcrime.securesms.components.AvatarImageView
@@ -32,13 +38,12 @@
                     android:layout_gravity="center_horizontal" />
 
                 <TextView
-                    android:id="@+id/group_title"
                     style="@style/TextAppearance.Signal.Body1.Bold"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
                     android:layout_marginTop="14dp"
-                    tools:text="Parkdale Run Crew" />
+                    tools:text=" " />
 
                 <TextView
                     android:id="@+id/member_count"
@@ -48,386 +53,408 @@
                     android:textAppearance="@style/TextAppearance.Signal.Body2"
                     android:textColor="?title_text_color_secondary"
                     tools:text="12 members (4 invited)" />
-
             </LinearLayout>
 
-        </androidx.cardview.widget.CardView>
-
-        <androidx.cardview.widget.CardView
-            android:id="@+id/group_disappearing_messages_card"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/group_manage_fragment_card_vertical_padding"
-            app:cardBackgroundColor="?android:attr/windowBackground"
-            app:layout_constraintTop_toBottomOf="@id/group_title_card">
-
-            <LinearLayout
-                android:id="@+id/disappearing_messages_row"
+            <androidx.appcompat.widget.Toolbar
+                android:id="@+id/toolbar"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/group_manage_fragment_row_height"
-                android:background="?selectableItemBackground"
-                android:clickable="true"
-                android:focusable="true"
-                android:orientation="horizontal"
-                android:paddingStart="@dimen/group_manage_fragment_row_horizontal_padding"
-                android:paddingEnd="@dimen/group_manage_fragment_row_horizontal_padding">
+                android:layout_height="?attr/actionBarSize"
+                app:layout_collapseMode="pin"
+                app:navigationIcon="@drawable/ic_arrow_left_24"
+                tools:title="Parkdake Run Crew" />
 
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_gravity="center_horizontal"
-                    android:gravity="center_vertical"
-                    android:text="@string/ManageGroupActivity_disappearing_messages"
-                    android:textAppearance="@style/TextAppearance.Signal.Body2" />
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
 
-                <TextView
-                    android:id="@+id/disappearing_messages"
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:gravity="center_vertical|end"
-                    android:textAppearance="@style/TextAppearance.Signal.Body2"
-                    android:textColor="@color/ultramarine_text_button"
-                    tools:text="Off" />
+    </com.google.android.material.appbar.AppBarLayout>
 
-            </LinearLayout>
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?attr/pending_member_background"
+        android:fillViewport="true"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-        </androidx.cardview.widget.CardView>
-
-        <androidx.cardview.widget.CardView
-            android:id="@+id/group_notifications_card"
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/group_manage_fragment_card_vertical_padding"
-            app:cardBackgroundColor="?android:attr/windowBackground"
-            app:layout_constraintTop_toBottomOf="@id/group_disappearing_messages_card">
+            android:layout_height="wrap_content">
 
-            <LinearLayout
+            <androidx.cardview.widget.CardView
+                android:id="@+id/group_disappearing_messages_card"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:id="@+id/group_mute_notifications_row"
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/group_manage_fragment_row_height"
-                    android:background="?selectableItemBackground"
-                    android:clickable="true"
-                    android:focusable="true"
-                    android:paddingStart="@dimen/group_manage_fragment_row_horizontal_padding"
-                    android:paddingEnd="@dimen/group_manage_fragment_row_horizontal_padding">
-
-                    <TextView
-                        android:id="@+id/group_mute_notifications"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:gravity="start|center_vertical"
-                        android:text="@string/ManageGroupActivity_mute_notifications"
-                        android:textAppearance="@style/TextAppearance.Signal.Body2"
-                        app:layout_constraintBottom_toTopOf="@id/group_mute_notifications_until"
-                        app:layout_constraintEnd_toStartOf="@id/group_mute_notifications_switch"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                    <TextView
-                        android:id="@+id/group_mute_notifications_until"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:visibility="gone"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@id/group_mute_notifications"
-                        tools:text="Until 12:42 PM"
-                        tools:visibility="visible" />
-
-                    <Switch
-                        android:id="@+id/group_mute_notifications_switch"
-                        android:layout_width="0dp"
-                        android:layout_height="match_parent"
-                        android:clickable="false"
-                        android:enabled="false"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toEndOf="@id/group_mute_notifications"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                </androidx.constraintlayout.widget.ConstraintLayout>
+                android:layout_marginTop="@dimen/group_manage_fragment_card_vertical_padding"
+                app:cardBackgroundColor="?android:attr/windowBackground"
+                app:layout_constraintTop_toTopOf="parent">
 
                 <LinearLayout
-                    android:id="@+id/group_custom_notifications_row"
+                    android:id="@+id/disappearing_messages_row"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/group_manage_fragment_row_height"
                     android:background="?selectableItemBackground"
                     android:clickable="true"
                     android:focusable="true"
+                    android:orientation="horizontal"
                     android:paddingStart="@dimen/group_manage_fragment_row_horizontal_padding"
                     android:paddingEnd="@dimen/group_manage_fragment_row_horizontal_padding">
 
                     <TextView
-                        android:id="@+id/group_custom_notifications"
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
-                        android:gravity="start|center_vertical"
-                        android:text="@string/ManageGroupActivity_custom_notifications"
-                        android:textAppearance="@style/TextAppearance.Signal.Body2"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toStartOf="@id/group_mute_notifications_switch"
-                        app:layout_constraintStart_toStartOf="parent" />
+                        android:layout_gravity="center_horizontal"
+                        android:gravity="center_vertical"
+                        android:text="@string/ManageGroupActivity_disappearing_messages"
+                        android:textAppearance="@style/TextAppearance.Signal.Body2" />
 
                     <TextView
-                        android:id="@+id/group_custom_notifications_button"
+                        android:id="@+id/disappearing_messages"
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
                         android:layout_weight="1"
                         android:gravity="center_vertical|end"
                         android:textAppearance="@style/TextAppearance.Signal.Body2"
                         android:textColor="@color/ultramarine_text_button"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toEndOf="@id/group_custom_notifications"
-                        app:layout_constraintTop_toBottomOf="@id/group_mute_notifications_switch"
                         tools:text="Off" />
 
                 </LinearLayout>
 
-            </LinearLayout>
+            </androidx.cardview.widget.CardView>
 
-        </androidx.cardview.widget.CardView>
-
-        <androidx.cardview.widget.CardView
-            android:id="@+id/group_media_card"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/group_manage_fragment_card_vertical_padding"
-            android:visibility="gone"
-            app:cardBackgroundColor="?android:attr/windowBackground"
-            app:layout_constraintTop_toBottomOf="@id/group_notifications_card"
-            tools:visibility="visible">
-
-            <LinearLayout
+            <androidx.cardview.widget.CardView
+                android:id="@+id/group_notifications_card"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical">
+                android:layout_marginTop="@dimen/group_manage_fragment_card_vertical_padding"
+                app:cardBackgroundColor="?android:attr/windowBackground"
+                app:layout_constraintTop_toBottomOf="@id/group_disappearing_messages_card">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:id="@+id/group_mute_notifications_row"
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/group_manage_fragment_row_height"
+                        android:background="?selectableItemBackground"
+                        android:clickable="true"
+                        android:focusable="true"
+                        android:paddingStart="@dimen/group_manage_fragment_row_horizontal_padding"
+                        android:paddingEnd="@dimen/group_manage_fragment_row_horizontal_padding">
+
+                        <TextView
+                            android:id="@+id/group_mute_notifications"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:gravity="start|center_vertical"
+                            android:text="@string/ManageGroupActivity_mute_notifications"
+                            android:textAppearance="@style/TextAppearance.Signal.Body2"
+                            app:layout_constraintBottom_toTopOf="@id/group_mute_notifications_until"
+                            app:layout_constraintEnd_toStartOf="@id/group_mute_notifications_switch"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+
+                        <TextView
+                            android:id="@+id/group_mute_notifications_until"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:visibility="gone"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toBottomOf="@id/group_mute_notifications"
+                            tools:text="Until 12:42 PM"
+                            tools:visibility="visible" />
+
+                        <Switch
+                            android:id="@+id/group_mute_notifications_switch"
+                            android:layout_width="0dp"
+                            android:layout_height="match_parent"
+                            android:clickable="false"
+                            android:enabled="false"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toEndOf="@id/group_mute_notifications"
+                            app:layout_constraintTop_toTopOf="parent" />
+
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    <LinearLayout
+                        android:id="@+id/group_custom_notifications_row"
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/group_manage_fragment_row_height"
+                        android:background="?selectableItemBackground"
+                        android:clickable="true"
+                        android:focusable="true"
+                        android:paddingStart="@dimen/group_manage_fragment_row_horizontal_padding"
+                        android:paddingEnd="@dimen/group_manage_fragment_row_horizontal_padding">
+
+                        <TextView
+                            android:id="@+id/group_custom_notifications"
+                            android:layout_width="wrap_content"
+                            android:layout_height="match_parent"
+                            android:gravity="start|center_vertical"
+                            android:text="@string/ManageGroupActivity_custom_notifications"
+                            android:textAppearance="@style/TextAppearance.Signal.Body2"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toStartOf="@id/group_mute_notifications_switch"
+                            app:layout_constraintStart_toStartOf="parent" />
+
+                        <TextView
+                            android:id="@+id/group_custom_notifications_button"
+                            android:layout_width="0dp"
+                            android:layout_height="match_parent"
+                            android:layout_weight="1"
+                            android:gravity="center_vertical|end"
+                            android:textAppearance="@style/TextAppearance.Signal.Body2"
+                            android:textColor="@color/ultramarine_text_button"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toEndOf="@id/group_custom_notifications"
+                            app:layout_constraintTop_toBottomOf="@id/group_mute_notifications_switch"
+                            tools:text="Off" />
+
+                    </LinearLayout>
+
+                </LinearLayout>
+
+            </androidx.cardview.widget.CardView>
+
+            <androidx.cardview.widget.CardView
+                android:id="@+id/group_media_card"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/group_manage_fragment_card_vertical_padding"
+                android:visibility="gone"
+                app:cardBackgroundColor="?android:attr/windowBackground"
+                app:layout_constraintTop_toBottomOf="@id/group_notifications_card"
+                tools:visibility="visible">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
+
+                    <Button
+                        android:id="@+id/rail_label"
+                        style="@style/Widget.Signal.Button.TextButton.Ultramarine"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:focusableInTouchMode="true"
+                        android:padding="16dp"
+                        android:text="@string/recipient_preference_activity__shared_media" />
+
+                    <org.thoughtcrime.securesms.components.ThreadPhotoRailView
+                        android:id="@+id/recent_photos"
+                        android:layout_width="match_parent"
+                        android:layout_height="90dp"
+                        android:layout_marginBottom="16dp" />
+
+                </LinearLayout>
+
+            </androidx.cardview.widget.CardView>
+
+            <androidx.cardview.widget.CardView
+                android:id="@+id/group_access_control_card"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/group_manage_fragment_card_vertical_padding"
+                android:visibility="gone"
+                app:cardBackgroundColor="?android:attr/windowBackground"
+                app:layout_constraintTop_toBottomOf="@id/group_media_card"
+                tools:visibility="visible">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
+
+                    <LinearLayout
+                        android:id="@+id/edit_group_membership_row"
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/group_manage_fragment_row_height"
+                        android:background="?selectableItemBackground"
+                        android:clickable="true"
+                        android:focusable="true"
+                        android:paddingStart="@dimen/group_manage_fragment_row_horizontal_padding"
+                        android:paddingEnd="@dimen/group_manage_fragment_row_horizontal_padding">
+
+                        <TextView
+                            android:id="@+id/edit_group_membership_title"
+                            android:layout_width="wrap_content"
+                            android:layout_height="match_parent"
+                            android:gravity="center_vertical|start"
+                            android:text="@string/ManageGroupActivity_who_can_edit_group_membership"
+                            android:textAppearance="@style/TextAppearance.Signal.Body2" />
+
+                        <TextView
+                            android:id="@+id/edit_group_membership_value"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:gravity="center_vertical|end"
+                            android:textAppearance="@style/TextAppearance.Signal.Body2"
+                            android:textColor="@color/ultramarine_text_button"
+                            tools:text="Only admin" />
+
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:id="@+id/edit_group_access_row"
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/group_manage_fragment_row_height"
+                        android:background="?selectableItemBackground"
+                        android:clickable="true"
+                        android:focusable="true"
+                        android:paddingStart="@dimen/group_manage_fragment_row_horizontal_padding"
+                        android:paddingEnd="@dimen/group_manage_fragment_row_horizontal_padding">
+
+                        <TextView
+                            android:id="@+id/edit_group_access_title"
+                            android:layout_width="wrap_content"
+                            android:layout_height="match_parent"
+                            android:gravity="center_vertical|start"
+                            android:text="@string/ManageGroupActivity_who_can_edit_group_info"
+                            android:textAppearance="@style/TextAppearance.Signal.Body2" />
+
+                        <TextView
+                            android:id="@+id/edit_group_access_value"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:gravity="center_vertical|end"
+                            android:textAppearance="@style/TextAppearance.Signal.Body2"
+                            android:textColor="@color/ultramarine_text_button"
+                            tools:text="All members" />
+
+                    </LinearLayout>
+                </LinearLayout>
+
+            </androidx.cardview.widget.CardView>
+
+            <androidx.cardview.widget.CardView
+                android:id="@+id/group_membership_card"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/group_manage_fragment_card_vertical_padding"
+                app:cardBackgroundColor="?android:attr/windowBackground"
+                app:layout_constraintTop_toBottomOf="@id/group_access_control_card">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:id="@+id/member_count_2"
+                        style="@style/TextAppearance.Signal.Subtitle2"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="16dp"
+                        android:layout_marginTop="12dp"
+                        android:layout_marginBottom="4dp"
+                        android:textColor="?title_text_color_secondary"
+                        tools:text="12 members" />
+
+                    <TextView
+                        android:id="@+id/add_members"
+                        android:layout_width="match_parent"
+                        android:layout_height="64dp"
+                        android:background="?selectableItemBackground"
+                        android:drawableStart="?attr/manage_group_add_members_icon"
+                        android:drawablePadding="8dp"
+                        android:gravity="center_vertical|start"
+                        android:paddingStart="@dimen/group_manage_fragment_row_horizontal_padding"
+                        android:paddingEnd="@dimen/group_manage_fragment_row_horizontal_padding"
+                        android:text="@string/ManageGroupActivity_add_members"
+                        android:textAppearance="@style/TextAppearance.Signal.Body2"
+                        android:textColor="@color/ultramarine_text_button"
+                        android:visibility="gone"
+                        tools:visibility="visible" />
+
+                    <org.thoughtcrime.securesms.groups.ui.GroupMemberListView
+                        android:id="@+id/group_members"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        tools:listitem="@layout/group_recipient_list_item" />
+
+                    <TextView
+                        android:id="@+id/toggle_all_members"
+                        android:layout_width="match_parent"
+                        android:layout_height="64dp"
+                        android:background="?selectableItemBackground"
+                        android:drawableStart="?attr/manage_group_view_all_icon"
+                        android:drawablePadding="8dp"
+                        android:gravity="center_vertical|start"
+                        android:paddingStart="@dimen/group_manage_fragment_row_horizontal_padding"
+                        android:paddingEnd="@dimen/group_manage_fragment_row_horizontal_padding"
+                        android:text="@string/ManageGroupActivity_view_all_members"
+                        android:textAppearance="@style/TextAppearance.Signal.Body2"
+                        android:textColor="@color/ultramarine_text_button"
+                        android:visibility="gone"
+                        tools:visibility="visible" />
+
+                </LinearLayout>
+
+            </androidx.cardview.widget.CardView>
+
+            <androidx.cardview.widget.CardView
+                android:id="@+id/group_pending_card"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/group_manage_fragment_card_vertical_padding"
+                app:cardBackgroundColor="?android:attr/windowBackground"
+                app:layout_constraintTop_toBottomOf="@id/group_membership_card">
 
                 <Button
-                    android:id="@+id/rail_label"
-                    style="@style/Widget.Signal.Button.TextButton.Ultramarine"
+                    android:id="@+id/listPending"
+                    style="@style/Widget.Signal.Button.TextButton"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:focusableInTouchMode="true"
-                    android:padding="16dp"
-                    android:text="@string/recipient_preference_activity__shared_media" />
+                    android:text="@string/ManageGroupActivity_pending_group_invites" />
 
-                <org.thoughtcrime.securesms.components.ThreadPhotoRailView
-                    android:id="@+id/recent_photos"
-                    android:layout_width="match_parent"
-                    android:layout_height="90dp"
-                    android:layout_marginBottom="16dp" />
+            </androidx.cardview.widget.CardView>
 
-            </LinearLayout>
-
-        </androidx.cardview.widget.CardView>
-
-        <androidx.cardview.widget.CardView
-            android:id="@+id/group_access_control_card"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/group_manage_fragment_card_vertical_padding"
-            android:visibility="gone"
-            app:cardBackgroundColor="?android:attr/windowBackground"
-            app:layout_constraintTop_toBottomOf="@id/group_media_card"
-            tools:visibility="visible">
-
-            <LinearLayout
+            <androidx.cardview.widget.CardView
+                android:id="@+id/group_block_and_leave_card"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical">
+                android:layout_marginTop="@dimen/group_manage_fragment_card_vertical_padding"
+                app:cardBackgroundColor="?android:attr/windowBackground"
+                app:layout_constraintTop_toBottomOf="@id/group_pending_card">
 
                 <LinearLayout
-                    android:id="@+id/edit_group_membership_row"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/group_manage_fragment_row_height"
-                    android:background="?selectableItemBackground"
-                    android:clickable="true"
-                    android:focusable="true"
-                    android:paddingStart="@dimen/group_manage_fragment_row_horizontal_padding"
-                    android:paddingEnd="@dimen/group_manage_fragment_row_horizontal_padding">
+                    android:layout_height="match_parent"
+                    android:orientation="vertical">
 
                     <TextView
-                        android:id="@+id/edit_group_membership_title"
-                        android:layout_width="wrap_content"
-                        android:layout_height="match_parent"
-                        android:gravity="center_vertical|start"
-                        android:text="@string/ManageGroupActivity_who_can_edit_group_membership"
-                        android:textAppearance="@style/TextAppearance.Signal.Body2" />
-
-                    <TextView
-                        android:id="@+id/edit_group_membership_value"
+                        android:id="@+id/blockGroup"
                         android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:gravity="center_vertical|end"
+                        android:layout_height="@dimen/group_manage_fragment_row_height"
+                        android:background="?selectableItemBackground"
+                        android:gravity="center_vertical|start"
+                        android:paddingStart="@dimen/group_manage_fragment_row_horizontal_padding"
+                        android:paddingEnd="@dimen/group_manage_fragment_row_horizontal_padding"
+                        android:text="@string/ManageGroupActivity_block_group"
                         android:textAppearance="@style/TextAppearance.Signal.Body2"
-                        android:textColor="@color/ultramarine_text_button"
-                        tools:text="Only admin" />
+                        android:textColor="@color/core_red" />
+
+                    <TextView
+                        android:id="@+id/leaveGroup"
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/group_manage_fragment_row_height"
+                        android:background="?selectableItemBackground"
+                        android:gravity="center_vertical|start"
+                        android:paddingStart="@dimen/group_manage_fragment_row_horizontal_padding"
+                        android:paddingEnd="@dimen/group_manage_fragment_row_horizontal_padding"
+                        android:text="@string/ManageGroupActivity_leave_group"
+                        android:textAppearance="@style/TextAppearance.Signal.Body2"
+                        android:textColor="@color/core_red" />
 
                 </LinearLayout>
 
-                <LinearLayout
-                    android:id="@+id/edit_group_access_row"
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/group_manage_fragment_row_height"
-                    android:background="?selectableItemBackground"
-                    android:clickable="true"
-                    android:focusable="true"
-                    android:paddingStart="@dimen/group_manage_fragment_row_horizontal_padding"
-                    android:paddingEnd="@dimen/group_manage_fragment_row_horizontal_padding">
+            </androidx.cardview.widget.CardView>
 
-                    <TextView
-                        android:id="@+id/edit_group_access_title"
-                        android:layout_width="wrap_content"
-                        android:layout_height="match_parent"
-                        android:gravity="center_vertical|start"
-                        android:text="@string/ManageGroupActivity_who_can_edit_group_info"
-                        android:textAppearance="@style/TextAppearance.Signal.Body2" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
-                    <TextView
-                        android:id="@+id/edit_group_access_value"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:gravity="center_vertical|end"
-                        android:textAppearance="@style/TextAppearance.Signal.Body2"
-                        android:textColor="@color/ultramarine_text_button"
-                        tools:text="All members" />
+    </androidx.core.widget.NestedScrollView>
 
-                </LinearLayout>
-            </LinearLayout>
-
-        </androidx.cardview.widget.CardView>
-
-        <androidx.cardview.widget.CardView
-            android:id="@+id/group_membership_card"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/group_manage_fragment_card_vertical_padding"
-            app:cardBackgroundColor="?android:attr/windowBackground"
-            app:layout_constraintTop_toBottomOf="@id/group_access_control_card">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <TextView
-                    android:id="@+id/member_count_2"
-                    style="@style/TextAppearance.Signal.Subtitle2"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="16dp"
-                    android:layout_marginTop="12dp"
-                    android:layout_marginBottom="4dp"
-                    android:textColor="?title_text_color_secondary"
-                    tools:text="12 members" />
-
-                <TextView
-                    android:id="@+id/add_members"
-                    android:layout_width="match_parent"
-                    android:layout_height="64dp"
-                    android:background="?selectableItemBackground"
-                    android:drawableStart="?attr/manage_group_add_members_icon"
-                    android:drawablePadding="8dp"
-                    android:gravity="center_vertical|start"
-                    android:paddingStart="@dimen/group_manage_fragment_row_horizontal_padding"
-                    android:paddingEnd="@dimen/group_manage_fragment_row_horizontal_padding"
-                    android:text="@string/ManageGroupActivity_add_members"
-                    android:textAppearance="@style/TextAppearance.Signal.Body2"
-                    android:textColor="@color/ultramarine_text_button"
-                    android:visibility="gone"
-                    tools:visibility="visible" />
-
-                <org.thoughtcrime.securesms.groups.ui.GroupMemberListView
-                    android:id="@+id/group_members"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    tools:listitem="@layout/group_recipient_list_item" />
-
-                <TextView
-                    android:id="@+id/toggle_all_members"
-                    android:layout_width="match_parent"
-                    android:layout_height="64dp"
-                    android:background="?selectableItemBackground"
-                    android:drawableStart="?attr/manage_group_view_all_icon"
-                    android:drawablePadding="8dp"
-                    android:gravity="center_vertical|start"
-                    android:paddingStart="@dimen/group_manage_fragment_row_horizontal_padding"
-                    android:paddingEnd="@dimen/group_manage_fragment_row_horizontal_padding"
-                    android:text="@string/ManageGroupActivity_view_all_members"
-                    android:textAppearance="@style/TextAppearance.Signal.Body2"
-                    android:textColor="@color/ultramarine_text_button"
-                    android:visibility="gone"
-                    tools:visibility="visible" />
-
-            </LinearLayout>
-
-        </androidx.cardview.widget.CardView>
-
-        <androidx.cardview.widget.CardView
-            android:id="@+id/group_pending_card"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/group_manage_fragment_card_vertical_padding"
-            app:cardBackgroundColor="?android:attr/windowBackground"
-            app:layout_constraintTop_toBottomOf="@id/group_membership_card">
-
-            <Button
-                android:id="@+id/listPending"
-                style="@style/Widget.Signal.Button.TextButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/ManageGroupActivity_pending_group_invites" />
-
-        </androidx.cardview.widget.CardView>
-
-        <androidx.cardview.widget.CardView
-            android:id="@+id/group_block_and_leave_card"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/group_manage_fragment_card_vertical_padding"
-            app:cardBackgroundColor="?android:attr/windowBackground"
-            app:layout_constraintTop_toBottomOf="@id/group_pending_card">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical">
-
-                <TextView
-                    android:id="@+id/blockGroup"
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/group_manage_fragment_row_height"
-                    android:background="?selectableItemBackground"
-                    android:gravity="center_vertical|start"
-                    android:paddingStart="@dimen/group_manage_fragment_row_horizontal_padding"
-                    android:paddingEnd="@dimen/group_manage_fragment_row_horizontal_padding"
-                    android:text="@string/ManageGroupActivity_block_group"
-                    android:textAppearance="@style/TextAppearance.Signal.Body2"
-                    android:textColor="@color/core_red" />
-
-                <TextView
-                    android:id="@+id/leaveGroup"
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/group_manage_fragment_row_height"
-                    android:background="?selectableItemBackground"
-                    android:gravity="center_vertical|start"
-                    android:paddingStart="@dimen/group_manage_fragment_row_horizontal_padding"
-                    android:paddingEnd="@dimen/group_manage_fragment_row_horizontal_padding"
-                    android:text="@string/ManageGroupActivity_leave_group"
-                    android:textAppearance="@style/TextAppearance.Signal.Body2"
-                    android:textColor="@color/core_red" />
-
-            </LinearLayout>
-
-        </androidx.cardview.widget.CardView>
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</androidx.core.widget.NestedScrollView>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>