diff --git a/app/src/main/java/org/ntlab/irisclient/DrawingActivity.java b/app/src/main/java/org/ntlab/irisclient/DrawingActivity.java
index 6512913..89c2dea 100644
--- a/app/src/main/java/org/ntlab/irisclient/DrawingActivity.java
+++ b/app/src/main/java/org/ntlab/irisclient/DrawingActivity.java
@@ -6,9 +6,12 @@
 
 import android.content.Intent;
 import android.graphics.Bitmap;
+import android.graphics.Color;
 import android.os.Bundle;
 import android.view.View;
+import android.widget.CompoundButton;
 import android.widget.TextView;
+import android.widget.ToggleButton;
 
 import org.ntlab.irisclient.models.Member;
 import org.ntlab.irisclient.viewmodels.DrawingStateViewModel;
@@ -37,9 +40,35 @@
 
         drawingStateViewModel= new ViewModelProvider(this).get(DrawingStateViewModel.class);
 
-        findViewById(R.id.okButtton).setOnClickListener(this);//お絵描き終了ボタン
         findViewById(R.id.clearButton).setOnClickListener(this);//画面クリアボタン
         findViewById(R.id.eraserButton).setOnClickListener(this);//消しゴムボタン
+        findViewById(R.id.blackPenButton).setOnClickListener(this);//消しゴムボタン
+
+        ToggleButton okToggleButton = (ToggleButton) findViewById(R.id.toggleButton);
+        okToggleButton.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                if (isChecked) {
+                    okToggleButton.setTextOn("完了");
+                    drawingCanvas.setEnabled(true);
+                    drawingCanvas.setClickable(true);
+                    drawingCanvas.setColor(Color.BLACK);
+
+                } else {
+                    okToggleButton.setTextOff("描き直す");
+                    drawingCanvas.setEnabled(false);
+                    drawingCanvas.setClickable(false);
+                    drawingCanvas.setColor(Color.TRANSPARENT);
+
+                    //putDrawing
+                    drawingCanvas.setDrawingCacheEnabled(true);//キャッシュを取得する設定にする
+                    drawingCanvas.buildDrawingCache();
+                    Bitmap bitmap = Bitmap.createBitmap(drawingCanvas.getDrawingCache());
+                    drawingCanvas.destroyDrawingCache();//既存のキャッシュをクリアする
+                    drawingStateViewModel.putDrawing(bitmap);
+                }
+            }
+        });
+
 
         TextView textKeyword =(TextView)findViewById(R.id.textKeyword);//keywordのTextView
         TextView textMemberNum = (TextView)findViewById(R.id.drawingNowText);//残りのイラスト枚数のTextView
@@ -66,6 +95,9 @@
                 textKeyword.setText("Dno: " + dno + ", Keyword: " + keyword);
                 drawingNow++;
                 textMemberNum.setText(""+drawingNow+"/"+drawingNum);
+                drawingCanvas.clearCanvas();
+
+                okToggleButton.setChecked(true);
             }
         });
 
@@ -90,17 +122,12 @@
 
     @Override
     public void onClick(View v){
-        if(v.getId() == R.id.okButtton) {//okButtonが押されたときの処理
-//            Bitmap bitmap = null;
-            drawingCanvas.setDrawingCacheEnabled(true);//キャッシュを取得する設定にする
-            drawingCanvas.buildDrawingCache();
-            Bitmap bitmap = Bitmap.createBitmap(drawingCanvas.getDrawingCache());
-            drawingCanvas.destroyDrawingCache();//既存のキャッシュをクリアする
-            drawingStateViewModel.putDrawing(bitmap);
-        }else if(v.getId() == R.id.clearButton){//clearButtonが押されたときの処理
+        if(v.getId() == R.id.clearButton){//clearButtonが押されたときの処理
             drawingCanvas.clearCanvas();
         }else if(v.getId() == R.id.eraserButton){//eraserButtonが押されたときの処理
-            drawingCanvas.eraserPaint();
+            drawingCanvas.setColor(Color.WHITE);
+        }else if(v.getId() == R.id.blackPenButton){
+            drawingCanvas.setColor(Color.BLACK);
         }
     }