diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
index 4078d2e48..3835cdf8f 100644
--- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
@@ -77,7 +77,7 @@ private class SessionsAdapter(val context: Context) : RecyclerView.Adapter<Sessi
         return ViewHolder(textView)
     }
 
-    override fun getItemCount(): Int = 0
+    override fun getItemCount(): Int = 100
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         holder.textView.text = "Cell: ${position}"
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 9c4e435d2..2f4cf4339 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -17,21 +17,20 @@
     <ImageButton
             android:id="@+id/menuButton"
             android:src="@drawable/ic_menu"
-            android:layout_width="48dp"
-
-            android:layout_height="48dp"
+            android:layout_width="@dimen/glyph_button_height"
+            android:layout_height="@dimen/glyph_button_height"
             android:layout_marginTop="16dp"
             android:background="?android:attr/selectableItemBackgroundBorderless"
-            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
     <ImageButton
             android:id="@+id/privateBrowsingButton"
             android:src="@drawable/ic_private_browsing"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
+            android:layout_width="@dimen/glyph_button_height"
+            android:layout_height="@dimen/glyph_button_height"
             android:background="?android:attr/selectableItemBackgroundBorderless"
-            app:layout_constraintRight_toLeftOf="@id/menuButton"
+            app:layout_constraintEnd_toStartOf="@id/menuButton"
             app:layout_constraintTop_toTopOf="@id/menuButton" />
 
     <ImageView
@@ -41,7 +40,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="16dp"
             android:layout_marginTop="42dp"
-            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/menuButton" />
 
     <FrameLayout
@@ -53,8 +52,8 @@
             android:layout_marginRight="16dp"
             android:background="@drawable/home_search_background"
             app:layout_constraintTop_toBottomOf="@id/wordmark"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
             android:outlineProvider="paddedBounds"
             android:clipToPadding="false"
             android:elevation="5dp">
@@ -74,8 +73,8 @@
             android:layout_height="0dp"
             android:layout_margin="16dp"
             app:layout_constraintTop_toBottomOf="@id/toolbar_wrapper"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"/>
 
 </androidx.constraintlayout.motion.widget.MotionLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
new file mode 100644
index 000000000..d63b54263
--- /dev/null
+++ b/app/src/main/res/values/dimens.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<resources>
+    <dimen name="glyph_button_height">48dp</dimen>
+    <dimen name="glyph_button_width">48dp</dimen>
+</resources>
\ No newline at end of file