diff --git a/app-tracking-protection/vpn-impl/src/main/res/layout/activity_report_breakage_category_single_choice.xml b/app-tracking-protection/vpn-impl/src/main/res/layout/activity_report_breakage_category_single_choice.xml
index fbaa11d72ccf..0ddf557a0cc5 100644
--- a/app-tracking-protection/vpn-impl/src/main/res/layout/activity_report_breakage_category_single_choice.xml
+++ b/app-tracking-protection/vpn-impl/src/main/res/layout/activity_report_breakage_category_single_choice.xml
@@ -41,7 +41,7 @@
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/textInputLayout"
-                style="@style/FeedbackInputBoxStyle"
+                style="@style/TextInputBoxStyle"
                 android:layout_width="match_parent"
                 android:layout_height="60dp"
                 android:layout_marginStart="25dp"
@@ -92,7 +92,7 @@
 
                 <com.google.android.material.textfield.TextInputLayout
                     android:id="@+id/appBreakageFormFeedbackContainer"
-                    style="@style/FeedbackInputBoxStyle"
+                    style="@style/TextInputBoxStyle"
                     android:layout_width="match_parent"
                     android:layout_height="140dp"
                     android:layout_marginTop="@dimen/keyline_2"
@@ -105,7 +105,7 @@
 
                     <com.google.android.material.textfield.TextInputEditText
                         android:id="@+id/appBreakageFormFeedbackInput"
-                        style="@style/FeedbackEditTextInputStyle"
+                        style="@style/TextInputStyle"
                         android:gravity="top" />
 
                 </com.google.android.material.textfield.TextInputLayout>
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/brokensite/BrokenSiteNegativeFeedbackFragment.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/brokensite/BrokenSiteNegativeFeedbackFragment.kt
index 11ccc19c4bbb..325df4a4091f 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/brokensite/BrokenSiteNegativeFeedbackFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/brokensite/BrokenSiteNegativeFeedbackFragment.kt
@@ -60,13 +60,13 @@ class BrokenSiteNegativeFeedbackFragment : FeedbackFragment(R.layout.content_fee
     override fun configureListeners() {
         with(binding) {
             submitFeedbackButton.doOnNextLayout {
-                brokenSiteInput.setOnTouchListener(LayoutScrollingTouchListener(rootScrollView, brokenSiteInputContainer.y.toInt()))
-                openEndedFeedback.setOnTouchListener(LayoutScrollingTouchListener(rootScrollView, openEndedFeedbackContainer.y.toInt()))
+                brokenSiteInput.setOnTouchListener(LayoutScrollingTouchListener(rootScrollView, brokenSiteInput.y.toInt()))
+                openEndedFeedback.setOnTouchListener(LayoutScrollingTouchListener(rootScrollView, openEndedFeedback.y.toInt()))
             }
 
             submitFeedbackButton.setOnClickListener {
-                val feedback = openEndedFeedback.text.toString()
-                val brokenSite = brokenSiteInput.text.toString()
+                val feedback = openEndedFeedback.text
+                val brokenSite = brokenSiteInput.text
 
                 viewModel.userSubmittingFeedback(feedback, brokenSite)
             }
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/mainreason/MainReasonAdapter.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/mainreason/MainReasonAdapter.kt
index 195ec7c91ed3..a3196f38c9fb 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/mainreason/MainReasonAdapter.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/mainreason/MainReasonAdapter.kt
@@ -21,8 +21,8 @@ import android.view.ViewGroup
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
-import com.duckduckgo.app.browser.databinding.ItemFeedbackReasonBinding
 import com.duckduckgo.app.feedback.ui.negative.FeedbackTypeDisplay.FeedbackTypeMainReasonDisplay
+import com.duckduckgo.mobile.android.databinding.RowOneLineListItemBinding
 
 class MainReasonAdapter(private val itemClickListener: (FeedbackTypeMainReasonDisplay) -> Unit) :
     ListAdapter<FeedbackTypeMainReasonDisplay, MainReasonAdapter.ViewHolder>(DiffCallback()) {
@@ -48,7 +48,7 @@ class MainReasonAdapter(private val itemClickListener: (FeedbackTypeMainReasonDi
         viewType: Int,
     ): ViewHolder {
         val inflater = LayoutInflater.from(parent.context)
-        val binding = ItemFeedbackReasonBinding.inflate(inflater, parent, false)
+        val binding = RowOneLineListItemBinding.inflate(inflater, parent, false)
         return ViewHolder(binding)
     }
 
@@ -59,14 +59,16 @@ class MainReasonAdapter(private val itemClickListener: (FeedbackTypeMainReasonDi
         holder.bind(getItem(position), itemClickListener)
     }
 
-    data class ViewHolder(val binding: ItemFeedbackReasonBinding) : RecyclerView.ViewHolder(binding.root) {
+    data class ViewHolder(val binding: RowOneLineListItemBinding) : RecyclerView.ViewHolder(binding.root) {
 
         fun bind(
             reason: FeedbackTypeMainReasonDisplay,
             clickListener: (FeedbackTypeMainReasonDisplay) -> Unit,
         ) {
-            binding.reason.text = binding.root.context.getString(reason.listDisplayResId)
-            binding.root.setOnClickListener { clickListener(reason) }
+            val listItem = binding.root
+            listItem.hideLeadingIcon()
+            listItem.setPrimaryText(binding.root.context.getString(reason.listDisplayResId))
+            listItem.setOnClickListener { clickListener(reason) }
         }
     }
 }
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/mainreason/MainReasonNegativeFeedbackFragment.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/mainreason/MainReasonNegativeFeedbackFragment.kt
index 0ac623ee67ea..eeefa324d0bb 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/mainreason/MainReasonNegativeFeedbackFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/mainreason/MainReasonNegativeFeedbackFragment.kt
@@ -17,13 +17,11 @@
 package com.duckduckgo.app.feedback.ui.negative.mainreason
 
 import android.os.Bundle
-import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.duckduckgo.anvil.annotations.InjectWith
 import com.duckduckgo.app.browser.R
 import com.duckduckgo.app.browser.databinding.ContentFeedbackNegativeDisambiguationMainReasonBinding
 import com.duckduckgo.app.feedback.ui.common.FeedbackFragment
-import com.duckduckgo.app.feedback.ui.common.FeedbackItemDecoration
 import com.duckduckgo.app.feedback.ui.negative.FeedbackType.MainReason
 import com.duckduckgo.app.feedback.ui.negative.FeedbackTypeDisplay
 import com.duckduckgo.app.feedback.ui.negative.FeedbackTypeDisplay.FeedbackTypeMainReasonDisplay
@@ -58,7 +56,6 @@ class MainReasonNegativeFeedbackFragment : FeedbackFragment(R.layout.content_fee
         activity?.let {
             binding.recyclerView.layoutManager = LinearLayoutManager(it)
             binding.recyclerView.adapter = recyclerAdapter
-            binding.recyclerView.addItemDecoration(FeedbackItemDecoration(ContextCompat.getDrawable(it, R.drawable.feedback_list_divider)!!))
 
             val listValues = getMainReasonsDisplayText()
             recyclerAdapter.submitList(listValues)
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedFeedbackFragment.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedFeedbackFragment.kt
index 40b08184f876..fb00acee2bf1 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedFeedbackFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedFeedbackFragment.kt
@@ -92,7 +92,7 @@ class ShareOpenEndedFeedbackFragment : FeedbackFragment(R.layout.content_feedbac
     private fun updateDisplayForPositiveFeedback() {
         binding.title.text = getString(R.string.feedbackShareDetails)
         binding.subtitle.text = getString(R.string.sharePositiveFeedbackWithTheTeam)
-        binding.openEndedFeedbackContainer.hint = getString(R.string.whatHaveYouBeenEnjoying)
+        binding.openEndedFeedback.hint = getString(R.string.whatHaveYouBeenEnjoying)
         binding.emoticonImage.setImageResource(R.drawable.ic_happy_face)
     }
 
@@ -102,7 +102,7 @@ class ShareOpenEndedFeedbackFragment : FeedbackFragment(R.layout.content_feedbac
 
         binding.title.text = getDisplayText(mainReason!!)
         binding.subtitle.text = getDisplayText(subReason)
-        binding.openEndedFeedbackContainer.hint = getInputHintText(mainReason!!)
+        binding.openEndedFeedback.hint = getInputHintText(mainReason!!)
         binding.emoticonImage.setImageResource(R.drawable.ic_sad_face)
     }
 
@@ -127,7 +127,7 @@ class ShareOpenEndedFeedbackFragment : FeedbackFragment(R.layout.content_feedbac
     override fun configureListeners() {
         with(binding) {
             rootScrollView.doOnNextLayout {
-                binding.openEndedFeedback.setOnTouchListener(LayoutScrollingTouchListener(rootScrollView, openEndedFeedbackContainer.y.toInt()))
+                binding.openEndedFeedback.setOnTouchListener(LayoutScrollingTouchListener(rootScrollView, openEndedFeedback.y.toInt()))
             }
 
             submitFeedbackButton.setOnClickListener {
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/subreason/SubReasonAdapter.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/subreason/SubReasonAdapter.kt
index ca438915d01f..bcf55e3c6e33 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/subreason/SubReasonAdapter.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/subreason/SubReasonAdapter.kt
@@ -21,8 +21,8 @@ import android.view.ViewGroup
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
-import com.duckduckgo.app.browser.databinding.ItemFeedbackReasonBinding
 import com.duckduckgo.app.feedback.ui.negative.FeedbackTypeDisplay.FeedbackTypeSubReasonDisplay
+import com.duckduckgo.mobile.android.databinding.RowOneLineListItemBinding
 
 class SubReasonAdapter(private val itemClickListener: (FeedbackTypeSubReasonDisplay) -> Unit) :
     ListAdapter<FeedbackTypeSubReasonDisplay, SubReasonAdapter.ViewHolder>(DiffCallback()) {
@@ -48,7 +48,7 @@ class SubReasonAdapter(private val itemClickListener: (FeedbackTypeSubReasonDisp
         viewType: Int,
     ): ViewHolder {
         val inflater = LayoutInflater.from(parent.context)
-        val binding = ItemFeedbackReasonBinding.inflate(inflater, parent, false)
+        val binding = RowOneLineListItemBinding.inflate(inflater, parent, false)
         return ViewHolder(binding)
     }
 
@@ -59,14 +59,16 @@ class SubReasonAdapter(private val itemClickListener: (FeedbackTypeSubReasonDisp
         holder.bind(getItem(position), itemClickListener)
     }
 
-    data class ViewHolder(val binding: ItemFeedbackReasonBinding) : RecyclerView.ViewHolder(binding.root) {
+    data class ViewHolder(val binding: RowOneLineListItemBinding) : RecyclerView.ViewHolder(binding.root) {
 
         fun bind(
             reason: FeedbackTypeSubReasonDisplay,
             clickListener: (FeedbackTypeSubReasonDisplay) -> Unit,
         ) {
-            binding.reason.text = binding.root.context.getString(reason.listDisplayResId)
-            binding.root.setOnClickListener { clickListener(reason) }
+            val listItem = binding.root
+            listItem.hideLeadingIcon()
+            listItem.setPrimaryText(binding.root.context.getString(reason.listDisplayResId))
+            listItem.setOnClickListener { clickListener(reason) }
         }
     }
 }
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/subreason/SubReasonNegativeFeedbackFragment.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/subreason/SubReasonNegativeFeedbackFragment.kt
index a9a7042f7ccc..89bc8a097504 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/subreason/SubReasonNegativeFeedbackFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/subreason/SubReasonNegativeFeedbackFragment.kt
@@ -17,13 +17,11 @@
 package com.duckduckgo.app.feedback.ui.negative.subreason
 
 import android.os.Bundle
-import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.duckduckgo.anvil.annotations.InjectWith
 import com.duckduckgo.app.browser.R
 import com.duckduckgo.app.browser.databinding.ContentFeedbackNegativeDisambiguationSubReasonBinding
 import com.duckduckgo.app.feedback.ui.common.FeedbackFragment
-import com.duckduckgo.app.feedback.ui.common.FeedbackItemDecoration
 import com.duckduckgo.app.feedback.ui.negative.FeedbackType.*
 import com.duckduckgo.app.feedback.ui.negative.FeedbackType.MainReason.*
 import com.duckduckgo.app.feedback.ui.negative.FeedbackTypeDisplay
@@ -94,7 +92,6 @@ class SubReasonNegativeFeedbackFragment : FeedbackFragment(R.layout.content_feed
         activity?.let {
             binding.recyclerView.layoutManager = LinearLayoutManager(it)
             binding.recyclerView.adapter = recyclerAdapter
-            binding.recyclerView.addItemDecoration(FeedbackItemDecoration(ContextCompat.getDrawable(it, R.drawable.feedback_list_divider)!!))
 
             arguments?.let { args ->
 
diff --git a/app/src/main/res/drawable/feedback_list_divider.xml b/app/src/main/res/drawable/feedback_list_divider.xml
deleted file mode 100644
index d527681d96fc..000000000000
--- a/app/src/main/res/drawable/feedback_list_divider.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2019 DuckDuckGo
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <size
-        android:width="1dp"
-        android:height="1dp" />
-
-    <solid android:color="?feedbackListItemSeparatorColor" />
-
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/content_feedback.xml b/app/src/main/res/layout/content_feedback.xml
index 575922dd45db..f516a6f89d24 100644
--- a/app/src/main/res/layout/content_feedback.xml
+++ b/app/src/main/res/layout/content_feedback.xml
@@ -18,28 +18,39 @@
 
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_height="match_parent"
-    android:layout_width="match_parent"
     xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:fillViewport="true">
 
-    <androidx.constraintlayout.widget.ConstraintLayout style="@style/FeedbackFragmentStyle">
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
 
-        <TextView
+        <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
             android:id="@+id/title"
-            style="@style/FeedbackTitle.FeedbackHappySadDisambiguationTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/keyline_4"
+            android:text="@string/feedbackInitialDisambiguationTitle"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            android:text="@string/feedbackInitialDisambiguationTitle"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            app:typography="h1" />
 
-        <TextView
+        <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
             android:id="@+id/subtitle"
-            style="@style/FeedbackTitle.FeedbackSubtitle.FeedbackHappySadDisambiguationSubtitle"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/keyline_5"
+            android:layout_marginTop="@dimen/keyline_2"
+            android:layout_marginEnd="@dimen/keyline_5"
             android:text="@string/feedbackInitialDisambiguationSubtitle"
+            android:textAlignment="center"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/title" />
+            app:layout_constraintTop_toBottomOf="@id/title"
+            app:typography="body1" />
 
         <ImageView
             android:id="@+id/positiveFeedbackButton"
@@ -50,36 +61,35 @@
             android:clickable="true"
             android:contentDescription="@string/feedbackInitialDisambiguationHappyButtonContentDescription"
             android:focusable="true"
-            tools:src="@drawable/button_happy_light_theme"
             app:layout_constraintEnd_toStartOf="@id/negativeFeedbackButton"
             app:layout_constraintHorizontal_chainStyle="packed"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/subtitle" />
+            app:layout_constraintTop_toBottomOf="@id/subtitle"
+            tools:src="@drawable/button_happy_light_theme" />
 
         <ImageView
             android:id="@+id/negativeFeedbackButton"
             android:layout_width="100dp"
             android:layout_height="100dp"
+            android:layout_marginStart="28dp"
             android:background="?attr/selectableItemBackgroundBorderless"
             android:contentDescription="@string/feedbackInitialDisambiguationSadButtonContentDescription"
-            tools:src="@drawable/button_sad_light_theme"
-            android:layout_marginStart="28dp"
             app:layout_constraintBottom_toBottomOf="@id/positiveFeedbackButton"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/positiveFeedbackButton"
-            app:layout_constraintTop_toTopOf="@id/positiveFeedbackButton" />
+            app:layout_constraintTop_toTopOf="@id/positiveFeedbackButton"
+            tools:src="@drawable/button_sad_light_theme" />
 
-        <TextView
+        <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="26dp"
-            android:fontFamily="sans-serif-medium"
+            android:layout_marginBottom="@dimen/keyline_5"
             android:text="@string/feedbackIsImportantToUs"
-            android:textColor="?attr/feedbackAnonymousFeedbackLabelColor"
-            android:textSize="14sp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
+            app:layout_constraintStart_toStartOf="parent"
+            app:textType="secondary"
+            app:typography="caption" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/content_feedback_negative_broken_site_feedback.xml b/app/src/main/res/layout/content_feedback_negative_broken_site_feedback.xml
index 47c366a98412..46a6da7cf2f0 100644
--- a/app/src/main/res/layout/content_feedback_negative_broken_site_feedback.xml
+++ b/app/src/main/res/layout/content_feedback_negative_broken_site_feedback.xml
@@ -18,102 +18,94 @@
 
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:toots="http://schemas.android.com/tools"
+    android:id="@+id/rootScrollView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:id="@+id/rootScrollView"
     android:fillViewport="true">
 
-    <androidx.constraintlayout.widget.ConstraintLayout style="@style/FeedbackFragmentStyle">
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
 
         <ImageView
             android:id="@+id/emoticonImage"
             android:layout_width="48dp"
             android:layout_height="48dp"
-            android:layout_marginTop="@dimen/feedbackTitleMarginTop"
+            android:layout_marginTop="@dimen/keyline_4"
             android:importantForAccessibility="no"
             android:src="@drawable/ic_sad_face"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <TextView
+        <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
             android:id="@+id/title"
-            style="@style/FeedbackTitle"
-            android:layout_marginTop="12dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/keyline_4"
             android:text="@string/websiteNotLoadingTitleLong"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/emoticonImage" />
+            app:layout_constraintTop_toBottomOf="@id/emoticonImage"
+            app:typography="h1" />
 
-        <TextView
+        <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
             android:id="@+id/subtitle"
-            style="@style/FeedbackTitle.FeedbackSubtitle"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/keyline_5"
+            android:layout_marginTop="@dimen/keyline_2"
+            android:layout_marginEnd="@dimen/keyline_5"
             android:text="@string/whichBrokenSites"
+            android:textAlignment="center"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/title" />
+            app:layout_constraintTop_toBottomOf="@id/title"
+            app:typography="body1" />
 
-        <com.google.android.material.textfield.TextInputLayout
-            android:id="@+id/brokenSiteInputContainer"
-            style="@style/FeedbackInputBoxStyle"
+        <com.duckduckgo.mobile.android.ui.view.text.DaxTextInput
+            android:id="@+id/brokenSiteInput"
             android:layout_width="0dp"
-            android:layout_height="70dp"
+            android:layout_height="wrap_content"
             android:layout_marginStart="20dp"
             android:layout_marginTop="65dp"
             android:layout_marginEnd="20dp"
             android:hint="@string/whichBrokenSitesHint"
-            app:hintTextAppearance="@android:style/TextAppearance"
             app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHeight_max="140dp"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/subtitle">
-
-            <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/brokenSiteInput"
-                style="@style/FeedbackEditTextInputStyle"
-                android:gravity="center_vertical"
-                android:inputType="textUri|textNoSuggestions"
-                android:paddingBottom="20dp"
-                toots:text="https://example.com" />
+            app:layout_constraintTop_toBottomOf="@id/subtitle"
+            app:type="multi_line" />
 
-        </com.google.android.material.textfield.TextInputLayout>
-
-        <com.google.android.material.textfield.TextInputLayout
-            android:id="@+id/openEndedFeedbackContainer"
-            style="@style/FeedbackInputBoxStyle"
+        <com.duckduckgo.mobile.android.ui.view.text.DaxTextInput
+            android:id="@+id/openEndedFeedback"
             android:layout_width="0dp"
-            android:layout_height="140dp"
+            android:layout_height="wrap_content"
             android:layout_marginStart="20dp"
-            android:layout_marginTop="16dp"
+            android:layout_marginTop="@dimen/keyline_4"
             android:layout_marginEnd="20dp"
             android:hint="@string/openEndedInputHint"
-            app:hintTextAppearance="@android:style/TextAppearance"
             app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHeight_max="140dp"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/brokenSiteInputContainer">
-
-            <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/openEndedFeedback"
-                style="@style/FeedbackEditTextInputStyle"
-                android:nextFocusDown="@string/submitFeedback" />
-
-        </com.google.android.material.textfield.TextInputLayout>
+            app:layout_constraintTop_toBottomOf="@id/brokenSiteInput"
+            app:type="multi_line" />
 
-        <com.duckduckgo.mobile.android.ui.view.button.ButtonPrimaryLarge
+        <com.duckduckgo.mobile.android.ui.view.button.DaxButtonPrimary
             android:id="@+id/submitFeedbackButton"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="20dp"
-            android:layout_marginEnd="20dp"
             android:layout_marginTop="20dp"
+            android:layout_marginEnd="20dp"
             android:layout_marginBottom="10dp"
             android:text="@string/submitFeedback"
+            app:buttonSize="large"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/openEndedFeedbackContainer"
+            app:layout_constraintTop_toBottomOf="@id/openEndedFeedback"
             app:layout_constraintVertical_bias="0.9" />
 
-
     </androidx.constraintlayout.widget.ConstraintLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/content_feedback_negative_disambiguation_main_reason.xml b/app/src/main/res/layout/content_feedback_negative_disambiguation_main_reason.xml
index a32a2d15a811..0b21284d3d4f 100644
--- a/app/src/main/res/layout/content_feedback_negative_disambiguation_main_reason.xml
+++ b/app/src/main/res/layout/content_feedback_negative_disambiguation_main_reason.xml
@@ -20,52 +20,64 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:tools="http://schemas.android.com/tools"
     android:fillViewport="true">
 
-    <androidx.constraintlayout.widget.ConstraintLayout style="@style/FeedbackFragmentStyle">
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
 
         <ImageView
             android:id="@+id/emoticonImage"
             android:layout_width="48dp"
             android:layout_height="48dp"
-            android:layout_marginTop="@dimen/feedbackTitleMarginTop"
+            android:layout_marginTop="@dimen/keyline_4"
             android:importantForAccessibility="no"
             android:src="@drawable/ic_sad_face"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <TextView
+        <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
             android:id="@+id/title"
-            style="@style/FeedbackTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/keyline_4"
             android:text="@string/feedbackNegativeMainReasonPageTitle"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/emoticonImage" />
+            app:layout_constraintTop_toBottomOf="@id/emoticonImage"
+            app:typography="h1" />
 
-        <TextView
+        <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
             android:id="@+id/subtitle"
-            style="@style/FeedbackTitle.FeedbackSubtitle"
-            android:layout_marginTop="5dp"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/keyline_5"
+            android:layout_marginTop="@dimen/keyline_2"
+            android:layout_marginEnd="@dimen/keyline_5"
             android:text="@string/feedbackNegativeMainReasonPageSubtitle"
+            android:textAlignment="center"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/title" />
+            app:layout_constraintTop_toBottomOf="@id/title"
+            app:typography="body1" />
+
+        <com.duckduckgo.mobile.android.ui.view.divider.HorizontalDivider
+            android:id="@+id/divider"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/keyline_4"
+            app:layout_constraintTop_toBottomOf="@id/subtitle" />
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
-            android:layout_marginTop="@dimen/feedbackTitleMarginTop"
+            android:layout_height="wrap_content"
             android:clipToPadding="false"
-            tools:itemCount="6"
-            tools:listitem="@layout/item_feedback_reason"
-            app:layout_constraintTop_toBottomOf="@id/subtitle"
             android:paddingBottom="2dp"
-            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            android:layout_height="wrap_content" />
-
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/divider" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/content_feedback_negative_disambiguation_sub_reason.xml b/app/src/main/res/layout/content_feedback_negative_disambiguation_sub_reason.xml
index 75917a9a2c17..94eb367cc64f 100644
--- a/app/src/main/res/layout/content_feedback_negative_disambiguation_sub_reason.xml
+++ b/app/src/main/res/layout/content_feedback_negative_disambiguation_sub_reason.xml
@@ -18,56 +18,67 @@
 
 <ScrollView 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"
-    xmlns:tools="http://schemas.android.com/tools"
     android:fillViewport="true">
 
-    <androidx.constraintlayout.widget.ConstraintLayout style="@style/FeedbackFragmentStyle">
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
 
         <ImageView
             android:id="@+id/emoticonImage"
             android:layout_width="48dp"
             android:layout_height="48dp"
-            android:layout_marginTop="@dimen/feedbackTitleMarginTop"
+            android:layout_marginTop="@dimen/keyline_4"
             android:importantForAccessibility="no"
             android:src="@drawable/ic_sad_face"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <TextView
+        <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
             android:id="@+id/title"
-            android:layout_marginTop="12dp"
-            style="@style/FeedbackTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/keyline_4"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/emoticonImage"
+            app:typography="h1"
             tools:text="Issue title shortform" />
 
-        <TextView
+        <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
             android:id="@+id/subtitle"
-            android:layout_marginTop="5dp"
-            tools:text="Which XXX feature can we improve or add?"
-            style="@style/FeedbackTitle.FeedbackSubtitle"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/keyline_5"
+            android:layout_marginTop="@dimen/keyline_2"
+            android:layout_marginEnd="@dimen/keyline_5"
+            android:textAlignment="center"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/title" />
+            app:layout_constraintTop_toBottomOf="@id/title"
+            app:typography="body1"
+            tools:text="Which XXX feature can we improve or add?" />
 
+        <com.duckduckgo.mobile.android.ui.view.divider.HorizontalDivider
+            android:id="@+id/divider"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/keyline_4"
+            app:layout_constraintTop_toBottomOf="@id/subtitle" />
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
-            android:layout_marginTop="@dimen/feedbackTitleMarginTop"
-            app:layout_constraintTop_toBottomOf="@id/subtitle"
+            android:layout_height="wrap_content"
             android:clipToPadding="false"
             android:paddingBottom="2dp"
-            tools:itemCount="6"
-            tools:listitem="@layout/item_feedback_reason"
-            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            android:layout_height="wrap_content" />
-
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/divider" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/content_feedback_open_ended_feedback.xml b/app/src/main/res/layout/content_feedback_open_ended_feedback.xml
index e7b24dec7dad..c5753486950e 100644
--- a/app/src/main/res/layout/content_feedback_open_ended_feedback.xml
+++ b/app/src/main/res/layout/content_feedback_open_ended_feedback.xml
@@ -19,77 +19,80 @@
 <ScrollView 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/rootScrollView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:id="@+id/rootScrollView"
     android:fillViewport="true">
 
-    <androidx.constraintlayout.widget.ConstraintLayout style="@style/FeedbackFragmentStyle">
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
 
         <ImageView
             android:id="@+id/emoticonImage"
             android:layout_width="48dp"
             android:layout_height="48dp"
-            android:layout_marginTop="@dimen/feedbackTitleMarginTop"
+            android:layout_marginTop="@dimen/keyline_4"
             android:importantForAccessibility="no"
-            tools:src="@drawable/ic_sad_face"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            tools:src="@drawable/ic_sad_face" />
 
-        <TextView
+        <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
             android:id="@+id/title"
-            android:layout_marginTop="12dp"
-            style="@style/FeedbackTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/keyline_4"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/emoticonImage"
+            app:typography="h1"
             tools:text="Issue title shortform" />
 
-        <TextView
+        <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
             android:id="@+id/subtitle"
-            style="@style/FeedbackTitle.FeedbackSubtitle"
-            android:layout_marginTop="5dp"
-            tools:text="Which feature can we improve or add?"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/keyline_5"
+            android:layout_marginTop="@dimen/keyline_2"
+            android:layout_marginEnd="@dimen/keyline_5"
+            android:textAlignment="center"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/title" />
+            app:layout_constraintTop_toBottomOf="@id/title"
+            app:typography="body1"
+            tools:text="Which feature can we improve or add?" />
 
-        <com.google.android.material.textfield.TextInputLayout
-            android:id="@+id/openEndedFeedbackContainer"
-            style="@style/FeedbackInputBoxStyle"
+        <com.duckduckgo.mobile.android.ui.view.text.DaxTextInput
+            android:id="@+id/openEndedFeedback"
             android:layout_width="0dp"
-            android:layout_height="140dp"
+            android:layout_height="wrap_content"
             android:layout_marginStart="20dp"
             android:layout_marginTop="@dimen/feedbackTitleMarginTop"
             android:layout_marginEnd="20dp"
             android:hint="@string/openEndedInputHint"
-            app:hintTextAppearance="@android:style/TextAppearance"
             app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHeight_max="140dp"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/subtitle">
+            app:layout_constraintTop_toBottomOf="@id/subtitle"
+            app:type="multi_line" />
 
-            <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/openEndedFeedback"
-                style="@style/FeedbackEditTextInputStyle"
-                android:gravity="top" />
-
-        </com.google.android.material.textfield.TextInputLayout>
-
-        <com.duckduckgo.mobile.android.ui.view.button.ButtonPrimaryLarge
+        <com.duckduckgo.mobile.android.ui.view.button.DaxButtonPrimary
             android:id="@+id/submitFeedbackButton"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="20dp"
-            android:layout_marginEnd="20dp"
             android:layout_marginTop="20dp"
-            android:text="@string/submitFeedback"
+            android:layout_marginEnd="20dp"
             android:layout_marginBottom="10dp"
+            android:text="@string/submitFeedback"
+            app:buttonSize="large"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintVertical_bias="0.9"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/openEndedFeedbackContainer" />
+            app:layout_constraintTop_toBottomOf="@id/openEndedFeedback"
+            app:layout_constraintVertical_bias="0.9" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/content_feedback_positive_landing.xml b/app/src/main/res/layout/content_feedback_positive_landing.xml
index 10943d335fb2..98185160a7b0 100644
--- a/app/src/main/res/layout/content_feedback_positive_landing.xml
+++ b/app/src/main/res/layout/content_feedback_positive_landing.xml
@@ -22,81 +22,83 @@
     android:layout_height="match_parent"
     android:fillViewport="true">
 
-    <androidx.constraintlayout.widget.ConstraintLayout style="@style/FeedbackFragmentStyle">
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
 
         <ImageView
             android:id="@+id/emoticonImage"
             android:layout_width="48dp"
             android:layout_height="48dp"
-            android:layout_marginTop="@dimen/feedbackTitleMarginTop"
+            android:layout_marginTop="@dimen/keyline_4"
             android:importantForAccessibility="no"
             android:src="@drawable/ic_happy_face"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <TextView
+        <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
             android:id="@+id/title"
-            style="@style/FeedbackTitle"
-            android:layout_marginTop="12dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/keyline_4"
             android:text="@string/awesomeToHear"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/emoticonImage" />
+            app:layout_constraintTop_toBottomOf="@id/emoticonImage"
+            app:typography="h1" />
 
-        <TextView
+        <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
             android:id="@+id/subtitle"
-            style="@style/FeedbackTitle.FeedbackSubtitle"
-            android:layout_marginTop="5dp"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/keyline_5"
+            android:layout_marginTop="@dimen/keyline_2"
+            android:layout_marginEnd="@dimen/keyline_5"
             android:text="@string/shareTheLoveWithARating"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/title" />
+            app:layout_constraintTop_toBottomOf="@id/title"
+            app:typography="body1" />
 
-        <androidx.constraintlayout.widget.Guideline
-            android:id="@+id/guideline"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintGuide_percent="0.5"
-            app:layout_constraintTop_toBottomOf="@id/subtitle" />
-
-        <com.duckduckgo.mobile.android.ui.view.button.ButtonPrimaryLarge
+        <com.duckduckgo.mobile.android.ui.view.button.DaxButtonPrimary
             android:id="@+id/rateAppButton"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="20dp"
-            android:layout_marginEnd="20dp"
+            android:layout_marginStart="@dimen/keyline_4"
+            android:layout_marginEnd="@dimen/keyline_4"
+            android:layout_marginBottom="6dp"
             android:text="@string/rateTheApp"
+            app:buttonSize="large"
             app:layout_constraintBottom_toTopOf="@id/shareFeedbackButton"
-            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/guideline" />
+            app:layout_constraintStart_toStartOf="parent" />
 
-        <com.duckduckgo.mobile.android.ui.view.button.ButtonSecondaryLarge
+        <com.duckduckgo.mobile.android.ui.view.button.DaxButtonSecondary
             android:id="@+id/shareFeedbackButton"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="20dp"
-            android:layout_marginEnd="20dp"
-            android:layout_marginTop="18dp"
+            android:layout_marginStart="@dimen/keyline_4"
+            android:layout_marginEnd="@dimen/keyline_4"
+            android:layout_marginBottom="6dp"
             android:text="@string/feedbackShareDetails"
-            app:layout_constraintStart_toStartOf="parent"
+            app:buttonSize="large"
+            app:layout_constraintBottom_toTopOf="@id/cancelButton"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/rateAppButton" />
+            app:layout_constraintStart_toStartOf="parent" />
 
-        <com.duckduckgo.mobile.android.ui.view.button.ButtonGhostLarge
+        <com.duckduckgo.mobile.android.ui.view.button.DaxButtonGhost
             android:id="@+id/cancelButton"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="20dp"
-            android:layout_marginEnd="20dp"
+            android:layout_marginStart="@dimen/keyline_4"
+            android:layout_marginEnd="@dimen/keyline_4"
+            android:layout_marginBottom="18dp"
             android:text="@string/declineFurtherFeedback"
-            android:layout_marginTop="30dp"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/shareFeedbackButton"
-            app:layout_constraintEnd_toEndOf="parent" />
+            app:buttonSize="large"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/item_feedback_reason.xml b/app/src/main/res/layout/item_feedback_reason.xml
deleted file mode 100644
index 353cfc823e8a..000000000000
--- a/app/src/main/res/layout/item_feedback_reason.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2019 DuckDuckGo
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical">
-
-    <TextView
-        android:id="@+id/reason"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="?attr/feedbackListItemBackgroundColor"
-        android:foreground="?attr/selectableItemBackground"
-        android:paddingStart="22dp"
-        android:paddingEnd="22dp"
-        android:gravity="center_vertical"
-        android:minHeight="60dp"
-        tools:text="Browser features are missing or frustrating"
-        android:textColor="?attr/normalTextColor"
-        android:textSize="15sp" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/common-ui/src/main/java/com/duckduckgo/mobile/android/ui/view/listitem/OneLineListItem.kt b/common-ui/src/main/java/com/duckduckgo/mobile/android/ui/view/listitem/OneLineListItem.kt
index a1b865fac680..5961b318d43a 100644
--- a/common-ui/src/main/java/com/duckduckgo/mobile/android/ui/view/listitem/OneLineListItem.kt
+++ b/common-ui/src/main/java/com/duckduckgo/mobile/android/ui/view/listitem/OneLineListItem.kt
@@ -117,6 +117,9 @@ class OneLineListItem @JvmOverloads constructor(
         binding.leadingIconBackground.show()
     }
 
+    /** Sets visibility of the item image resource to GONE */
+    fun hideLeadingIcon() = binding.leadingIconBackground.gone()
+
     fun leadingIcon() = binding.leadingIcon
 
     /** Sets the trailing icon image resource */
diff --git a/common-ui/src/main/java/com/duckduckgo/mobile/android/ui/view/text/DaxTextInput.kt b/common-ui/src/main/java/com/duckduckgo/mobile/android/ui/view/text/DaxTextInput.kt
index daf69cd7f565..21193ec7ae04 100644
--- a/common-ui/src/main/java/com/duckduckgo/mobile/android/ui/view/text/DaxTextInput.kt
+++ b/common-ui/src/main/java/com/duckduckgo/mobile/android/ui/view/text/DaxTextInput.kt
@@ -47,6 +47,7 @@ import com.google.android.material.textfield.TextInputLayout.END_ICON_NONE
 
 interface TextInput {
     var text: String
+    var hint: String
     var isEditable: Boolean
 
     fun addTextChangedListener(textWatcher: TextWatcher)
@@ -112,6 +113,12 @@ class DaxTextInput @JvmOverloads constructor(
             binding.internalEditText.setText(value)
         }
 
+    override var hint: String
+        get() = binding.internalEditText.text.toString()
+        set(value) {
+            binding.internalInputLayout.setHintWithoutAnimation(value)
+        }
+
     override var isEditable: Boolean
         get() = binding.internalEditText.isEnabled
         set(value) {
diff --git a/common-ui/src/main/res/values/styles.xml b/common-ui/src/main/res/values/styles.xml
index 258b6c87654a..6df73a879a17 100644
--- a/common-ui/src/main/res/values/styles.xml
+++ b/common-ui/src/main/res/values/styles.xml
@@ -148,17 +148,11 @@
         <item name="android:textAlignment">viewStart</item>
     </style>
 
-    <style name="FeedbackFragmentStyle">
-        <item name="android:background">?attr/colorPrimaryDark</item>
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">match_parent</item>
-    </style>
-
     <style name="TextInputEditTextTheme" parent="ThemeOverlay.MaterialComponents.TextInputEditText.OutlinedBox">
         <item name="android:colorControlActivated">@color/cornflowerBlue</item>
     </style>
 
-    <style name="FeedbackInputBoxStyle" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox">
+    <style name="TextInputBoxStyle" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox">
         <item name="boxStrokeColor">@color/cornflowerBlue</item>
         <item name="hintTextColor">@color/cornflowerBlue</item>
         <item name="android:textColorHint">?attr/feedbackEditTextHintColor</item>
@@ -166,7 +160,7 @@
         <item name="android:theme">@style/TextInputEditTextTheme</item>
     </style>
 
-    <style name="FeedbackEditTextInputStyle" parent="Widget.MaterialComponents.TextInputEditText.FilledBox">
+    <style name="TextInputStyle" parent="Widget.MaterialComponents.TextInputEditText.FilledBox">
         <item name="android:textSize">14sp</item>
         <item name="android:imeOptions">flagNoExtractUi</item>
         <item name="android:inputType">textLongMessage|textMultiLine</item>
@@ -177,44 +171,6 @@
         <item name="android:textColor">?attr/normalTextColor</item>
     </style>
 
-    <style name="FeedbackTitle">
-        <item name="android:layout_width">0dp</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_marginTop">12dp</item>
-        <item name="android:textAlignment">center</item>
-        <item name="android:fontFamily">sans-serif</item>
-        <item name="android:textStyle">bold</item>
-        <item name="android:textColor">?attr/normalTextColor</item>
-        <item name="android:layout_marginStart">10dp</item>
-        <item name="android:layout_marginEnd">10dp</item>
-        <item name="android:textSize">22sp</item>
-    </style>
-
-    <style name="FeedbackTitle.FeedbackSubtitle">
-        <item name="android:layout_width">0dp</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_marginTop">12dp</item>
-        <item name="android:textAlignment">center</item>
-        <item name="android:textStyle">normal</item>
-        <item name="android:layout_marginStart">10dp</item>
-        <item name="android:layout_marginEnd">10dp</item>
-        <item name="android:textColor">?attr/normalTextColor</item>
-        <item name="android:textSize">15sp</item>
-        <item name="layout_constraintWidth_percent">0.8</item>
-    </style>
-
-    <style name="FeedbackTitle.FeedbackHappySadDisambiguationTitle">
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_marginTop">@dimen/feedbackTitleMarginTop</item>
-        <item name="android:textColor">?attr/normalTextColor</item>
-    </style>
-
-    <style name="FeedbackTitle.FeedbackSubtitle.FeedbackHappySadDisambiguationSubtitle">
-        <item name="android:textStyle">normal</item>
-        <item name="android:layout_marginTop">9dp</item>
-    </style>
-
     <style name="EmailSignOutButton" parent="@style/Widget.MaterialComponents.Button.TextButton">
         <item name="android:textAllCaps">false</item>
         <item name="android:letterSpacing">0.0</item>