diff --git a/.idea/misc.xml b/.idea/misc.xml
index 867daff..97e4e27 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -6,9 +6,14 @@
         <entry key="..\:/Users/Student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/layout/fragment_home.xml" value="0.1" />
         <entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/drawable/flame_style.xml" value="0.3907407407407407" />
         <entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/drawable/frame_style.xml" value="0.3907407407407407" />
+        <entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/drawable/ic_baseline_add.xml" value="0.45487179487179485" />
         <entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/drawable/ic_baseline_border_color.xml" value="0.3824074074074074" />
         <entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/drawable/ic_baseline_fast_forward_24.xml" value="0.3824074074074074" />
         <entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/drawable/ic_baseline_fast_rewind.xml" value="0.3824074074074074" />
+        <entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/drawable/ic_baseline_group_add.xml" value="0.45487179487179485" />
+        <entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/drawable/ic_baseline_horizontal_rule.xml" value="0.45487179487179485" />
+        <entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/drawable/ic_baseline_keyboard_arrow_left.xml" value="0.45487179487179485" />
+        <entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/drawable/ic_baseline_keyboard_arrow_right.xml" value="0.45487179487179485" />
         <entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/drawable/ic_baseline_library_add.xml" value="0.3824074074074074" />
         <entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/drawable/ic_baseline_palette_24.xml" value="0.3824074074074074" />
         <entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/drawable/ic_baseline_pause.xml" value="0.3824074074074074" />
diff --git a/app/src/main/res/drawable/ic_baseline_add.xml b/app/src/main/res/drawable/ic_baseline_add.xml
new file mode 100644
index 0000000..dcbf71a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_add.xml
@@ -0,0 +1,15 @@
+<vector
+    android:height="50dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    android:width="50dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <group>
+        <path android:name="backgroiud"
+            android:fillColor="#BAF14B16"
+            android:pathData="M0,0 L24,0 L24,24 L0,24 z" />
+        <path
+            android:fillColor="@color/white"
+            android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+    </group>
+</vector>
diff --git a/app/src/main/res/drawable/ic_baseline_horizontal_rule.xml b/app/src/main/res/drawable/ic_baseline_horizontal_rule.xml
new file mode 100644
index 0000000..3dcc8fb
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_horizontal_rule.xml
@@ -0,0 +1,16 @@
+<vector
+    android:height="50dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    android:width="50dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <group>
+        <path android:name="backgroiud"
+            android:fillColor="#BAF14B16"
+            android:pathData="M0,0 L24,0 L24,24 L0,24 z" />
+        <path
+            android:fillColor="@color/white"
+            android:fillType="evenOdd"
+            android:pathData="M4,11h16v2h-16z"/>
+    </group>
+</vector>
diff --git a/app/src/main/res/drawable/ic_baseline_keyboard_arrow_left.xml b/app/src/main/res/drawable/ic_baseline_keyboard_arrow_left.xml
new file mode 100644
index 0000000..770a7db
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_keyboard_arrow_left.xml
@@ -0,0 +1,16 @@
+<vector
+    android:autoMirrored="true"
+    android:height="50dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    android:width="50dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <group>
+        <path android:name="backgroiud"
+            android:fillColor="#BAF14B16"
+            android:pathData="M0,0 L24,0 L24,24 L0,24 z" />
+        <path
+            android:fillColor="@color/white"
+            android:pathData="M15.41,16.59L10.83,12l4.58,-4.59L14,6l-6,6 6,6 1.41,-1.41z"/>
+    </group>
+</vector>
diff --git a/app/src/main/res/drawable/ic_baseline_keyboard_arrow_right.xml b/app/src/main/res/drawable/ic_baseline_keyboard_arrow_right.xml
new file mode 100644
index 0000000..ba50375
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_keyboard_arrow_right.xml
@@ -0,0 +1,16 @@
+<vector
+    android:autoMirrored="true"
+    android:height="50dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    android:width="50dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <group>
+        <path android:name="backgroiud"
+            android:fillColor="#BAF14B16"
+            android:pathData="M0,0 L24,0 L24,24 L0,24 z" />
+        <path
+            android:fillColor="@color/white"
+            android:pathData="M8.59,16.59L13.17,12 8.59,7.41 10,6l6,6 -6,6 -1.41,-1.41z"/>
+    </group>
+</vector>
diff --git a/app/src/main/res/layout/activity_page.xml b/app/src/main/res/layout/activity_page.xml
index 1c75869..380d988 100644
--- a/app/src/main/res/layout/activity_page.xml
+++ b/app/src/main/res/layout/activity_page.xml
@@ -18,82 +18,77 @@
 
     </WebView>
 
-    <Button
-        android:id="@+id/button_delPage"
-        android:layout_width="72dp"
-        android:layout_height="72dp"
-        android:layout_marginEnd="256dp"
-        android:layout_marginBottom="32dp"
-        android:background="@android:drawable/presence_online"
-        android:backgroundTint="#FF4545"
-        android:onClick="onClickDeletePage"
-        android:text="-"
-        android:textColor="#FFFFFF"
-        app:iconTint="#C32828"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/buttonBack" />
-
-    <TextView
-        android:id="@+id/textPageNo"
-        android:layout_width="97dp"
-        android:layout_height="48dp"
-        android:layout_marginTop="8dp"
-        android:autoText="false"
-        android:background="#00FFFFFF"
-        android:drawableBottom="@android:drawable/list_selector_background"
-        android:gravity="center_horizontal|center_vertical"
-        android:text="pageNo"
-        android:textColor="#000000"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/pageWebview" />
-
-    <Button
-        android:id="@+id/buttonBack"
-        android:layout_width="71dp"
-        android:layout_height="48dp"
-        android:layout_marginTop="8dp"
-        android:background="@android:drawable/ic_media_previous"
-        android:backgroundTint="#000000"
-        android:onClick="onClickToBackPage"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/textPageNo"
-        app:layout_constraintStart_toStartOf="parent"
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal"
+        android:gravity="center|center_horizontal"
         app:layout_constraintTop_toTopOf="parent"
-        tools:ignore="SpeakableTextPresentCheck" />
+        tools:layout_editor_absoluteX="0dp">
 
-    <Button
-        android:id="@+id/buttonNext"
-        android:layout_width="83dp"
-        android:layout_height="53dp"
-        android:layout_marginTop="8dp"
-        android:background="@android:drawable/ic_media_next"
-        android:backgroundTint="#000000"
-        android:onClick="onClickToAdvancePage"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="@+id/pageWebview"
-        app:layout_constraintStart_toEndOf="@+id/textPageNo"
+        <org.ntlab.acanthus_client.views.button.PushButton
+            android:id="@+id/buttonBack"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:background="@drawable/ic_baseline_keyboard_arrow_left"
+            android:onClick="onClickToBackPage"
+            tools:ignore="SpeakableTextPresentCheck" />
+        <TextView
+            android:id="@+id/textPageNo"
+            android:layout_width="80dp"
+            android:layout_height="80dp"
+            android:layout_marginLeft="50dp"
+            android:layout_marginRight="50dp"
+            android:textSize="50dp"
+            android:textColor="@color/white"
+            android:textStyle="bold"
+            android:background="#BAF14B16"
+            android:drawableBottom="@android:drawable/list_selector_background"
+            android:gravity="center|center_horizontal"
+            android:text="pageNo" />
+        <org.ntlab.acanthus_client.views.button.PushButton
+            android:id="@+id/buttonNext"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:background="@drawable/ic_baseline_keyboard_arrow_right"
+            android:onClick="onClickToAdvancePage"
+            tools:ignore="SpeakableTextPresentCheck" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:layout_marginBottom="30dp"
+        android:layout_weight="0.001"
+        android:gravity="bottom|center_vertical"
         app:layout_constraintTop_toTopOf="parent"
-        tools:ignore="SpeakableTextPresentCheck" />
+        tools:layout_editor_absoluteX="0dp">
 
-    <Button
-        android:id="@+id/button_addPage"
-        android:layout_width="72dp"
-        android:layout_height="72dp"
-        android:layout_marginStart="256dp"
-        android:layout_marginBottom="32dp"
-        android:background="@android:drawable/presence_online"
-        android:backgroundTint="#FF4545"
-        android:onClick="onClickAddPage"
-        android:text="+"
-        android:textColor="#FFFFFF"
-        app:iconTint="#C32828"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/buttonNext" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:layout_marginRight="30dp"
+            android:gravity="right">
+
+            <org.ntlab.acanthus_client.views.button.PushButton
+                android:id="@+id/button_addPage"
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:layout_marginBottom="15dp"
+                android:background="@drawable/ic_baseline_add"
+                android:onClick="onClickAddPage" />
+            <org.ntlab.acanthus_client.views.button.PushButton
+                android:id="@+id/button_delPage"
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:background="@drawable/ic_baseline_horizontal_rule"
+                android:onClick="onClickDeletePage" />
+
+        </LinearLayout>
+
+    </LinearLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file