diff --git a/wearos/src/main/res/layout/row_daily.xml b/wearos/src/main/res/layout/row_daily.xml
index 3eaced68a..95898e254 100644
--- a/wearos/src/main/res/layout/row_daily.xml
+++ b/wearos/src/main/res/layout/row_daily.xml
@@ -1,32 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/chip"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="52dp"
+    style="@style/Chip">
+    <FrameLayout
+        android:id="@+id/checkbox_wrapper"
+        android:layout_width="34dp"
+        android:layout_height="34dp"
+        android:background="@drawable/circle"
+        android:layout_marginEnd="6dp"
+        android:foreground="@drawable/task_score_feedback">
+        <ImageView
+            android:id="@+id/checkbox"
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:background="@drawable/daily_square"
+            android:scaleType="center"
+            android:layout_gravity="center"/>
+    </FrameLayout>
     <LinearLayout
-        android:id="@+id/chip"
-        android:layout_width="match_parent"
-        android:layout_height="52dp"
-        style="@style/Chip">
-        <FrameLayout
-            android:id="@+id/checkbox_wrapper"
-            android:layout_width="34dp"
-            android:layout_height="34dp"
-            android:background="@drawable/circle"
-            android:layout_marginEnd="6dp"
-            android:foreground="@drawable/task_score_feedback">
-            <ImageView
-                android:id="@+id/checkbox"
-                android:layout_width="20dp"
-                android:layout_height="20dp"
-                android:background="@drawable/daily_square"
-                android:scaleType="center"
-                android:layout_gravity="center"/>
-        </FrameLayout>
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
         <com.habitrpg.wearos.habitica.ui.views.TaskTextView
             android:id="@+id/title"
             android:layout_width="wrap_content"
@@ -36,6 +33,5 @@
             tools:text="Task Title that is long and wraps and"
             android:textColor="@color/watch_white"
             style="@style/Text.Body1"/>
-        </LinearLayout>
     </LinearLayout>
-</FrameLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/wearos/src/main/res/layout/row_footer.xml b/wearos/src/main/res/layout/row_footer.xml
index 7ecfef330..3a074b353 100644
--- a/wearos/src/main/res/layout/row_footer.xml
+++ b/wearos/src/main/res/layout/row_footer.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="45dp">
-
+    android:layout_height="45dp"
+    android:orientation="vertical"
+    android:gravity="center">
     <ImageView
         android:layout_width="25dp"
         android:layout_height="25dp"
-        android:layout_above="@id/text_view"
-        android:layout_centerHorizontal="true"
         android:layout_marginBottom="2dp"
         android:importantForAccessibility="no"
         android:src="@mipmap/ic_launcher" />
@@ -17,11 +16,9 @@
         android:id="@+id/text_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_centerHorizontal="true"
         android:fontFamily="sans-serif"
         android:textColor="@color/watch_purple_200"
         android:textSize="12sp"
         tools:text="Footer Text" />
 
-</RelativeLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/wearos/src/main/res/layout/row_habit.xml b/wearos/src/main/res/layout/row_habit.xml
index 3984c6a48..cba44ada1 100644
--- a/wearos/src/main/res/layout/row_habit.xml
+++ b/wearos/src/main/res/layout/row_habit.xml
@@ -1,39 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="52dp"
+    style="@style/Chip">
+
+    <FrameLayout
+        android:id="@+id/habit_button"
+        android:layout_width="34dp"
+        android:layout_height="34dp"
+        android:background="@drawable/circle"
+        android:layout_marginEnd="@dimen/spacing_medium"
+        android:foreground="@drawable/task_score_feedback">
+
+        <ImageView
+            android:id="@+id/habit_button_icon"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:scaleType="center" />
+    </FrameLayout>
+
     <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="52dp"
-        style="@style/Chip">
-        <FrameLayout
-            android:id="@+id/habit_button"
-            android:layout_width="34dp"
-            android:layout_height="34dp"
-            android:background="@drawable/circle"
-            android:layout_marginEnd="@dimen/spacing_medium"
-            android:foreground="@drawable/task_score_feedback"
-            >
-            <ImageView
-                android:id="@+id/habit_button_icon"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:scaleType="center"/>
-        </FrameLayout>
-        <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <com.habitrpg.wearos.habitica.ui.views.TaskTextView
+            android:id="@+id/title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
-            <com.habitrpg.wearos.habitica.ui.views.TaskTextView
-                android:id="@+id/title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:maxLines="2"
-                android:ellipsize="end"
-                tools:text="Task Title"
-                android:textColor="@color/watch_white"
-                style="@style/Text.Body1"/>
-        </LinearLayout>
+            android:maxLines="2"
+            android:ellipsize="end"
+            tools:text="Task Title"
+            android:textColor="@color/watch_white"
+            style="@style/Text.Body1" />
     </LinearLayout>
-</FrameLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/wearos/src/main/res/layout/row_header.xml b/wearos/src/main/res/layout/row_header.xml
index edd234235..ae142b168 100644
--- a/wearos/src/main/res/layout/row_header.xml
+++ b/wearos/src/main/res/layout/row_header.xml
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical"
+    android:id="@+id/text_view"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="6dp">
-    <TextView
-        android:id="@+id/text_view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:textColor="@color/watch_purple_200"
-        tools:text="Header Text"
-        style="@style/Text.SubHeader1"/>
-</FrameLayout>
\ No newline at end of file
+    android:layout_gravity="center"
+    android:gravity="center"
+    android:textColor="@color/watch_purple_200"
+    tools:text="Header Text"
+    style="@style/Text.SubHeader1"
+    android:padding="6dp"/>
diff --git a/wearos/src/main/res/layout/row_hub.xml b/wearos/src/main/res/layout/row_hub.xml
index a36f68429..97cd761d5 100644
--- a/wearos/src/main/res/layout/row_hub.xml
+++ b/wearos/src/main/res/layout/row_hub.xml
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/row_container"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-    <LinearLayout
-        android:id="@+id/row_container"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        style="@style/Chip">
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    style="@style/Chip">
     <ImageView
         android:id="@+id/icon_view"
         android:layout_width="36dp"
@@ -23,12 +20,11 @@
         android:layout_height="wrap_content"
         android:textColor="@color/watch_white"
         style="@style/Text.SubHeader1"/>
-        <TextView
-            android:id="@+id/detail_view"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            style="@style/Text.Body1"
-            android:textColor="@color/watch_purple_200"
-            android:layout_marginEnd="@dimen/spacing_medium"/>
-    </LinearLayout>
-</FrameLayout>
\ No newline at end of file
+    <TextView
+        android:id="@+id/detail_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        style="@style/Text.Body1"
+        android:textColor="@color/watch_purple_200"
+        android:layout_marginEnd="@dimen/spacing_medium"/>
+</LinearLayout>
diff --git a/wearos/src/main/res/layout/row_reward.xml b/wearos/src/main/res/layout/row_reward.xml
index 6f602e0a6..dd7e47777 100644
--- a/wearos/src/main/res/layout/row_reward.xml
+++ b/wearos/src/main/res/layout/row_reward.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="52dp"
         style="@style/Chip">
@@ -17,4 +14,3 @@
             android:textColor="@color/watch_white"
             style="@style/Text.Body1"/>
     </LinearLayout>
-</FrameLayout>
\ No newline at end of file
diff --git a/wearos/src/main/res/layout/row_section_header.xml b/wearos/src/main/res/layout/row_section_header.xml
index 8bb6d86a2..1af97509d 100644
--- a/wearos/src/main/res/layout/row_section_header.xml
+++ b/wearos/src/main/res/layout/row_section_header.xml
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:padding="6dp">
-    <TextView
         android:id="@+id/text_view"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
+    android:gravity="center"
         android:textColor="@color/watch_purple_200"
         tools:text="Header Text"
-        style="@style/Text.Body1"/>
-</FrameLayout>
\ No newline at end of file
+        style="@style/Text.Body1"
+        android:layout_margin="6dp"/>
diff --git a/wearos/src/main/res/layout/row_settings.xml b/wearos/src/main/res/layout/row_settings.xml
index b8e9d84c5..4bcbfaa38 100644
--- a/wearos/src/main/res/layout/row_settings.xml
+++ b/wearos/src/main/res/layout/row_settings.xml
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_gravity="center">
-    <LinearLayout
         android:id="@+id/row"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -23,5 +18,4 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1" />
-    </LinearLayout>
-</FrameLayout>
\ No newline at end of file
+    </LinearLayout>
\ No newline at end of file
diff --git a/wearos/src/main/res/layout/row_todo.xml b/wearos/src/main/res/layout/row_todo.xml
index 58c4fcb43..231b3c047 100644
--- a/wearos/src/main/res/layout/row_todo.xml
+++ b/wearos/src/main/res/layout/row_todo.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="52dp"
         style="@style/Chip">
@@ -36,5 +33,4 @@
                 android:textColor="@color/watch_white"
                 style="@style/Text.Body1"/>
         </LinearLayout>
-    </LinearLayout>
-</FrameLayout>
\ No newline at end of file
+    </LinearLayout>
\ No newline at end of file