diff --git a/app/src/main/java/com/github/libretube/ui/adapters/CommentsAdapter.kt b/app/src/main/java/com/github/libretube/ui/adapters/CommentsAdapter.kt
index 9c3d480b4..df7d4e917 100644
--- a/app/src/main/java/com/github/libretube/ui/adapters/CommentsAdapter.kt
+++ b/app/src/main/java/com/github/libretube/ui/adapters/CommentsAdapter.kt
@@ -7,7 +7,6 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.ViewGroup.MarginLayoutParams
 import android.widget.Toast
-import androidx.core.content.ContextCompat
 import androidx.core.text.parseAsHtml
 import androidx.core.view.updateLayoutParams
 import androidx.fragment.app.Fragment
@@ -23,6 +22,7 @@ import com.github.libretube.util.ClipboardHelper
 import com.github.libretube.util.ImageHelper
 import com.github.libretube.util.NavigationHelper
 import com.github.libretube.util.TextUtils
+import com.github.libretube.util.ThemeHelper
 import kotlinx.serialization.json.Json
 
 class CommentsAdapter(
@@ -79,17 +79,12 @@ class CommentsAdapter(
 
                 if (position == 0) {
                     root.setBackgroundColor(
-                        ContextCompat.getColor(
-                            root.context,
-                            R.color.replies_original_comment_background
-                        )
+                        ThemeHelper.getThemeColor(root.context, R.attr.colorSurface)
                     )
                     root.updateLayoutParams<MarginLayoutParams> { bottomMargin = 40 }
-                    divider.visibility = View.VISIBLE
                 } else {
                     root.background = null
                     root.updateLayoutParams<MarginLayoutParams> { bottomMargin = 0 }
-                    divider.visibility = View.GONE
                 }
             }
 
diff --git a/app/src/main/res/layout/comments_row.xml b/app/src/main/res/layout/comments_row.xml
index 9ef69d288..cf8ed1e2a 100644
--- a/app/src/main/res/layout/comments_row.xml
+++ b/app/src/main/res/layout/comments_row.xml
@@ -14,7 +14,7 @@
         android:orientation="vertical"
         android:paddingStart="15dp"
         android:paddingEnd="15dp"
-        app:layout_constraintBottom_toTopOf="@id/divider"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
         <LinearLayout
@@ -50,7 +50,7 @@
                         android:ellipsize="end"
                         android:maxLines="2"
                         android:textSize="14sp"
-                        android:textColor="@color/text_color_secondary"
+                        android:textColor="?android:attr/textColorSecondary"
                         tools:text="Author and Time" />
 
                     <ImageView
@@ -133,11 +133,4 @@
         </LinearLayout>
 
     </LinearLayout>
-
-    <com.google.android.material.divider.MaterialDivider
-        android:id="@+id/divider"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/comments_sheet.xml b/app/src/main/res/layout/comments_sheet.xml
index ecf9a0357..197927b86 100644
--- a/app/src/main/res/layout/comments_sheet.xml
+++ b/app/src/main/res/layout/comments_sheet.xml
@@ -24,7 +24,7 @@
                 android:layout_height="20dp"
                 android:paddingTop="8dp"
                 android:paddingBottom="0dp"
-                app:tint="@color/drag_handle_color" />
+                app:tint="?android:attr/textColorSecondaryInverse" />
 
             <LinearLayout
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
deleted file mode 100644
index 6f15bd6cd..000000000
--- a/app/src/main/res/values-night/colors.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="text_color_secondary">#BFBFBF</color>
-    <color name="drag_handle_color">#3A3A3A</color>
-    <color name="replies_original_comment_background">#222222</color>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 4d70e9767..4886b7498 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -3,9 +3,6 @@
     <color name="duration_background_color">#AA000000</color>
     <color name="duration_text_color">#EEFFFFFF</color>
     <color name="shortcut_color">#0061A6</color>
-    <color name="text_color_secondary">#505050</color>
-    <color name="drag_handle_color">#CCCCCC</color>
-    <color name="replies_original_comment_background">#E8E8E8</color>
 
     <color name="blue_md_theme_light_primary">#0058CB</color>
     <color name="blue_md_theme_light_onPrimary">#FFFFFF</color>