diff --git a/ui/src/main/java/com/wireguard/android/activity/LoginActivity.java b/ui/src/main/java/com/wireguard/android/activity/LoginActivity.java
index 97bc0ed..c3e8595 100644
--- a/ui/src/main/java/com/wireguard/android/activity/LoginActivity.java
+++ b/ui/src/main/java/com/wireguard/android/activity/LoginActivity.java
@@ -1,6 +1,7 @@
 package com.wireguard.android.activity;
 
 import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatButton;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
 
@@ -13,24 +14,19 @@ import android.view.View.OnClickListener;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.Toast;
-
 import com.wireguard.android.R;
 import com.wireguard.android.model.User;
 import com.wireguard.android.repository.DataRepository;
 import com.wireguard.android.resource.StatusResource;
 import com.wireguard.android.viewmodel.LoginViewModel;
 
-import javax.security.cert.CertificateEncodingException;
-import javax.security.cert.CertificateException;
-import javax.security.cert.X509Certificate;
-
 public class LoginActivity extends BaseActivityBubble {
 
     private LoginViewModel loginViewModel;
     private EditText bubbleName;
     private EditText userName;
     private EditText password;
-    private Button sign;
+    private AppCompatButton sign;
 
     private static final String BASE_URL_PREFIX = "https://";
     private static final String BASE_URL_SUFFIX = ":1443/api/";
diff --git a/ui/src/main/res/drawable/bubble_top.png b/ui/src/main/res/drawable/bubble_top.png
new file mode 100644
index 0000000..c5c4835
Binary files /dev/null and b/ui/src/main/res/drawable/bubble_top.png differ
diff --git a/ui/src/main/res/drawable/curves.jpg b/ui/src/main/res/drawable/curves.jpg
new file mode 100644
index 0000000..66ed705
Binary files /dev/null and b/ui/src/main/res/drawable/curves.jpg differ
diff --git a/ui/src/main/res/drawable/rectangle.xml b/ui/src/main/res/drawable/rectangle.xml
new file mode 100644
index 0000000..e7cce7d
--- /dev/null
+++ b/ui/src/main/res/drawable/rectangle.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/listview_background_shape">
+    <stroke android:width="2dp" android:color="#E3E3E4" />
+    <padding android:left="2dp"
+        android:top="2dp"
+        android:right="2dp"
+        android:bottom="2dp" />
+    <corners android:radius="5dp" />
+    <solid android:color="#ffffffff" />
+</shape>
\ No newline at end of file
diff --git a/ui/src/main/res/drawable/sign_in_button.xml b/ui/src/main/res/drawable/sign_in_button.xml
new file mode 100644
index 0000000..a7c7893
--- /dev/null
+++ b/ui/src/main/res/drawable/sign_in_button.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+<item android:state_pressed="true">
+    <shape android:shape="rectangle">
+        <solid android:color="@color/white" />
+        <corners android:radius="100dp" />
+    </shape>
+</item>
+
+<item>
+    <shape android:shape="rectangle">
+        <gradient android:endColor="#DF9BDF" android:startColor="#F597C8" />
+        <corners android:radius="100dp" />
+    </shape>
+</item>
+</selector>
diff --git a/ui/src/main/res/font/josefin_sans.ttf b/ui/src/main/res/font/josefin_sans.ttf
new file mode 100644
index 0000000..d234c43
Binary files /dev/null and b/ui/src/main/res/font/josefin_sans.ttf differ
diff --git a/ui/src/main/res/font/josefin_sans_bold.ttf b/ui/src/main/res/font/josefin_sans_bold.ttf
new file mode 100644
index 0000000..7541bf0
Binary files /dev/null and b/ui/src/main/res/font/josefin_sans_bold.ttf differ
diff --git a/ui/src/main/res/font/lato.ttf b/ui/src/main/res/font/lato.ttf
new file mode 100644
index 0000000..04ea8ef
Binary files /dev/null and b/ui/src/main/res/font/lato.ttf differ
diff --git a/ui/src/main/res/layout/activity_login.xml b/ui/src/main/res/layout/activity_login.xml
index ff9b13d..f5de9ff 100644
--- a/ui/src/main/res/layout/activity_login.xml
+++ b/ui/src/main/res/layout/activity_login.xml
@@ -7,84 +7,171 @@
     android:layout_height="match_parent"
     tools:context="com.wireguard.android.activity.LoginActivity">
 
+
+    <ImageView
+        android:id="@+id/color_curve"
+        android:layout_width="432dp"
+        android:layout_height="421dp"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentTop="true"
+        android:layout_marginBottom="432dp"
+        android:background="#00000000"
+        android:src="@drawable/curves"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <ImageView
+        android:id="@+id/imageView"
+        android:layout_width="54dp"
+        android:layout_height="67.42dp"
+        android:layout_marginTop="19dp"
+        android:src="@drawable/bubble_top"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.52"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.0" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="159dp"
+        android:layout_marginBottom="434dp"
+        android:fontFamily="@font/josefin_sans_bold"
+        android:text="@string/sign_in"
+        android:textColor="@color/black"
+        android:textSize="24sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.509"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.4" />
+
     <TextView
+        android:id="@+id/textView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:fontFamily="@font/lato"
         android:text="@string/bubble_name"
+        android:textColor="@color/black"
+        android:textSize="14sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.105" />
+        app:layout_constraintVertical_bias="0.367" />
 
     <EditText
         android:id="@+id/bubbleName"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textSize="18sp"
+        android:layout_width="254dp"
+        android:layout_height="55dp"
+        android:background="@drawable/rectangle"
+        android:hint="@string/enter_your_bubble_name"
+        android:textAlignment="center"
+        android:textColor="@color/black"
+        android:textSize="14sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.504"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.159" />
+        app:layout_constraintVertical_bias="0.424" />
 
     <TextView
+        android:id="@+id/textView4"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="160dp"
-        android:text="@string/user_name"
+        android:fontFamily="@font/lato"
+        android:text="@string/you_can_find_your_bubble_name_in_your_email"
+        android:textColor="#838383"
+        android:textSize="14sp"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.482"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:fontFamily="@font/lato"
+        android:text="@string/email"
+        android:textColor="@color/black"
+        android:textSize="14sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.55" />
+
     <EditText
         android:id="@+id/userName"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textSize="18sp"
+        android:layout_width="254dp"
+        android:layout_height="55dp"
+        android:background="@drawable/rectangle"
+        android:hint="@string/email_you_used_to_sign_up"
+        android:textAlignment="center"
+        android:textColor="@color/black"
+        android:textSize="14sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.504"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.276" />
+        app:layout_constraintVertical_bias="0.622" />
 
     <TextView
+        android:id="@+id/textView2"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:fontFamily="@font/lato"
         android:text="@string/password"
+        android:textColor="@color/black"
+        android:textSize="14sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.472"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.363" />
+        app:layout_constraintVertical_bias="0.703" />
 
     <EditText
         android:id="@+id/password"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:inputType="textPassword"
-        android:textSize="18sp"
+        android:layout_width="254dp"
+        android:layout_height="55dp"
+        android:background="@drawable/rectangle"
+        android:hint="@string/your_password"
+        android:textAlignment="center"
+        android:textColor="@color/black"
+        android:textSize="14sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.51"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.435" />
+        app:layout_constraintVertical_bias="0.785" />
 
-    <Button
-        android:id="@+id/signButton"
-        android:layout_width="95dp"
-        android:layout_height="49dp"
-        android:layout_marginBottom="272dp"
-        android:background="@color/secondary_color"
-        android:text="@string/sign_in"
-        android:textSize="15sp"
+    <LinearLayout
+        android:layout_width="257dp"
+        android:layout_height="53dp"
+        android:background="@color/white"
+        android:orientation="vertical"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.92">
+
+        <androidx.appcompat.widget.AppCompatButton
+            android:id="@+id/signButton"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@drawable/sign_in_button"
+            android:enabled="false"
+            android:text="@string/sign_in"
+            android:textAlignment="center"
+            android:textAllCaps="false"
+            android:textColor="@color/white"
+            android:textSize="15sp" />
+    </LinearLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/ui/src/main/res/values/colors.xml b/ui/src/main/res/values/colors.xml
index 38e173c..3c2d294 100644
--- a/ui/src/main/res/values/colors.xml
+++ b/ui/src/main/res/values/colors.xml
@@ -27,4 +27,7 @@
     <color name="warning_tag_color">#aaaa00</color>
 
     <color name="colorPrimaryDark">#C04B26</color>
+
+    <!--Bubble Colors-->
+    <color name="black">#333333</color>
 </resources>
diff --git a/ui/src/main/res/values/strings.xml b/ui/src/main/res/values/strings.xml
index 9085aff..e483276 100644
--- a/ui/src/main/res/values/strings.xml
+++ b/ui/src/main/res/values/strings.xml
@@ -227,10 +227,10 @@
     <string name="biometric_auth_error">Authentication failure</string>
     <string name="biometric_auth_error_reason">Authentication failure: %s</string>
     <!--Bubble constants-->
-    <string name="bubble_name">Bubble Name</string>
+    <string name="bubble_name">Bubble Name:</string>
     <string name="user_name">User Name:</string>
     <string name="password">Password:</string>
-    <string name="sign_in">SIGN IN</string>
+    <string name="sign_in">Sign In</string>
     <string name="don_t_have_a_bubble">Don\'t have a Bubble?</string>
     <string name="start_new_bubble">Start New Bubble</string>
     <string name="my_bubble">My Bubble</string>
@@ -250,4 +250,9 @@
     <string name="login_failed">Login Failed</string>
     <string name="cerificate_install">"Please install a certificate"</string>
     <string name="success">Success</string>
+    <string name="your_password">Your password</string>
+    <string name="email_you_used_to_sign_up">Email you used to Sign Up</string>
+    <string name="email">Email:</string>
+    <string name="you_can_find_your_bubble_name_in_your_email">You can find your Bubble name in your email</string>
+    <string name="enter_your_bubble_name">Enter your Bubble Name</string>
 </resources>