diff --git a/app/src/main/res/drawable/button_new.xml b/app/src/main/res/drawable/button_new.xml
new file mode 100644
index 0000000..41f58b5
--- /dev/null
+++ b/app/src/main/res/drawable/button_new.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?attr/colorControlHighlight">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@color/white" />
+            <corners android:radius="20dp" />
+            <stroke android:color="@color/red" android:width="1dp" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_kit_scan.xml b/app/src/main/res/layout/activity_kit_scan.xml
index 8f371cc..b07d3d9 100644
--- a/app/src/main/res/layout/activity_kit_scan.xml
+++ b/app/src/main/res/layout/activity_kit_scan.xml
@@ -124,13 +124,15 @@
 
     </com.google.android.material.textfield.TextInputLayout>
 
-    <com.google.android.material.button.MaterialButton
+    <androidx.appcompat.widget.AppCompatButton
         android:id="@+id/btn_go"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="24dp"
         android:text="@string/go"
         app:cornerRadius="16dp"
+        android:textColor="@color/red"
+        android:background="@drawable/button_new"
         app:layout_constraintBottom_toBottomOf="@id/et_abha_id"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="1.0"
diff --git a/app/src/main/res/layout/fragment_assurance_controls.xml b/app/src/main/res/layout/fragment_assurance_controls.xml
index c343a7e..ef85303 100644
--- a/app/src/main/res/layout/fragment_assurance_controls.xml
+++ b/app/src/main/res/layout/fragment_assurance_controls.xml
@@ -71,7 +71,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/spinner_concentration" />
 
-    <Button
+    <androidx.appcompat.widget.AppCompatButton
         android:id="@+id/btn_submit"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -80,8 +80,9 @@
         android:clickable="false"
         android:gravity="center"
         android:text="Continue"
-        android:textColor="@color/white"
+        android:textColor="@color/red"
         app:cornerRadius="16dp"
+        android:background="@drawable/button_new"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/et_readings_per_sample" />
diff --git a/app/src/main/res/layout/fragment_auto_dac.xml b/app/src/main/res/layout/fragment_auto_dac.xml
index 26eee95..09e6330 100644
--- a/app/src/main/res/layout/fragment_auto_dac.xml
+++ b/app/src/main/res/layout/fragment_auto_dac.xml
@@ -58,30 +58,36 @@
         app:layout_constraintTop_toBottomOf="@id/tv_subtitle3" />
 
 
-    <Button
+    <androidx.appcompat.widget.AppCompatButton
         android:id="@+id/btn_submit"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="16dp"
         android:layout_marginTop="24dp"
         android:clickable="false"
+        android:paddingRight="5dp"
+        android:paddingLeft="5dp"
+        android:background="@drawable/button_new"
         android:gravity="center"
         android:text="Start Auto DAC"
-        android:textColor="@color/white"
+        android:textColor="@color/red"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tv_subtitle4" />
 
-    <Button
+    <androidx.appcompat.widget.AppCompatButton
         android:id="@+id/btn_read_dac"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="16dp"
+        android:paddingRight="5dp"
+        android:paddingLeft="5dp"
         android:layout_marginTop="24dp"
         android:clickable="false"
         android:gravity="center"
         android:text="Read Current DAC Values"
-        android:textColor="@color/white"
+        android:textColor="@color/red"
+        android:background="@drawable/button_new"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/btn_submit" />
diff --git a/app/src/main/res/layout/fragment_blank.xml b/app/src/main/res/layout/fragment_blank.xml
index 26eee95..9a8a4b4 100644
--- a/app/src/main/res/layout/fragment_blank.xml
+++ b/app/src/main/res/layout/fragment_blank.xml
@@ -58,30 +58,36 @@
         app:layout_constraintTop_toBottomOf="@id/tv_subtitle3" />
 
 
-    <Button
+    <androidx.appcompat.widget.AppCompatButton
         android:id="@+id/btn_submit"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="16dp"
+        android:paddingLeft="5dp"
+        android:paddingRight="5dp"
         android:layout_marginTop="24dp"
         android:clickable="false"
         android:gravity="center"
+        android:background="@drawable/button_new"
         android:text="Start Auto DAC"
-        android:textColor="@color/white"
+        android:textColor="@color/red"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tv_subtitle4" />
 
-    <Button
+    <androidx.appcompat.widget.AppCompatButton
         android:id="@+id/btn_read_dac"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="16dp"
         android:layout_marginTop="24dp"
+        android:paddingRight="5dp"
+        android:paddingLeft="5dp"
         android:clickable="false"
         android:gravity="center"
+        android:background="@drawable/button_new"
         android:text="Read Current DAC Values"
-        android:textColor="@color/white"
+        android:textColor="@color/red"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/btn_submit" />
diff --git a/app/src/main/res/layout/fragment_calibration.xml b/app/src/main/res/layout/fragment_calibration.xml
index 34e0393..4f3bccd 100644
--- a/app/src/main/res/layout/fragment_calibration.xml
+++ b/app/src/main/res/layout/fragment_calibration.xml
@@ -194,17 +194,20 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tv_subtitle3" />
 
-    <Button
+    <androidx.appcompat.widget.AppCompatButton
         android:id="@+id/btn_submit"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="16dp"
         android:layout_marginTop="10dp"
         android:clickable="false"
+        android:paddingLeft="5dp"
+        android:paddingRight="5dp"
         android:gravity="center"
         android:text="Save"
+        android:background="@drawable/button_new"
         app:cornerRadius="100dp"
-        android:textColor="@color/white"
+        android:textColor="@color/red"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tv_subtitle4" />
diff --git a/app/src/main/res/layout/fragment_diagnostics.xml b/app/src/main/res/layout/fragment_diagnostics.xml
index 7b96f9b..49a5ab1 100644
--- a/app/src/main/res/layout/fragment_diagnostics.xml
+++ b/app/src/main/res/layout/fragment_diagnostics.xml
@@ -58,7 +58,7 @@
         app:layout_constraintTop_toBottomOf="@id/tv_subtitle3" />
 
 
-    <Button
+    <androidx.appcompat.widget.AppCompatButton
         android:id="@+id/btn_submit"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -66,8 +66,9 @@
         android:layout_marginTop="24dp"
         android:clickable="false"
         android:gravity="center"
+        android:background="@drawable/button_new"
         android:text="Start"
-        android:textColor="@color/white"
+        android:textColor="@color/red"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tv_subtitle4" />
diff --git a/app/src/main/res/layout/fragment_hemo_cube_buffer_check.xml b/app/src/main/res/layout/fragment_hemo_cube_buffer_check.xml
index 5c5c357..c496937 100644
--- a/app/src/main/res/layout/fragment_hemo_cube_buffer_check.xml
+++ b/app/src/main/res/layout/fragment_hemo_cube_buffer_check.xml
@@ -98,7 +98,7 @@
         <!--            app:layout_constraintTop_toBottomOf="@id/btn_submit" />-->
 
 
-        <Button
+        <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/btn_submit"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -106,7 +106,8 @@
             android:layout_marginTop="24dp"
             android:clickable="false"
             android:text="@string/submit"
-            android:textColor="@color/white"
+            android:textColor="@color/red"
+            android:background="@drawable/button_new"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tv_subtitle4" />
diff --git a/app/src/main/res/layout/fragment_hemo_cube_reference.xml b/app/src/main/res/layout/fragment_hemo_cube_reference.xml
index 771f8be..efe002e 100644
--- a/app/src/main/res/layout/fragment_hemo_cube_reference.xml
+++ b/app/src/main/res/layout/fragment_hemo_cube_reference.xml
@@ -135,13 +135,15 @@
 
         </com.google.android.material.textfield.TextInputLayout>
 
-        <com.google.android.material.button.MaterialButton
+        <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/btn_go"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_margin="24dp"
             android:text="@string/go"
             app:cornerRadius="16dp"
+            android:textColor="@color/red"
+            android:background="@drawable/button_new"
             app:layout_constraintBottom_toBottomOf="@id/et_abha_id"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="1.0"
@@ -164,7 +166,7 @@
 
 
 
-        <Button
+        <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/btn_placebuffer"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -172,7 +174,8 @@
             android:layout_marginTop="24dp"
             android:clickable="false"
             android:text="@string/place_buffer"
-            android:textColor="@color/white"
+            android:background="@drawable/button_new"
+            android:textColor="@color/red"
             app:cornerRadius="16dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml
index 220ea5b..c29396d 100644
--- a/app/src/main/res/layout/fragment_login.xml
+++ b/app/src/main/res/layout/fragment_login.xml
@@ -84,12 +84,14 @@
                     android:maxLength="12" />
             </com.google.android.material.textfield.TextInputLayout>
 
-            <com.google.android.material.button.MaterialButton
+            <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/btnLogin"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
                 android:text="@string/login"
+                android:background="@drawable/button_new"
+                android:textColor="@color/red"
                 app:cornerRadius="16dp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/fragment_register_one_scan_abha.xml b/app/src/main/res/layout/fragment_register_one_scan_abha.xml
index c7a381e..75fe21e 100644
--- a/app/src/main/res/layout/fragment_register_one_scan_abha.xml
+++ b/app/src/main/res/layout/fragment_register_one_scan_abha.xml
@@ -108,13 +108,15 @@
                 android:inputType="number" />
         </com.google.android.material.textfield.TextInputLayout>
 
-        <com.google.android.material.button.MaterialButton
+        <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/btn_go"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_margin="24dp"
             android:text="@string/go"
             app:cornerRadius="16dp"
+            android:background="@drawable/button_new"
+            android:textColor="@color/red"
             app:layout_constraintBottom_toBottomOf="@id/et_abha_id"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="1.0"
diff --git a/app/src/main/res/layout/fragment_register_two_aadhaar.xml b/app/src/main/res/layout/fragment_register_two_aadhaar.xml
index a223323..4b14e71 100644
--- a/app/src/main/res/layout/fragment_register_two_aadhaar.xml
+++ b/app/src/main/res/layout/fragment_register_two_aadhaar.xml
@@ -108,15 +108,17 @@
 
         </com.google.android.material.textfield.TextInputLayout>
 
-        <com.google.android.material.button.MaterialButton
+        <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/btn_go"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_margin="24dp"
             android:text="@string/go"
+            android:textColor="@color/red"
             app:cornerRadius="16dp"
             app:layout_constraintBottom_toBottomOf="@id/et_abha_id"
             app:layout_constraintEnd_toEndOf="parent"
+            android:background="@drawable/button_new"
             app:layout_constraintHorizontal_bias="1.0"
             app:layout_constraintStart_toEndOf="@id/et_abha_id"
             app:layout_constraintTop_toTopOf="@id/et_abha_id" />
diff --git a/app/src/main/res/layout/fragment_test_right_exp_reference.xml b/app/src/main/res/layout/fragment_test_right_exp_reference.xml
index e37d91a..bfca344 100644
--- a/app/src/main/res/layout/fragment_test_right_exp_reference.xml
+++ b/app/src/main/res/layout/fragment_test_right_exp_reference.xml
@@ -45,14 +45,15 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tv_subtitle1" />
 
-        <Button
+        <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/btn_set_reference"
             android:layout_width="192dp"
             android:layout_height="wrap_content"
             android:layout_margin="16dp"
             android:clickable="false"
             android:text="@string/set_reference"
-            android:textColor="@color/white"
+            android:background="@drawable/button_new"
+            android:textColor="@color/red"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tv_subtitle2" />
diff --git a/app/src/main/res/layout/fragment_test_right_exp_sample.xml b/app/src/main/res/layout/fragment_test_right_exp_sample.xml
index 34b063f..99cb1c9 100644
--- a/app/src/main/res/layout/fragment_test_right_exp_sample.xml
+++ b/app/src/main/res/layout/fragment_test_right_exp_sample.xml
@@ -222,7 +222,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tv_subtitle2" />
 
-            <Button
+            <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/btn_submit"
                 android:layout_width="216dp"
                 android:layout_height="wrap_content"
@@ -230,7 +230,8 @@
                 android:layout_marginTop="24dp"
                 android:clickable="false"
                 android:text="@string/submit"
-                android:textColor="@color/white"
+                android:background="@drawable/button_new"
+                android:textColor="@color/red"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tv_subtitle3" />
diff --git a/app/src/main/res/layout/fragment_trueheme_sample.xml b/app/src/main/res/layout/fragment_trueheme_sample.xml
index 4c24f6e..f97cf99 100644
--- a/app/src/main/res/layout/fragment_trueheme_sample.xml
+++ b/app/src/main/res/layout/fragment_trueheme_sample.xml
@@ -135,28 +135,32 @@
 
         </com.google.android.material.textfield.TextInputLayout>
 
-        <com.google.android.material.button.MaterialButton
+        <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/btn_go"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_margin="24dp"
             android:text="@string/go"
             app:cornerRadius="16dp"
+            android:background="@drawable/button_new"
+            android:textColor="@color/red"
             app:layout_constraintBottom_toBottomOf="@id/et_abha_id"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="1.0"
             app:layout_constraintStart_toEndOf="@id/et_abha_id"
             app:layout_constraintTop_toTopOf="@id/et_abha_id" />
-        <Button
+
+        <androidx.appcompat.widget.AppCompatButton
             android:visibility="gone"
             android:id="@+id/btn_samplestart"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginHorizontal="16dp"
             android:layout_marginTop="24dp"
+            android:background="@drawable/button_new"
             android:clickable="false"
             android:text="@string/Start_Sample"
-            android:textColor="@color/white"
+            android:textColor="@color/red"
             app:cornerRadius="16dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -164,7 +168,7 @@
 
 
 
-        <Button
+        <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/btn_placebuffer"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -172,7 +176,8 @@
             android:layout_marginTop="24dp"
             android:clickable="false"
             android:text="@string/place_buffer"
-            android:textColor="@color/white"
+            android:background="@drawable/button_new"
+            android:textColor="@color/red"
             app:cornerRadius="16dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/user_item_view.xml b/app/src/main/res/layout/user_item_view.xml
index 451e1c5..48221e8 100644
--- a/app/src/main/res/layout/user_item_view.xml
+++ b/app/src/main/res/layout/user_item_view.xml
@@ -89,6 +89,7 @@
                 android:layout_height="50dp"
                 android:layout_marginHorizontal="16dp"
                 android:text="@string/blood_group"
+                android:background="@color/red"
                 android:textColor="@color/white"
                 app:layout_constraintEnd_toStartOf="@+id/btn_startIncubation"
                 app:layout_constraintTop_toBottomOf="@id/teststatus" />