diff --git a/app/src/main/res/layout/activity_signin.xml b/app/src/main/res/layout/activity_signin.xml
index 1e7806b..94e7a79 100644
--- a/app/src/main/res/layout/activity_signin.xml
+++ b/app/src/main/res/layout/activity_signin.xml
@@ -61,7 +61,7 @@
 
     <TextView
         android:id="@+id/textView2"
-        android:layout_width="78dp"
+        android:layout_width="wrap_content"
         android:layout_height="31dp"
         android:layout_marginStart="16dp"
         android:layout_marginLeft="16dp"
@@ -78,7 +78,7 @@
 
     <TextView
         android:id="@+id/textView3"
-        android:layout_width="155dp"
+        android:layout_width="wrap_content"
         android:layout_height="21dp"
         android:layout_marginStart="8dp"
         android:layout_marginLeft="8dp"
@@ -93,7 +93,7 @@
     <Button
         android:id="@+id/SignupButton"
         style="@android:style/Widget.DeviceDefault.Button.Borderless"
-        android:layout_width="95dp"
+        android:layout_width="wrap_content"
         android:layout_height="21dp"
         android:layout_gravity="left|top"
         android:layout_marginTop="8dp"
@@ -127,7 +127,7 @@
         android:layout_height="28dp"
         android:layout_marginStart="8dp"
         android:layout_marginLeft="8dp"
-        android:layout_marginTop="20dp"
+        android:layout_marginTop="18dp"
         android:background="#FFFFFF"
         android:gravity="center"
         android:text="@string/or"
@@ -140,7 +140,7 @@
     <Button
         android:id="@+id/ForgotPasswordButton"
         style="@android:style/Widget.DeviceDefault.Button.Borderless"
-        android:layout_width="115dp"
+        android:layout_width="wrap_content"
         android:layout_height="18dp"
         android:layout_marginStart="8dp"
         android:layout_marginLeft="8dp"
diff --git a/app/src/main/res/layout/activity_signup.xml b/app/src/main/res/layout/activity_signup.xml
index 71b68f6..e170878 100644
--- a/app/src/main/res/layout/activity_signup.xml
+++ b/app/src/main/res/layout/activity_signup.xml
@@ -9,12 +9,12 @@
 
     <TextView
         android:id="@+id/textView6"
-        android:layout_width="155dp"
+        android:layout_width="wrap_content"
         android:layout_height="21dp"
         android:layout_marginStart="8dp"
         android:layout_marginLeft="8dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
+        android:layout_marginEnd="4dp"
+        android:layout_marginRight="4dp"
         android:text="@string/already_have_a_account"
         app:layout_constraintEnd_toStartOf="@+id/LoginButton"
         app:layout_constraintHorizontal_bias="0.562"
@@ -24,15 +24,15 @@
     <Button
         android:id="@+id/LoginButton"
         style="@android:style/Widget.DeviceDefault.Button.Borderless"
-        android:layout_width="44dp"
+        android:layout_width="wrap_content"
         android:layout_height="21dp"
         android:layout_gravity="left|top"
         android:layout_marginTop="8dp"
-        android:layout_marginEnd="116dp"
-        android:layout_marginRight="116dp"
+        android:layout_marginEnd="64dp"
+        android:layout_marginRight="64dp"
         android:background="#00000000"
-        android:textAllCaps="false"
         android:text="@string/login"
+        android:textAllCaps="false"
         android:textColor="#3F51B5"
         android:textSize="14sp"
         app:layout_constraintEnd_toEndOf="parent"
@@ -59,7 +59,7 @@
         android:layout_height="28dp"
         android:layout_marginStart="8dp"
         android:layout_marginLeft="8dp"
-        android:layout_marginTop="20dp"
+        android:layout_marginTop="18dp"
         android:layout_marginEnd="8dp"
         android:layout_marginRight="8dp"
         android:background="#FFFFFF"
@@ -99,6 +99,7 @@
         android:ems="10"
         android:hint="@string/confirm_password"
         android:inputType="textPassword"
+        android:textSize="14sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.445"
         app:layout_constraintStart_toStartOf="parent"
@@ -116,6 +117,7 @@
         android:ems="10"
         android:hint="@string/password"
         android:inputType="textPassword"
+        android:textSize="14sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.445"
         app:layout_constraintStart_toStartOf="parent"
@@ -133,6 +135,7 @@
         android:ems="10"
         android:hint="@string/e_mail_address"
         android:inputType="text"
+        android:textSize="14sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.445"
         app:layout_constraintStart_toStartOf="parent"
@@ -140,7 +143,7 @@
 
     <TextView
         android:id="@+id/textView2"
-        android:layout_width="78dp"
+        android:layout_width="wrap_content"
         android:layout_height="31dp"
         android:layout_marginStart="16dp"
         android:layout_marginLeft="16dp"
@@ -148,7 +151,7 @@
         android:layout_marginEnd="8dp"
         android:layout_marginRight="8dp"
         android:text="@string/sign_up"
-        android:textSize="20sp"
+        android:textSize="18sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.119"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6e835f1..c6b0fa3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,17 +1,17 @@
 <resources>
     <string name="app_name">CosmosClient</string>
     <string name="or">or</string>
-    <string name="e_mail_address">E-MAIL ADDRESS</string>
-    <string name="password">PASSWORD</string>
-    <string name="confirm_password">CONFIRM PASSWORD</string>
-    <string name="sign_up">Sign Up</string>
-    <string name="already_have_a_account">Already have a account?</string>
-    <string name="login">Login</string>
-    <string name="make_account">Make Account</string>
-    <string name="sign_in">Sign in</string>
-    <string name="don_t_have_an_account">Don\'t have an account?</string>
-    <string name="forgot_password">Forgot Password?</string>
-    <string name="sign_up_now">Sign up Now</string>
+    <string name="e_mail_address">ユーザー名</string>
+    <string name="password">パスワード</string>
+    <string name="confirm_password">パスワードの確認</string>
+    <string name="sign_up">新規登録</string>
+    <string name="already_have_a_account">アカウントをすでにお持ちですか？</string>
+    <string name="login">ログイン</string>
+    <string name="make_account">アカウント作成</string>
+    <string name="sign_in">サインイン</string>
+    <string name="don_t_have_an_account">アカウントをお持ちの場合</string>
+    <string name="forgot_password">パスワードを忘れた場合</string>
+    <string name="sign_up_now">新規登録</string>
     <string name="title_activity_add_member">AddMemberActivity</string>
     <string name="title_activity_request_list">RequestListActivity</string>
     <string name="title_activity_group_list">GroupListActivity</string>