diff --git a/res/drawable/circle_bg.xml b/res/drawable/circle_bg.xml
index 099b6c3aec585530718d6b6b85e670c8e10882b5..a1eaf847c611fcefebddd5ce1579ba021f02544c 100644
--- a/res/drawable/circle_bg.xml
+++ b/res/drawable/circle_bg.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape android:shape="oval"
     xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/color_default_blue1"/>
+    <solid android:color="@color/calculator_accent_color"/>
     <size android:width="8dp" android:height="8dp"/>
 </shape>
diff --git a/res/drawable/eq_button_backgroud.xml b/res/drawable/eq_button_backgroud.xml
index 6ef3a32f08d48a9832e2d814f7a93ee281b5316a..e0d42ee89b65471658b2444177ec0f1ead11f32d 100644
--- a/res/drawable/eq_button_backgroud.xml
+++ b/res/drawable/eq_button_backgroud.xml
@@ -2,8 +2,8 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape android:shape="oval">
-            <solid android:color="@color/color_default_blue1"/>
-            <stroke android:color="@color/color_default_blue1" android:width="5dp"/>
+            <solid android:color="@color/calculator_accent_color"/>
+            <stroke android:color="@color/calculator_accent_color" android:width="5dp"/>
             <!-- Set the same value for both width and height to get a circular shape -->
             <size android:width="40dp" android:height="40dp"/>
         </shape>
diff --git a/res/drawable/ic_del.xml b/res/drawable/ic_del.xml
index f36ae61b8cef0c7b18dcf275e36ac0cc9971e712..3e5ffb611958eebd41d519f0ae1bfd6a6087d8cc 100644
--- a/res/drawable/ic_del.xml
+++ b/res/drawable/ic_del.xml
@@ -20,7 +20,7 @@
     android:width="24dp"
     android:viewportHeight="24"
     android:viewportWidth="24"
-    android:tint="@color/color_default_blue1"
+    android:tint="@color/calculator_accent_color"
     >
     <path
         android:fillColor="@color/pad_button_text_color"
diff --git a/res/layout/activity_calculator_land.xml b/res/layout/activity_calculator_land.xml
index 2c6752a7f69fa2d3152eed275afad41763b257d6..7c57e40ff048841095f7dcf15d98f4bcd7ce0f90 100644
--- a/res/layout/activity_calculator_land.xml
+++ b/res/layout/activity_calculator_land.xml
@@ -26,7 +26,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
     <View
-        android:background="@color/color_default_blue1"
+        android:background="@color/calculator_accent_color"
         android:layout_width="match_parent"
         android:layout_height="1dp"/>
 
diff --git a/res/layout/activity_calculator_port.xml b/res/layout/activity_calculator_port.xml
index 46918910f7d68842e00ef71dd911656edea0390b..72c09a6efdb964fb6fea70ffe9dfb42bdb3e2b26 100644
--- a/res/layout/activity_calculator_port.xml
+++ b/res/layout/activity_calculator_port.xml
@@ -23,7 +23,7 @@
 
     <include layout="@layout/display" />
     <View
-        android:background="@color/color_default_blue1"
+        android:background="@color/calculator_accent_color"
         android:layout_width="match_parent"
         android:layout_height="1dp"/>
 
diff --git a/res/layout/history_item.xml b/res/layout/history_item.xml
index cf8b6c062223836e1bad1c441c12115e07e291f8..175613299a4a12084556a45f8d23fa1bfa900d37 100644
--- a/res/layout/history_item.xml
+++ b/res/layout/history_item.xml
@@ -42,7 +42,7 @@
         android:paddingStart="@dimen/result_padding_start"
         android:paddingEnd="@dimen/result_padding_end"
         android:text="@string/title_current_expression"
-        android:textColor="?android:attr/colorAccent"
+        android:textColor="@color/calculator_accent_color"
         android:textSize="14dp" />
 
     <com.android.calculator2.CalculatorScrollView