diff --git a/app/src/main/res/layout-sw600dp/revision_card_fragment.xml b/app/src/main/res/layout-sw600dp/revision_card_fragment.xml
index 2aa0649856d..f7eba9c1f38 100644
--- a/app/src/main/res/layout-sw600dp/revision_card_fragment.xml
+++ b/app/src/main/res/layout-sw600dp/revision_card_fragment.xml
@@ -61,14 +61,13 @@
 
           <com.google.android.material.card.MaterialCardView
             android:id="@+id/previous_navigation_card"
-            android:layout_width="wrap_content"
+            android:layout_width="144dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="28dp"
             android:layout_marginTop="16dp"
             android:layout_marginEnd="28dp"
             android:layout_marginBottom="@dimen/topic_revision_summary_view_container_margin_bottom"
             android:clipToPadding="true"
-            android:maxWidth="144dp"
             android:onClick="@{() -> viewModel.onPreviousCardClicked()}"
             android:visibility="@{viewModel.subtopicId == 1 ? View.GONE : View.VISIBLE}"
             app:cardBackgroundColor="@color/component_color_shared_revision_card_background_color"
@@ -120,14 +119,13 @@
 
           <com.google.android.material.card.MaterialCardView
             android:id="@+id/next_navigation_card"
-            android:layout_width="wrap_content"
+            android:layout_width="144dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="28dp"
             android:layout_marginTop="16dp"
             android:layout_marginEnd="28dp"
             android:layout_marginBottom="@dimen/topic_revision_summary_view_container_margin_bottom"
             android:clipToPadding="true"
-            android:maxWidth="144dp"
             android:onClick="@{() -> viewModel.onNextCardClicked()}"
             android:visibility="@{viewModel.subtopicId &lt; viewModel.subtopicListSize ? View.VISIBLE : View.GONE}"
             app:cardBackgroundColor="@color/component_color_shared_revision_card_background_color"
diff --git a/app/src/main/res/layout/revision_card_fragment.xml b/app/src/main/res/layout/revision_card_fragment.xml
index 4377d955871..30cafe15137 100644
--- a/app/src/main/res/layout/revision_card_fragment.xml
+++ b/app/src/main/res/layout/revision_card_fragment.xml
@@ -57,9 +57,8 @@
 
         <com.google.android.material.card.MaterialCardView
           android:id="@+id/previous_navigation_card"
-          android:layout_width="wrap_content"
+          android:layout_width="144dp"
           android:layout_height="wrap_content"
-          android:maxWidth="144dp"
           android:layout_marginStart="28dp"
           android:layout_marginTop="16dp"
           android:layout_marginEnd="28dp"
@@ -96,17 +95,17 @@
               style="@style/TextViewStart"
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
-              android:minWidth="144dp"
               android:background="@color/component_color_shared_revision_card_text_background_color"
+              android:contentDescription="@{viewModel.computeContentDescriptionText(viewModel.previousSubtopicLiveData)}"
               android:ellipsize="end"
               android:fontFamily="sans-serif"
+              android:minWidth="144dp"
               android:minLines="3"
               android:paddingStart="@dimen/topic_revision_summary_view_subtopic_title_text_view_padding_start"
               android:paddingTop="8dp"
               android:paddingEnd="@dimen/topic_revision_summary_view_subtopic_title_text_view_padding_end"
               android:paddingBottom="16dp"
               android:text="@{viewModel.computeTitleText(viewModel.previousSubtopicLiveData)}"
-              android:contentDescription="@{viewModel.computeContentDescriptionText(viewModel.previousSubtopicLiveData)}"
               android:textColor="@color/component_color_shared_secondary_4_text_color"
               android:textSize="14sp"
               android:textStyle="bold"
@@ -116,9 +115,8 @@
 
         <com.google.android.material.card.MaterialCardView
           android:id="@+id/next_navigation_card"
-          android:layout_width="wrap_content"
+          android:layout_width="144dp"
           android:layout_height="wrap_content"
-          android:maxWidth="144dp"
           android:layout_marginStart="28dp"
           android:layout_marginTop="16dp"
           android:layout_marginEnd="28dp"
@@ -155,17 +153,17 @@
               style="@style/TextViewStart"
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
-              android:minWidth="144dp"
               android:background="@color/component_color_shared_revision_card_text_background_color"
+              android:contentDescription="@{viewModel.computeContentDescriptionText(viewModel.nextSubtopicLiveData)}"
               android:ellipsize="end"
               android:fontFamily="sans-serif"
+              android:minWidth="144dp"
               android:minLines="3"
               android:paddingStart="@dimen/topic_revision_summary_view_subtopic_title_text_view_padding_start"
               android:paddingTop="8dp"
               android:paddingEnd="@dimen/topic_revision_summary_view_subtopic_title_text_view_padding_end"
               android:paddingBottom="16dp"
               android:text="@{viewModel.computeTitleText(viewModel.nextSubtopicLiveData)}"
-              android:contentDescription="@{viewModel.computeContentDescriptionText(viewModel.nextSubtopicLiveData)}"
               android:textColor="@color/component_color_shared_secondary_4_text_color"
               android:textSize="14sp"
               android:textStyle="bold"