diff --git a/app/src/main/res/layout/activity_accessibility_settings.xml b/app/src/main/res/layout/activity_accessibility_settings.xml
index b025536e3616..2c153370df97 100644
--- a/app/src/main/res/layout/activity_accessibility_settings.xml
+++ b/app/src/main/res/layout/activity_accessibility_settings.xml
@@ -14,114 +14,100 @@
~ limitations under the License.
-->
-
+
+ android:id="@+id/includeToolbar"
+ layout="@layout/include_default_toolbar" />
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ app:layout_behavior="@string/appbar_scrolling_view_behavior"
+ tools:ignore="Overdraw">
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:paddingBottom="@dimen/keyline_4">
+ android:id="@+id/appFontSizeToggle"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ app:primaryText="@string/accessibilityTextSizeOverrideTitle"
+ app:secondaryText="@string/accessibilityTextSizeOverrideSubtitle"
+ app:showSwitch="true" />
+ android:id="@+id/fontSizeSettingsGroup"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ tools:ignore="Overdraw">
-
+ android:paddingEnd="@dimen/keyline_4">
-
-
-
+ android:layout_gravity="center"
+ android:minWidth="50dp"
+ app:typography="body1" />
+ android:id="@+id/accessibilitySlider"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:paddingTop="@dimen/keyline_4"
+ android:paddingBottom="@dimen/keyline_4"
+ android:stepSize="10"
+ android:valueFrom="70"
+ android:valueTo="170"
+ app:labelBehavior="gone"
+ app:tickVisible="false" />
-
+
+ android:layout_height="wrap_content" />
+ android:id="@+id/forceZoomToggle"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ app:primaryText="@string/accessibilityForceZoomTitle"
+ app:secondaryText="@string/accessibilityForceZoomSubtitle"
+ app:showSwitch="true" />
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/common-ui/src/main/res/drawable/background_text_view_container.xml b/common-ui/src/main/res/drawable/background_text_view_container.xml
new file mode 100644
index 000000000000..accb8406b0c9
--- /dev/null
+++ b/common-ui/src/main/res/drawable/background_text_view_container.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
\ No newline at end of file