diff --git a/app/src/main/res/color-night/button_selector_text_amber.xml b/app/src/main/res/color-night/button_selector_text_amber.xml
new file mode 100644
index 00000000..e22fe9a6
--- /dev/null
+++ b/app/src/main/res/color-night/button_selector_text_amber.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/black_1" android:state_pressed="true" />
+    <item android:color="@color/black_1" android:state_focused="true" />
+    <item android:color="@color/black_1" android:state_selected="true" />
+    <item android:color="@color/amber" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/color-night/button_selector_text_green.xml b/app/src/main/res/color-night/button_selector_text_green.xml
new file mode 100644
index 00000000..08f1f4a3
--- /dev/null
+++ b/app/src/main/res/color-night/button_selector_text_green.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/black_1" android:state_pressed="true" />
+    <item android:color="@color/black_1" android:state_focused="true" />
+    <item android:color="@color/black_1" android:state_selected="true" />
+    <item android:color="@color/green" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/color-night/button_selector_text_red.xml b/app/src/main/res/color-night/button_selector_text_red.xml
new file mode 100644
index 00000000..525c4636
--- /dev/null
+++ b/app/src/main/res/color-night/button_selector_text_red.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/black_1" android:state_pressed="true" />
+    <item android:color="@color/black_1" android:state_focused="true" />
+    <item android:color="@color/black_1" android:state_selected="true" />
+    <item android:color="@color/red" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-night/selector_button_amber.xml b/app/src/main/res/drawable-night/selector_button_amber.xml
new file mode 100644
index 00000000..64f4b7e1
--- /dev/null
+++ b/app/src/main/res/drawable-night/selector_button_amber.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" android:color="@color/amber">
+    <item android:state_selected="true">
+        <shape android:shape="rectangle">
+            <corners android:radius="20dp" />
+            <solid android:color="@color/amber" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <corners android:radius="20dp" />
+            <solid android:color="@color/black_2" />
+            <stroke
+                android:width="1dp"
+                android:color="@color/amber" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-night/selector_button_green.xml b/app/src/main/res/drawable-night/selector_button_green.xml
new file mode 100644
index 00000000..59bcbce3
--- /dev/null
+++ b/app/src/main/res/drawable-night/selector_button_green.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" android:color="@color/green">
+    <item android:state_selected="true">
+        <shape android:shape="rectangle">
+            <corners android:radius="20dp" />
+            <solid android:color="@color/green" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <corners android:radius="20dp" />
+            <solid android:color="@color/black_2" />
+            <stroke
+                android:width="1dp"
+                android:color="@color/green" />
+        </shape>
+    </item>
+</selector>
diff --git a/app/src/main/res/drawable-night/selector_button_red.xml b/app/src/main/res/drawable-night/selector_button_red.xml
new file mode 100644
index 00000000..dde25b7f
--- /dev/null
+++ b/app/src/main/res/drawable-night/selector_button_red.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true">
+        <shape android:shape="rectangle">
+            <corners android:radius="20dp" />
+            <solid android:color="@color/red" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <corners android:radius="20dp" />
+            <solid android:color="@color/black_2" />
+            <stroke
+                android:width="1dp"
+                android:color="@color/red" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_risk.xml b/app/src/main/res/layout/fragment_risk.xml
index d7ebf32c..7d523961 100644
--- a/app/src/main/res/layout/fragment_risk.xml
+++ b/app/src/main/res/layout/fragment_risk.xml
@@ -24,7 +24,7 @@
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@color/white"
+                android:background="@color/background_card"
                 android:paddingStart="18dp"
                 android:paddingTop="18dp"
                 android:paddingEnd="18dp"
@@ -36,6 +36,7 @@
                     android:layout_width="0dp"
                     android:layout_height="36sp"
                     android:text="@string/risk"
+                    android:textColor="@color/header_color"
                     app:layout_constraintEnd_toStartOf="@id/risk_action_icon"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 70f262d2..95aec8d2 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -16,15 +16,15 @@
     <color name="medium_grey">#B9B9B9</color>
     <color name="tab_inactive">#979797</color>
     <color name="white">#FFFFFF</color>
-    <color name="green">#008537</color>
+    <color name="green">#52D287</color>
     <color name="light_green">#ECF4EF</color>
     <color name="green_background">#DEEFE5</color>
     <color name="green_text">#006128</color>
-    <color name="amber">#FFBF22</color>
+    <color name="amber">#FFD575</color>
     <color name="light_amber">#4CFFECBC</color>
     <color name="amber_text">#614500</color>
     <color name="amber_background">#FFECBC</color>
-    <color name="red">#CF2222</color>
+    <color name="red">#FF6666</color>
     <color name="light_red">#4CF6D4D4</color>
     <color name="red_text">#960B0B</color>
     <color name="red_text_2">#891515</color>