diff --git a/app/src/main/java/com/example/cosmosclient/views/SigninActivity.java b/app/src/main/java/com/example/cosmosclient/views/SigninActivity.java
index 2a70436..b5b78ae 100644
--- a/app/src/main/java/com/example/cosmosclient/views/SigninActivity.java
+++ b/app/src/main/java/com/example/cosmosclient/views/SigninActivity.java
@@ -89,19 +89,25 @@
                     @Override
                     public void onResponse(Call<SigninResponse> call, Response<SigninResponse> response) {
                         if (response.isSuccessful()) {
-                            SigninResponse result = response.body();
+                            if(response.body() == null){
+                                //パスワードが違う際、アプリが落ちてしまうため
+                                Toast.makeText(SigninActivity.this,
+                                        "パスワードが違います",Toast.LENGTH_LONG).show();
+                            }else{
+                                SigninResponse result = response.body();
 
-                            //app/Cosmosに情報保存
-                            Cosmos app = (Cosmos)getApplication();
-                            app.setToken(result.token);
-                            app.setuId(UserIdText.getText().toString());
+                                //app/Cosmosに情報保存
+                                Cosmos app = (Cosmos) getApplication();
+                                app.setToken(result.token);
+                                app.setuId(UserIdText.getText().toString());
 
-                            //画面遷移
-                            Intent intent = new Intent(getApplication(), GroupListActivity.class);
-                            startActivity(intent);
-                            Toast.makeText(SigninActivity.this,
-                                    "ログインしました", Toast.LENGTH_SHORT).show();
-                            finish();
+                                //画面遷移
+                                Intent intent = new Intent(getApplication(), GroupListActivity.class);
+                                startActivity(intent);
+                                Toast.makeText(SigninActivity.this,
+                                        "ログインしました", Toast.LENGTH_SHORT).show();
+                                finish();
+                            }
 
                         }else{
                             //onFailureでキャッチできないエラーの処理
@@ -113,7 +119,7 @@
                     //失敗時
                     @Override
                     public void onFailure(Call<SigninResponse> call, Throwable t) {
-                        //t.printStackTrace();
+                        t.printStackTrace();
                         Toast.makeText(SigninActivity.this,
                                 "ユーザIDもしくはパスワードが間違っています",Toast.LENGTH_SHORT).show();
                     }
diff --git a/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java b/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java
index 5770dcc..0ef3a73 100644
--- a/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java
+++ b/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java
@@ -194,8 +194,17 @@
                         iconChoice.setImageBitmap(image);
                         iconImageBase64 = imageEncoded;
                     }else{
-                        Toast.makeText(SignupActivity.this,
-                                "この画像は使用できません。\n別の画像を選択してください。",Toast.LENGTH_LONG).show();
+                        //byte→stringで2000文字以上なら、圧縮率を上げて再変換
+                        afterResizeBitmap.compress(Bitmap.CompressFormat.JPEG,60, baos);
+                        b = baos.toByteArray();
+                        imageEncoded = Base64.encodeToString(b, Base64.DEFAULT);
+                        if(imageEncoded.length() <=2000){
+                            iconChoice.setImageBitmap(image);
+                            iconImageBase64 = imageEncoded;
+                        }else{
+                            Toast.makeText(SignupActivity.this,
+                                    "この画像は使用できません。\n別の画像を選択してください。",Toast.LENGTH_LONG).show();
+                        }
                     }
                 }catch(IOException e){
                     e.printStackTrace();
diff --git a/app/src/main/res/layout/activity_signup.xml b/app/src/main/res/layout/activity_signup.xml
index c0b617e..5362f18 100644
--- a/app/src/main/res/layout/activity_signup.xml
+++ b/app/src/main/res/layout/activity_signup.xml
@@ -44,7 +44,7 @@
         android:layout_height="1dp"
         android:layout_marginStart="8dp"
         android:layout_marginLeft="50dp"
-        android:layout_marginTop="32dp"
+        android:layout_marginTop="24dp"
         android:layout_marginEnd="8dp"
         android:layout_marginRight="50dp"
         android:background="@android:color/darker_gray"
@@ -59,7 +59,7 @@
         android:layout_height="28dp"
         android:layout_marginStart="8dp"
         android:layout_marginLeft="8dp"
-        android:layout_marginTop="18dp"
+        android:layout_marginTop="8dp"
         android:layout_marginEnd="8dp"
         android:layout_marginRight="8dp"
         android:background="#FFFFFF"
@@ -77,15 +77,15 @@
         android:layout_height="66dp"
         android:layout_marginStart="8dp"
         android:layout_marginLeft="8dp"
-        android:layout_marginTop="16dp"
+        android:layout_marginTop="8dp"
         android:layout_marginEnd="8dp"
         android:layout_marginRight="8dp"
-        android:textAllCaps="false"
         android:text="@string/make_account"
+        android:textAllCaps="false"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.445"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/ConfirmPasswordText" />
+        app:layout_constraintTop_toBottomOf="@+id/choiceImage" />
 
     <EditText
         android:id="@+id/ConfirmPasswordText"
@@ -165,13 +165,27 @@
         android:layout_height="100dp"
         android:layout_marginStart="152dp"
         android:layout_marginLeft="152dp"
-        android:layout_marginTop="40dp"
+        android:layout_marginTop="16dp"
         android:layout_marginEnd="8dp"
         android:layout_marginRight="8dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textView6"
+        app:layout_constraintTop_toBottomOf="@+id/ConfirmPasswordText"
         app:srcCompat="@drawable/ic_menu_gallery" />
 
+    <TextView
+        android:id="@+id/textView11"
+        android:layout_width="wrap_content"
+        android:layout_height="38dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginLeft="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginRight="8dp"
+        android:text="ユーザー\nアイコン"
+        app:layout_constraintEnd_toStartOf="@+id/choiceImage"
+        app:layout_constraintHorizontal_bias="0.584"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/choiceImage" />
+
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file