diff --git a/app/src/main/res/layout/card_counter.xml b/app/src/main/res/layout/card_counter.xml
index d24e049..b21489e 100644
--- a/app/src/main/res/layout/card_counter.xml
+++ b/app/src/main/res/layout/card_counter.xml
@@ -9,11 +9,13 @@
     android:layout_marginTop="@dimen/cardview_margin_top"
     app:cardCornerRadius="20sp"
     app:cardElevation="10sp"
+
     >
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:background="@color/text_color_inverted"
         >
 
         <LinearLayout
diff --git a/app/src/main/res/layout/card_dualcounter.xml b/app/src/main/res/layout/card_dualcounter.xml
index 1bbee79..2de1ef5 100644
--- a/app/src/main/res/layout/card_dualcounter.xml
+++ b/app/src/main/res/layout/card_dualcounter.xml
@@ -12,7 +12,8 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:background="@color/text_color_inverted">
 
         <LinearLayout
             android:id="@+id/green_linear"
diff --git a/app/src/main/res/layout/card_list.xml b/app/src/main/res/layout/card_list.xml
index a48cc5a..1b4e7d7 100644
--- a/app/src/main/res/layout/card_list.xml
+++ b/app/src/main/res/layout/card_list.xml
@@ -13,7 +13,8 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:background="@color/text_color_inverted">
 
         <LinearLayout
             android:id="@+id/category_color"
diff --git a/app/src/main/res/layout/card_segment.xml b/app/src/main/res/layout/card_segment.xml
index 5ba9f04..0133658 100644
--- a/app/src/main/res/layout/card_segment.xml
+++ b/app/src/main/res/layout/card_segment.xml
@@ -12,7 +12,8 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:background="@color/text_color_inverted">
 
         <LinearLayout
             android:id="@+id/category_color"
diff --git a/app/src/main/res/layout/card_teamselect.xml b/app/src/main/res/layout/card_teamselect.xml
index 545f5fb..aedae75 100644
--- a/app/src/main/res/layout/card_teamselect.xml
+++ b/app/src/main/res/layout/card_teamselect.xml
@@ -13,7 +13,8 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:background="@color/text_color_inverted">
 
         <LinearLayout
             android:id="@+id/category_color"
diff --git a/app/src/main/res/layout/card_textbox.xml b/app/src/main/res/layout/card_textbox.xml
index 5479fcd..15f7b8c 100644
--- a/app/src/main/res/layout/card_textbox.xml
+++ b/app/src/main/res/layout/card_textbox.xml
@@ -12,7 +12,8 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:background="@color/text_color_inverted">
 
         <LinearLayout
             android:id="@+id/category_color"
diff --git a/app/src/main/res/layout/card_yesno.xml b/app/src/main/res/layout/card_yesno.xml
index 521c2d9..82b1c56 100644
--- a/app/src/main/res/layout/card_yesno.xml
+++ b/app/src/main/res/layout/card_yesno.xml
@@ -13,7 +13,8 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:background="@color/text_color_inverted">
 
         <LinearLayout
             android:id="@+id/category_color"
diff --git a/app/src/main/res/layout/ui_dual_number_picker.xml b/app/src/main/res/layout/ui_dual_number_picker.xml
index 9da1644..da3303b 100644
--- a/app/src/main/res/layout/ui_dual_number_picker.xml
+++ b/app/src/main/res/layout/ui_dual_number_picker.xml
@@ -46,6 +46,7 @@
         android:layout_marginStart="8dp"
         android:backgroundTint="@color/accent_color"
         android:text="@string/plus"
+        android:textColor="@color/white"
         android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@+id/display"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/ui_number_picker_layout.xml b/app/src/main/res/layout/ui_number_picker_layout.xml
index 1e2260a..c7d01ab 100644
--- a/app/src/main/res/layout/ui_number_picker_layout.xml
+++ b/app/src/main/res/layout/ui_number_picker_layout.xml
@@ -12,6 +12,7 @@
         android:text="@string/minus"
         android:textStyle="bold"
         app:autoSizeTextType="uniform"
+        android:textColor="@color/white"
         android:backgroundTint="@color/accent_color"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/display"
@@ -42,6 +43,7 @@
         android:layout_height="match_parent"
         android:text="@string/plus"
         android:textStyle="bold"
+        android:textColor="@color/white"
         app:autoSizeTextType="uniform"
         android:backgroundTint="@color/accent_color"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/ui_yes_no_segmented.xml b/app/src/main/res/layout/ui_yes_no_segmented.xml
index 0b7e052..3ef74c6 100644
--- a/app/src/main/res/layout/ui_yes_no_segmented.xml
+++ b/app/src/main/res/layout/ui_yes_no_segmented.xml
@@ -30,7 +30,7 @@
             android:layout_weight="1"
             android:padding="5dp"
             app:autoSizeTextType="uniform"
-            app:sb_selectedTextColor="@color/text_color_inverted"
+            app:sb_selectedTextColor="@color/text_color"
             app:sb_text="@string/no"
             app:sb_textColor="@color/text_color"
             />
@@ -41,7 +41,7 @@
             android:layout_weight="1"
             android:padding="5dp"
             app:autoSizeTextType="uniform"
-            app:sb_selectedTextColor="@color/text_color_inverted"
+            app:sb_selectedTextColor="@color/text_color"
             app:sb_text="@string/yes"
             app:sb_textColor="@color/text_color"
             />