diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/LabeledSeparatorView.kt b/app/src/main/java/org/thoughtcrime/securesms/components/LabeledSeparatorView.kt
deleted file mode 100644
index df36719db2..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/components/LabeledSeparatorView.kt
+++ /dev/null
@@ -1,70 +0,0 @@
-package org.thoughtcrime.securesms.components
-
-import android.content.Context
-import android.graphics.Canvas
-import android.graphics.Paint
-import android.graphics.Path
-import android.util.AttributeSet
-import android.view.LayoutInflater
-import android.widget.RelativeLayout
-import network.loki.messenger.R
-import network.loki.messenger.databinding.ViewSeparatorBinding
-import org.thoughtcrime.securesms.util.toPx
-import org.session.libsession.utilities.ThemeUtil
-
-class LabeledSeparatorView : RelativeLayout {
-
-    private lateinit var binding: ViewSeparatorBinding
-    private val path = Path()
-
-    private val paint: Paint by lazy {
-        val result = Paint()
-        result.style = Paint.Style.STROKE
-        result.color = ThemeUtil.getThemedColor(context, R.attr.dividerHorizontal)
-        result.strokeWidth = toPx(1, resources).toFloat()
-        result.isAntiAlias = true
-        result
-    }
-
-    // region Lifecycle
-    constructor(context: Context) : super(context) {
-        setUpViewHierarchy()
-    }
-
-    constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {
-        setUpViewHierarchy()
-    }
-
-    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {
-        setUpViewHierarchy()
-    }
-
-    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(context, attrs, defStyleAttr, defStyleRes) {
-        setUpViewHierarchy()
-    }
-
-    private fun setUpViewHierarchy() {
-        binding = ViewSeparatorBinding.inflate(LayoutInflater.from(context))
-        val layoutParams = LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)
-        addView(binding.root, layoutParams)
-        setWillNotDraw(false)
-    }
-    // endregion
-
-    // region Updating
-    override fun onDraw(c: Canvas) {
-        super.onDraw(c)
-        val w = width.toFloat()
-        val h = height.toFloat()
-        val hMargin = toPx(16, resources).toFloat()
-        path.reset()
-        path.moveTo(0.0f, h / 2)
-        path.lineTo(binding.titleTextView.left - hMargin, h / 2)
-        path.addRoundRect(binding.titleTextView.left - hMargin, toPx(1, resources).toFloat(), binding.titleTextView.right + hMargin, h - toPx(1, resources).toFloat(), h / 2, h / 2, Path.Direction.CCW)
-        path.moveTo(binding.titleTextView.right + hMargin, h / 2)
-        path.lineTo(w, h / 2)
-        path.close()
-        c.drawPath(path, paint)
-    }
-    // endregion
-}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/view_separator.xml b/app/src/main/res/drawable/view_separator.xml
new file mode 100644
index 0000000000..27dd4bc967
--- /dev/null
+++ b/app/src/main/res/drawable/view_separator.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <stroke android:color="?colorDividerBackground" android:width="1dp"/>
+    <corners android:radius="16dp"/>
+    <solid android:color="?colorPrimary"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 72c7e655fd..023096e4d4 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -61,7 +61,7 @@
 
             </RelativeLayout>
 
-            <org.thoughtcrime.securesms.components.LabeledSeparatorView
+            <include layout="@layout/view_separator"
                 android:id="@+id/separatorView"
                 android:layout_width="match_parent"
                 android:layout_height="32dp"
diff --git a/app/src/main/res/layout/fragment_enter_public_key.xml b/app/src/main/res/layout/fragment_enter_public_key.xml
index 0c254c5ca2..7549ee186d 100644
--- a/app/src/main/res/layout/fragment_enter_public_key.xml
+++ b/app/src/main/res/layout/fragment_enter_public_key.xml
@@ -70,7 +70,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/promptTextView">
 
-                <org.thoughtcrime.securesms.components.LabeledSeparatorView
+                <include layout="@layout/view_separator"
                     android:id="@+id/separatorView"
                     android:layout_width="match_parent"
                     android:layout_height="32dp"
diff --git a/app/src/main/res/layout/view_separator.xml b/app/src/main/res/layout/view_separator.xml
index 2b808a6c82..aca7f26d23 100644
--- a/app/src/main/res/layout/view_separator.xml
+++ b/app/src/main/res/layout/view_separator.xml
@@ -1,17 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="wrap_content">
 
-    <TextView
-        android:id="@+id/titleTextView"
+    <View
+        android:layout_gravity="center"
+        android:background="?colorDividerBackground"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"/>
+
+    <FrameLayout
+        android:layout_gravity="center"
+        android:background="@drawable/view_separator"
+        android:paddingTop="4dp"
+        android:paddingBottom="4dp"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:gravity="center"
-        android:textColor="?android:textColorTertiary"
-        android:textSize="@dimen/small_font_size"
-        android:text="@string/your_session_id" />
+        android:layout_height="wrap_content">
 
-</RelativeLayout>
\ No newline at end of file
+        <TextView
+            android:id="@+id/titleTextView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:textColor="?android:textColorTertiary"
+            android:textSize="@dimen/small_font_size"
+            android:text="@string/your_session_id" />
+    </FrameLayout>
+
+</FrameLayout>
\ No newline at end of file