diff --git a/android/app/src/main/res/drawable-v24/button_round.xml b/android/app/src/main/res/drawable-v24/button_round.xml
new file mode 100644
index 0000000000000000000000000000000000000000..569ef5a873e5c435df0b53c35bd9a07bc11f99a2
--- /dev/null
+++ b/android/app/src/main/res/drawable-v24/button_round.xml
@@ -0,0 +1,5 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/colorAccent" />
+    <corners android:radius="50dp" />
+</shape>
\ No newline at end of file
diff --git a/android/app/src/main/res/layout/activity_auth.xml b/android/app/src/main/res/layout/activity_auth.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d09dc4d16b616ee1fa898e566bddd76ecbd3b4d4
--- /dev/null
+++ b/android/app/src/main/res/layout/activity_auth.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".AuthActivity">
+
+    <LinearLayout
+        android:id="@+id/auth_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:layout_marginLeft="48dp"
+        android:layout_marginRight="48dp"
+        android:orientation="vertical">
+
+        <!-- Etsi logo and title -->
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginBottom="24dp"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:layout_width="200dp"
+                android:layout_height="100dp"
+                android:src="@drawable/logo_dark" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+            <!-- form nama -->
+
+            <EditText
+                android:id="@+id/auth_name"
+                style="@style/auth_form_input"
+                android:layout_margin="3dp"
+                android:hint="@string/name"
+                android:inputType="textPersonName" />
+
+            <!-- form email -->
+            <EditText
+                android:id="@+id/auth_email"
+                style="@style/auth_form_input"
+                android:layout_margin="3dp"
+                android:hint="@string/email"
+                android:inputType="textEmailAddress" />
+
+            <!-- form password -->
+            <EditText
+                android:id="@+id/auth_password"
+                style="@style/auth_form_input"
+                android:layout_margin="3dp"
+                android:hint="@string/password"
+                android:inputType="textPassword" />
+
+            <!-- form konfirmasi password -->
+            <EditText
+                android:id="@+id/auth_confirm"
+                style="@style/auth_form_input"
+                android:layout_margin="3dp"
+                android:hint="@string/confirm"
+                android:inputType="textPassword" />
+
+            <!-- TODO: add role checkbox -->
+
+            <Button
+                android:id="@+id/auth_login"
+                style="@style/normal_button"
+                android:onClick="login"
+                android:background="@drawable/button_round"
+                android:text="@string/login" />
+
+            <Button
+                android:id="@+id/auth_register"
+                style="@style/normal_button"
+                android:onClick="register"
+                android:background="@drawable/button_round"
+                android:layout_marginBottom="20dp"
+                android:text="@string/register" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="4dp"
+                android:gravity="center"
+                android:padding="4dp"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/auth_word"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:padding="4dp"
+                    android:text="@string/register_word"
+                    android:textColor="@color/colorPrimaryDark"
+                    android:textSize="@dimen/small_text"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/auth_switch"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:onClick="switchAction"
+                    android:padding="4dp"
+                    android:text="@string/register"
+                    android:textSize="@dimen/small_text"
+                    android:textStyle="bold" />
+
+            </LinearLayout>
+        </LinearLayout>
+
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/photoshop_assets/ChatManLogo.png b/photoshop_assets/ChatManLogo.png
new file mode 100644
index 0000000000000000000000000000000000000000..be8c4c6ccaf082f84b25233151331f49c7468cd5
Binary files /dev/null and b/photoshop_assets/ChatManLogo.png differ
diff --git a/photoshop_assets/ChatManLogo.psd b/photoshop_assets/ChatManLogo.psd
new file mode 100644
index 0000000000000000000000000000000000000000..34b84f1599199820561b05c9b198e74293b3858c
Binary files /dev/null and b/photoshop_assets/ChatManLogo.psd differ
diff --git a/photoshop_assets/chat.png b/photoshop_assets/chat.png
new file mode 100644
index 0000000000000000000000000000000000000000..2cdc69434de1393b5e1264b27fb3dbd096814541
Binary files /dev/null and b/photoshop_assets/chat.png differ