diff --git a/app/src/main/res/drawable/ic_warning_black.xml b/app/src/main/res/drawable/ic_warning_black.xml
index 90f73c77a9025cc09270fe38ac662151add5e564..1716c1d45323037fe8aad57c75a00df23ff9725b 100644
--- a/app/src/main/res/drawable/ic_warning_black.xml
+++ b/app/src/main/res/drawable/ic_warning_black.xml
@@ -22,6 +22,6 @@
     android:viewportHeight="21">
   <path
       android:pathData="M10,0.557C4.48,0.557 0,5.037 0,10.557C0,16.077 4.48,20.557 10,20.557C15.52,20.557 20,16.077 20,10.557C20,5.037 15.52,0.557 10,0.557ZM11,15.557H9V9.557H11V15.557ZM11,7.557H9V5.557H11V7.557Z"
-      android:fillColor="#000000"
+      android:fillColor="@color/e_primary_text_color"
       android:fillAlpha="0.74"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_warning_white.xml b/app/src/main/res/drawable/ic_warning_white.xml
index e885ef12faad1ee4a31b139a0ef50c6109882319..3bfbcabc8f54a22faca00cc3c987176183353d08 100644
--- a/app/src/main/res/drawable/ic_warning_white.xml
+++ b/app/src/main/res/drawable/ic_warning_white.xml
@@ -22,5 +22,5 @@
     android:viewportHeight="21">
   <path
       android:pathData="M9,13.5H11V15.5H9V13.5ZM9,5.5H11V11.5H9V5.5ZM9.99,0.5C4.47,0.5 0,4.98 0,10.5C0,16.02 4.47,20.5 9.99,20.5C15.52,20.5 20,16.02 20,10.5C20,4.98 15.52,0.5 9.99,0.5ZM10,18.5C5.58,18.5 2,14.92 2,10.5C2,6.08 5.58,2.5 10,2.5C14.42,2.5 18,6.08 18,10.5C18,14.92 14.42,18.5 10,18.5Z"
-      android:fillColor="#ffffff"/>
+      android:fillColor="@color/e_background"/>
 </vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 38aa95c20784c4c023752a397061b3b5881d6580..2c2cf3bd90753a6610d99b16bd665fd9fcaca85a 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -38,7 +38,7 @@
             android:id="@+id/errorMessagePanel"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@android:color/black">
+            android:background="@color/e_primary_text_color">
 
             <TextView
                 android:id="@+id/errorMessageText"
@@ -49,7 +49,7 @@
                 android:layout_marginTop="10dp"
                 android:layout_marginBottom="10dp"
                 android:gravity="center_vertical"
-                android:textColor="@android:color/white"
+                android:textColor="@color/e_background"
                 app:drawableLeftCompat="@drawable/ic_warning_white"
                 android:drawablePadding="15dp"
                 android:text="@string/too_many_requests_desc" />
@@ -63,7 +63,7 @@
                 android:layout_marginBottom="15dp"
                 android:gravity="end"
                 android:text="@string/refresh_session"
-                android:textColor="@color/colorAccent"
+                android:textColor="@color/e_accent_inverse"
                 android:textSize="15sp"
                 android:textStyle="bold"
                 android:layout_alignParentEnd="true"
diff --git a/app/src/main/res/layout/fragment_application.xml b/app/src/main/res/layout/fragment_application.xml
index e88df680a592c3cc0c8aa7e41a2115792c6d4710..e9ef6434a4350d719fccd2aba64a843fc5b4824e 100644
--- a/app/src/main/res/layout/fragment_application.xml
+++ b/app/src/main/res/layout/fragment_application.xml
@@ -69,7 +69,7 @@
                 <RelativeLayout
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:background="@android:color/black">
+                    android:background="@color/e_primary_text_color">
 
                     <TextView
                         android:layout_width="match_parent"
@@ -77,7 +77,7 @@
                         android:layout_marginLeft="10dp"
                         android:layout_marginRight="10dp"
                         android:gravity="center_vertical"
-                        android:textColor="@android:color/white"
+                        android:textColor="@color/e_background"
                         app:drawableLeftCompat="@drawable/ic_warning_white"
                         android:drawablePadding="15dp"
                         android:text="@string/this_app_may_not_work_properly" />
@@ -93,7 +93,7 @@
                 android:layout_marginLeft="20dp"
                 android:layout_marginRight="20dp"
                 android:layout_marginTop="20dp"
-                android:background="@color/colorBackground"
+                android:background="@color/e_background"
                 app:cardElevation="8dp">
 
                 <TextView
@@ -105,7 +105,7 @@
                     android:gravity="center"
                     app:drawableEndCompat="@drawable/ic_warning_black"
                     android:drawablePadding="15dp"
-                    android:textColor="?android:textColorPrimary"
+                    android:textColor="@color/e_primary_text_color"
                     android:text="@string/why_open_source_version" />
 
             </RelativeLayout>