diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3ae40bb..694e8e9 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -48,6 +48,9 @@
             android:name=".views.SignupActivity"
             android:theme="@style/AppTheme.NoActionBar" />
         <activity
+            android:name="com.theartofdev.edmodo.cropper.CropImageActivity"
+            android:theme="@style/Base.Theme.AppCompat"/>
+        <activity
             android:name=".views.ForgotPasswordActivity"
             android:theme="@style/AppTheme.NoActionBar" />
         <activity android:name=".MainActivity" />
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 efb8864..fe6d66f 100644
--- a/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java
+++ b/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java
@@ -1,15 +1,12 @@
 package com.example.cosmosclient.views;
 
-import android.annotation.SuppressLint;
+
 import android.content.Intent;
-import android.graphics.Bitmap;
-import android.media.Image;
 import android.net.Uri;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.TextWatcher;
-import android.util.Log;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
@@ -36,8 +33,6 @@
     private boolean cpwEnable;
     private Button MakeAccountButton;
     private ImageView iconChoice;
-    private static final int REQUEST_GALLERY = 1000;
-    private static final int REQUEST_CROP = 1001;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -118,7 +113,7 @@
                         } else {
                             //onFailureでキャッチできないエラー用
                             Toast.makeText(SignupActivity.this,
-                                    "アカウント作成失敗", Toast.LENGTH_SHORT).show();
+                                    "通信エラー", Toast.LENGTH_SHORT).show();
                         }
                     }
 
@@ -147,75 +142,26 @@
         iconChoice.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-//                Intent intent = new Intent();
-//                intent.setType("image/*");
-//                intent.setAction(Intent.ACTION_GET_CONTENT);
-//                startActivityForResult(intent, REQUEST_GALLERY);
-//                CropImage.activity()
-//                        .setAspectRatio(1,1)
-//                        .setGuidelines(CropImageView.Guidelines.ON)
-//                        .start(SignupActivity.this);
-//
-
+                CropImage.activity()
+                        .setAspectRatio(1,1)
+                        .setGuidelines(CropImageView.Guidelines.ON)
+                        .start(SignupActivity.this);
             }
         });
     }
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-//
-//        //アルバムの結果をここで受け、oginotihiroへ渡します。
-//        if (requestCode == REQUEST_GALLERY && resultCode == RESULT_OK) {
-//            try {
-//                //アルバムで選ばれたファイル（original_uri）を取得して、oginotihiroへ渡します
-//                Uri original_uri = data.getData();
-//                Intent intent = new Intent(this, oginotihiro.class);
-//                intent.putExtra("original_uri",original_uri.toString());
-//                startActivityForResult(intent, REQUEST_CROP);
-//            } catch (Exception e) {
-//            }
-//        }
-//
-//        //oginotihiroからの結果（saved_uri）をここで受けとります。
-//        if (requestCode == REQUEST_CROP && resultCode == RESULT_OK) {
-//            Bundle bundle = data.getExtras();
-//            Uri saved_uri = (Uri)bundle.get("saved_uri");
-//            //saved_uriが、クロップされた写真の保存先のパスになります。
-//            Log.d("saved_uri",saved_uri+"");
-//
-//            iconChoice.setImageURI(saved_uri);
-////        }
-//        switch (requestCode) {
-//            case REQUEST_GALLERY:
-//                if (resultCode != RESULT_OK) return;
-//                Uri uri = data.getData(); // 選ばれた写真のUri
-//                Intent intent = new Intent("com.android.camera.action.CROP");
-//                intent.setData(uri);
-//                intent.putExtra("outputX", 200);
-//                intent.putExtra("outputY", 200);
-//                intent.putExtra("aspectX", 1);
-//                intent.putExtra("aspectY", 1);
-//                intent.putExtra("scale", true);
-//                intent.putExtra("return-data", true);
-//                startActivityForResult(intent, REQUEST_CROP);
-//                break;
-//            case REQUEST_CROP:
-//                if (resultCode != RESULT_OK) return;
-//                Bitmap bitmap = data.getExtras().getParcelable("data");
-//                iconChoice.setImageBitmap(bitmap);
-//                //Bitmap bitmap = data.getExtras().getParcelable("data");
-//        }
-//        if (requestCode == CropImage.CROP_IMAGE_ACTIVITY_REQUEST_CODE) {
-//            CropImage.ActivityResult result = CropImage.getActivityResult(data);
-//            if (resultCode == RESULT_OK) {
-//                Uri resultUri = result.getUri();
-//                iconChoice.setImageURI(resultUri);
-//            } else if (resultCode == CropImage.CROP_IMAGE_ACTIVITY_RESULT_ERROR_CODE) {
-//                Exception error = result.getError();
-//            }
-//        }
-
-
+        //トリミング後の処理
+        if (requestCode == CropImage.CROP_IMAGE_ACTIVITY_REQUEST_CODE) {
+            CropImage.ActivityResult result = CropImage.getActivityResult(data);
+            if (resultCode == RESULT_OK) {
+                Uri resultUri = result.getUri();
+                iconChoice.setImageURI(resultUri);
+            } else if (resultCode == CropImage.CROP_IMAGE_ACTIVITY_RESULT_ERROR_CODE) {
+                Exception error = result.getError();
+            }
+        }
     }
 
     //入力欄監視処理内容
@@ -260,7 +206,7 @@
             if(nameEnable && pwEnable && cpwEnable){
                 MakeAccountButton.setEnabled(true);
             }else{
-              MakeAccountButton.setEnabled(false);
+                MakeAccountButton.setEnabled(false);
             }
         }
     }