diff --git a/app/src/main/java/org/thoughtcrime/securesms/profiles/spoofing/ReviewBannerView.java b/app/src/main/java/org/thoughtcrime/securesms/profiles/spoofing/ReviewBannerView.java
index db94720f0..a4c45946d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/profiles/spoofing/ReviewBannerView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/profiles/spoofing/ReviewBannerView.java
@@ -8,6 +8,7 @@ import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewOutlineProvider;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
@@ -26,9 +27,7 @@ import org.thoughtcrime.securesms.util.ViewUtil;
 /**
  * Banner displayed within a conversation when a review is suggested.
  */
-public class ReviewBannerView extends ConstraintLayout {
-
-  private static final @Px int ELEVATION = ViewUtil.dpToPx(4);
+public class ReviewBannerView extends LinearLayout {
 
   private ImageView       bannerIcon;
   private TextView        bannerMessage;
@@ -62,16 +61,6 @@ public class ReviewBannerView extends ConstraintLayout {
     bottomRightAvatar.setFallbackPhotoProvider(provider);
 
     bannerClose.setOnClickListener(v -> setVisibility(GONE));
-
-    if (Build.VERSION.SDK_INT >= 21) {
-      setOutlineProvider(new ViewOutlineProvider() {
-        @Override
-        public void getOutline(View view, Outline outline) {
-          outline.setRect(-100, -100, view.getWidth() + 100, view.getHeight() + ELEVATION);
-        }
-      });
-      setElevation(ELEVATION);
-    }
   }
 
   public void setBannerMessage(@Nullable CharSequence charSequence) {
diff --git a/app/src/main/res/layout/conversation_activity.xml b/app/src/main/res/layout/conversation_activity.xml
index 93c042345..07512068c 100644
--- a/app/src/main/res/layout/conversation_activity.xml
+++ b/app/src/main/res/layout/conversation_activity.xml
@@ -196,35 +196,38 @@
 
     </org.thoughtcrime.securesms.util.views.DarkOverflowToolbar>
 
-    <ViewStub
-        android:id="@+id/review_banner_stub"
+    <LinearLayout
+        android:id="@+id/conversation_banner_container"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:inflatedId="@+id/review_banner"
-        android:layout="@layout/review_banner_view"
+        android:orientation="vertical"
         app:layout_constraintTop_toBottomOf="@id/toolbar"
         app:layout_constraintStart_toStartOf="@id/parent_start_guideline"
-        app:layout_constraintEnd_toEndOf="@id/parent_end_guideline"/>
+        app:layout_constraintEnd_toEndOf="@id/parent_end_guideline">
 
-    <ViewStub
-        android:id="@+id/unverified_banner_stub"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:inflatedId="@+id/unverified_banner"
-        android:layout="@layout/conversation_activity_unverified_banner_stub"
-        app:layout_constraintTop_toBottomOf="@id/review_banner_stub"
-        app:layout_constraintStart_toStartOf="@id/parent_start_guideline"
-        app:layout_constraintEnd_toEndOf="@id/parent_end_guideline"/>
+        <ViewStub
+            android:id="@+id/unverified_banner_stub"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:inflatedId="@+id/unverified_banner"
+            android:layout="@layout/conversation_activity_unverified_banner_stub" />
 
-    <ViewStub
-        android:id="@+id/reminder_stub"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:inflatedId="@+id/reminder"
-        android:layout="@layout/conversation_activity_reminderview_stub"
-        app:layout_constraintTop_toBottomOf="@id/unverified_banner_stub"
-        app:layout_constraintStart_toStartOf="@id/parent_start_guideline"
-        app:layout_constraintEnd_toEndOf="@id/parent_end_guideline"/>
+        <ViewStub
+            android:id="@+id/reminder_stub"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:inflatedId="@+id/reminder"
+            android:layout="@layout/conversation_activity_reminderview_stub" />
+
+        <ViewStub
+            android:id="@+id/review_banner_stub"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:inflatedId="@+id/review_banner"
+            android:layout="@layout/review_banner_view" />
+
+
+    </LinearLayout>
 
     <View
         android:id="@+id/conversation_toolbar_shadow"
diff --git a/app/src/main/res/layout/review_banner_view.xml b/app/src/main/res/layout/review_banner_view.xml
index 704f79332..4eeb44843 100644
--- a/app/src/main/res/layout/review_banner_view.xml
+++ b/app/src/main/res/layout/review_banner_view.xml
@@ -1,11 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<org.thoughtcrime.securesms.profiles.spoofing.ReviewBannerView xmlns:android="http://schemas.android.com/apk/res/android"
+<org.thoughtcrime.securesms.profiles.spoofing.ReviewBannerView
+    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:id="@+id/review_banner"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:minHeight="108dp">
+    android:orientation="vertical">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="108dp"
+        android:background="@color/signal_background_primary">
 
     <FrameLayout
         android:id="@+id/banner_icon_frame"
@@ -92,4 +99,12 @@
         app:layout_constraintStart_toStartOf="@id/banner_message"
         app:layout_constraintTop_toBottomOf="@id/banner_message" />
 
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="5dp"
+        android:background="@drawable/toolbar_shadow"
+        app:layout_constraintBottom_toBottomOf="parent"/>
+
 </org.thoughtcrime.securesms.profiles.spoofing.ReviewBannerView>
\ No newline at end of file