diff --git a/app/src/main/res/drawable/download_history.png b/app/src/main/res/drawable/download_history.png
new file mode 100644
index 0000000000000000000000000000000000000000..599dd4c208fde7f3524d2d82ba4bb1c7cda67bf2
Binary files /dev/null and b/app/src/main/res/drawable/download_history.png differ
diff --git a/app/src/main/res/drawable/keluar.png b/app/src/main/res/drawable/keluar.png
new file mode 100644
index 0000000000000000000000000000000000000000..897d53f241c4c79740d304e39d53dc7f52a25f8b
Binary files /dev/null and b/app/src/main/res/drawable/keluar.png differ
diff --git a/app/src/main/res/drawable/upload_history.png b/app/src/main/res/drawable/upload_history.png
new file mode 100644
index 0000000000000000000000000000000000000000..58fd5642d44764f68a1226edc086f28fe16a1959
Binary files /dev/null and b/app/src/main/res/drawable/upload_history.png differ
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index 94dab2bff84afce818241b05dcde2774ac65d623..353d9149e4c8164d85c1c7926dbe46d866a8a4ee 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -3,12 +3,32 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
     tools:context=".ui.settings.SettingsFragment"
     android:paddingHorizontal="24dp"
     android:background="@color/primaryBlue">
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <TextView
+            android:id="@+id/twibbon_header_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:fontFamily="@font/montserrat"
+            android:text="@string/setting_header"
+            android:textColor="@color/white"
+            android:textSize="20sp"
+            android:layout_marginVertical="8dp"
+            android:layout_gravity="center"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
     <ImageView
-        android:layout_marginTop="20dp"
+        android:layout_marginTop="60dp"
         android:src="@drawable/logo"
         android:contentDescription="@string/logo"
         android:layout_width="100dp"
@@ -33,14 +53,11 @@
         android:layout_height="wrap_content"
         android:orientation="horizontal"
         android:gravity="center">
-        <ImageView
-            android:layout_width="50dp"
-            android:layout_height="50dp"
-            android:src="@drawable/icon_setting"/>
-        <Button
+        <ImageButton
             android:id="@+id/btn_settings"
-            android:layout_width="match_parent"
-            android:layout_height="80dp"
+            android:layout_width="350dp"
+            android:layout_height="88dp"
+            android:background="@drawable/download_history"
             android:text="Settings"/>
     </LinearLayout>
 
@@ -50,15 +67,12 @@
         android:layout_height="wrap_content"
         android:orientation="horizontal"
         android:gravity="center">
-        <ImageView
-            android:layout_width="50dp"
-            android:layout_height="50dp"
-            android:src="@drawable/icon_setting"/>
-        <Button
+        <ImageButton
             android:id="@+id/btn_upload_history"
-            android:layout_width="match_parent"
-            android:layout_height="80dp"
-            android:text="Upload History"/>
+            android:layout_width="350dp"
+            android:layout_height="88dp"
+            android:background="@drawable/upload_history"
+            android:text="Settings"/>
     </LinearLayout>
 
     <LinearLayout
@@ -67,15 +81,12 @@
         android:layout_height="wrap_content"
         android:orientation="horizontal"
         android:gravity="center">
-        <ImageView
-            android:layout_width="50dp"
-            android:layout_height="50dp"
-            android:src="@drawable/icon_setting"/>
-        <Button
+        <ImageButton
             android:id="@+id/btn_keluar"
-            android:layout_width="match_parent"
-            android:layout_height="80dp"
-            android:text="Keluar"/>
+            android:layout_width="350dp"
+            android:layout_height="88dp"
+            android:background="@drawable/keluar"
+            android:text="Settings"/>
     </LinearLayout>
 
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ecf7e71f56d22f5f398063aed142da7187f1cfdc..0c980ab52b12a2f5c2441c6912a16d384d3ea5f2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -41,7 +41,7 @@
     <string name="expense">Pengeluaran</string>
     <string name="all">Semua</string>
 
-
-
+    <!--    Settings-->
+    <string name="setting_header">Setting</string>
 
 </resources>