diff --git a/app/src/main/res/drawable/ic_logo.png b/app/src/main/res/drawable/ic_logo.png
index ec727bb458122581b1579079bc02db305b2a7492..2134aa4412ce2e477ed641dbbd734142bd508931 100644
Binary files a/app/src/main/res/drawable/ic_logo.png and b/app/src/main/res/drawable/ic_logo.png differ
diff --git a/app/src/main/res/drawable/rounded_button.xml b/app/src/main/res/drawable/rounded_button.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a88bb57c37103a35c84581a65f40bc332b6911b9
--- /dev/null
+++ b/app/src/main/res/drawable/rounded_button.xml
@@ -0,0 +1,5 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="10dp" />
+    <solid android:color="@color/primary1" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/font/urbanist.otf b/app/src/main/res/font/urbanist.otf
new file mode 100644
index 0000000000000000000000000000000000000000..ee43ad5d1938e34d4e995ce06ea84b62f7b206a8
Binary files /dev/null and b/app/src/main/res/font/urbanist.otf differ
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 59a22689342126baef6bac0b428e3a623097f074..f38516e625550d74f49a458b3ab445ff3ac69633 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -7,9 +7,9 @@
 
     <ImageView
         android:id="@+id/ivLogo"
-        android:layout_width="350dp"
-        android:layout_height="150dp"
-        android:layout_marginTop="80dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="40dp"
         android:src="@drawable/ic_logo"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.466"
@@ -21,7 +21,7 @@
         android:id="@+id/etUsername"
         android:layout_width="0dp"
         android:layout_height="60dp"
-        android:layout_marginTop="84dp"
+        android:layout_marginTop="175dp"
         android:hint="Enter your email"
         android:inputType="text"
         android:background="@color/textfield"
@@ -52,9 +52,8 @@
         android:id="@+id/btnLogin"
         android:layout_width="0dp"
         android:layout_height="70dp"
-        android:layout_marginTop="104dp"
-        android:backgroundTint="@color/primary1"
-
+        android:layout_marginTop="174dp"
+        android:background="@drawable/rounded_button"
         android:text="Login"
         android:textAllCaps="false"
         android:textColor="#FFFFFF"
diff --git a/app/src/main/res/layout/activity_twibbon.xml b/app/src/main/res/layout/activity_twibbon.xml
index 1687452aa260ed6c5f619f7bb04a04087e087816..b26d1e9375b332d06cc8281b8ae3f9f04c86cc36 100644
--- a/app/src/main/res/layout/activity_twibbon.xml
+++ b/app/src/main/res/layout/activity_twibbon.xml
@@ -10,6 +10,7 @@
         android:id="@+id/header"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:background="@color/primary1"
         android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
         app:layout_constraintTop_toTopOf="parent">
 
@@ -19,8 +20,9 @@
             android:layout_gravity="center"
             android:layout_marginVertical="8dp"
             android:text="@string/twibbon"
-            android:textColor="@color/black"
-            android:textSize="20sp"
+            android:textColor="#FFFFFF"
+            android:textSize="24sp"
+            android:fontFamily="@font/urbanist"
             android:textStyle="bold" />
     </com.google.android.material.appbar.AppBarLayout>
 
diff --git a/app/src/main/res/layout/fragment_graph.xml b/app/src/main/res/layout/fragment_graph.xml
index f6e9ebc7f0a051c11e6fb04b7396d69ad63a16f5..05d43c02768d246bfe84cc88214e9deef8a9e958 100644
--- a/app/src/main/res/layout/fragment_graph.xml
+++ b/app/src/main/res/layout/fragment_graph.xml
@@ -9,6 +9,7 @@
         android:id="@+id/header"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:background="@color/primary1"
         android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
         app:layout_constraintTop_toTopOf="parent">
 
@@ -18,8 +19,9 @@
             android:layout_gravity="center"
             android:layout_marginVertical="8dp"
             android:text="@string/grafik"
-            android:textColor="@color/black"
-            android:textSize="20sp"
+            android:textColor="#FFFFFF"
+            android:textSize="24sp"
+            android:fontFamily="@font/urbanist"
             android:textStyle="bold" />
     </com.google.android.material.appbar.AppBarLayout>
 
diff --git a/app/src/main/res/layout/fragment_scan.xml b/app/src/main/res/layout/fragment_scan.xml
index 00efe4bac86b3c7fa24942af40dbc75d4ff221ed..8ea63064beb53c6c5d8cf12875746edbe74161da 100644
--- a/app/src/main/res/layout/fragment_scan.xml
+++ b/app/src/main/res/layout/fragment_scan.xml
@@ -10,6 +10,7 @@
         android:id="@+id/header"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:background="@color/primary1"
         android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
         app:layout_constraintTop_toTopOf="parent">
 
@@ -19,8 +20,9 @@
             android:layout_gravity="center"
             android:layout_marginVertical="8dp"
             android:text="@string/scan"
-            android:textColor="@color/black"
-            android:textSize="20sp"
+            android:textColor="#FFFFFF"
+            android:textSize="24sp"
+            android:fontFamily="@font/urbanist"
             android:textStyle="bold" />
     </com.google.android.material.appbar.AppBarLayout>
 
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index c924a984b394e65479ed65451f0753cc583716da..e0755bb38c02ce270e64cb5743da4947ed409e0a 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -10,6 +10,7 @@
         android:id="@+id/header"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:background="@color/primary1"
         android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
         app:layout_constraintTop_toTopOf="parent">
 
@@ -19,8 +20,9 @@
             android:layout_gravity="center"
             android:layout_marginVertical="8dp"
             android:text="@string/pengaturan"
-            android:textColor="@color/black"
-            android:textSize="20sp"
+            android:textColor="#FFFFFF"
+            android:textSize="24sp"
+            android:fontFamily="@font/urbanist"
             android:textStyle="bold" />
     </com.google.android.material.appbar.AppBarLayout>
 
diff --git a/app/src/main/res/layout/fragment_transaction.xml b/app/src/main/res/layout/fragment_transaction.xml
index 485423905ddc31f3cc8d68c1cce90522caabd289..7a779ece859eef4d4a9a9cafe145d40fb3055328 100644
--- a/app/src/main/res/layout/fragment_transaction.xml
+++ b/app/src/main/res/layout/fragment_transaction.xml
@@ -10,6 +10,7 @@
         android:id="@+id/header"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:background="@color/primary1"
         android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
         app:layout_constraintTop_toTopOf="parent">
 
@@ -19,8 +20,9 @@
             android:layout_gravity="center"
             android:layout_marginVertical="8dp"
             android:text="@string/transaksi"
-            android:textColor="@color/black"
-            android:textSize="20sp"
+            android:textColor="#FFFFFF"
+            android:textSize="24sp"
+            android:fontFamily="@font/urbanist"
             android:textStyle="bold" />
     </com.google.android.material.appbar.AppBarLayout>
 
diff --git a/app/src/main/res/layout/fragment_transaction_input.xml b/app/src/main/res/layout/fragment_transaction_input.xml
index 35219c2f5c8b46f3153c93c901c455a5190ce29f..2f85b54499a714f3a04a113e685a1e273c7c63a7 100644
--- a/app/src/main/res/layout/fragment_transaction_input.xml
+++ b/app/src/main/res/layout/fragment_transaction_input.xml
@@ -11,6 +11,7 @@
         android:id="@+id/header"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:background="@color/primary1"
         android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
         app:layout_constraintTop_toTopOf="parent">
 
@@ -20,8 +21,9 @@
             android:layout_gravity="center"
             android:layout_marginVertical="8dp"
             android:text="@string/transaksi"
-            android:textColor="@color/black"
-            android:textSize="20sp"
+            android:textColor="#FFFFFF"
+            android:textSize="24sp"
+            android:fontFamily="@font/urbanist"
             android:textStyle="bold" />
     </com.google.android.material.appbar.AppBarLayout>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 9c62daf94e2a79bf1708a5a8c3a59991de5e5050..d621530fd0c0dcdd18911a5e7b86fcc45ebe3e64 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -10,5 +10,6 @@
         <item name="colorPrimary">@color/white</item>
         <item name="colorPrimaryDark">@color/primary1</item>
         <item name="colorAccent">@color/primary2</item>
+        <item name="android:fontFamily">@font/urbanist</item>
     </style>
 </resources>
\ No newline at end of file