diff --git a/app/src/main/res/drawable/general_item_background_border_black.xml b/app/src/main/res/drawable/general_item_background_border_black.xml
new file mode 100644
index 00000000000..c9f61d667b0
--- /dev/null
+++ b/app/src/main/res/drawable/general_item_background_border_black.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
diff --git a/app/src/main/res/layout/license_item.xml b/app/src/main/res/layout/license_item.xml
index 93d4d180ab2..e88acc396bf 100644
--- a/app/src/main/res/layout/license_item.xml
+++ b/app/src/main/res/layout/license_item.xml
@@ -14,19 +14,20 @@
+ android:background="@drawable/general_item_background_border_black">
diff --git a/app/src/main/res/layout/license_list_fragment.xml b/app/src/main/res/layout/license_list_fragment.xml
index 4a2a12c69eb..e6f483ea436 100644
--- a/app/src/main/res/layout/license_list_fragment.xml
+++ b/app/src/main/res/layout/license_list_fragment.xml
@@ -12,7 +12,7 @@
diff --git a/app/src/main/res/layout/license_text_viewer_fragment.xml b/app/src/main/res/layout/license_text_viewer_fragment.xml
index 9bfba68fe36..179c968acb1 100644
--- a/app/src/main/res/layout/license_text_viewer_fragment.xml
+++ b/app/src/main/res/layout/license_text_viewer_fragment.xml
@@ -11,15 +11,17 @@
+ android:background="@color/component_color_license_text_viewer_activity_background_color">
diff --git a/app/src/main/res/layout/third_party_dependency_item.xml b/app/src/main/res/layout/third_party_dependency_item.xml
index 6f73ef969f3..e267fd897d6 100644
--- a/app/src/main/res/layout/third_party_dependency_item.xml
+++ b/app/src/main/res/layout/third_party_dependency_item.xml
@@ -19,7 +19,7 @@
diff --git a/app/src/main/res/layout/third_party_dependency_list_fragment.xml b/app/src/main/res/layout/third_party_dependency_list_fragment.xml
index 58885869944..d4c864c7b5e 100644
--- a/app/src/main/res/layout/third_party_dependency_list_fragment.xml
+++ b/app/src/main/res/layout/third_party_dependency_list_fragment.xml
@@ -12,7 +12,7 @@
diff --git a/app/src/main/res/values/component_colors.xml b/app/src/main/res/values/component_colors.xml
index f6fe9c0e5fd..483639ceaa9 100644
--- a/app/src/main/res/values/component_colors.xml
+++ b/app/src/main/res/values/component_colors.xml
@@ -14,6 +14,8 @@
@color/color_palette_primary_text_color
@color/color_palette_text_input_background_color
@color/color_palette_error_color
+ @color/color_palette_container_background_color
+ @color/color_palette_dark_background_color
@color/color_palette_description_text_color
@color/color_palette_background_color
@@ -83,4 +85,15 @@
@color/color_palette_secondary_toolbar_color
@color/color_palette_secondary_toolbar_color
@color/color_palette_secondary_toolbar_color
+
+ @color/color_palette_dark_background_color
+ @color/color_palette_dark_text_color
+ @color/color_palette_primary_text_color
+
+ @color/color_palette_dark_background_color
+ @color/color_palette_container_background_color
+ @color/color_palette_dark_text_color
+
+ @color/color_palette_dark_background_color
+ @color/color_palette_description_text_color