diff --git a/src/components/panels/EditorPanel.jsx b/src/components/panels/EditorPanel.jsx
index ff53a95..77dc92f 100644
--- a/src/components/panels/EditorPanel.jsx
+++ b/src/components/panels/EditorPanel.jsx
@@ -16,6 +16,8 @@ export class EditorPanel extends React.PureComponent {
 
   startShotterMode = () => this.props.editor.changeMode(MODES.SHOTTER);
 
+  clearAll = () => this.props.editor.clearAll();
+
   render() {
     const {
       mode, routerPoints, editor, totalDistance, estimateTime, activeSticker
@@ -90,14 +92,13 @@ export class EditorPanel extends React.PureComponent {
 
             <button
               className={classnames({ active: mode === MODES.TRASH })}
-              onClick={this.startShotterMode}
+              onClick={this.clearAll}
             >
               <Icon icon="icon-trash" />
             </button>
 
             <button
               className="highlighted"
-              onClick={this.startShotterMode}
             >
               <span>СХОРОНИТЬ</span>
               <Icon icon="icon-save" />
diff --git a/src/modules/Editor.js b/src/modules/Editor.js
index 7a827b3..50e28cf 100644
--- a/src/modules/Editor.js
+++ b/src/modules/Editor.js
@@ -128,4 +128,11 @@ export class Editor {
     this.activeSticker = sticker;
     this.setActiveSticker(sticker);
   };
+
+  clearAll = () => {
+    this.poly.clearAll();
+    this.router.clearAll();
+
+    this.changeMode(MODES.NONE);
+  }
 }
diff --git a/src/modules/Poly.js b/src/modules/Poly.js
index 9d60a50..0a28672 100644
--- a/src/modules/Poly.js
+++ b/src/modules/Poly.js
@@ -99,6 +99,14 @@ export class Poly {
     ];
 
     this.poly.setLatLngs(summary);
+    this.poly.enableEdit();
+    this.poly.editor.reset();
+    this.updateMarks();
+  };
+
+  clearAll = () => {
+    this.poly.setLatLngs([]);
+    this.poly.disableEdit();
     this.updateMarks();
   }
 }
diff --git a/src/modules/Router.js b/src/modules/Router.js
index d49a55c..f6ef498 100644
--- a/src/modules/Router.js
+++ b/src/modules/Router.js
@@ -127,8 +127,12 @@ export class Router {
     const { coordinates } = route;
     this.pushPolyPoints(coordinates);
     const waypoints = this.router.getWaypoints().filter(({ latLng }) => !!latLng);
-    this.router.setWaypoints(waypoints[waypoints.length-1]);
+    this.router.setWaypoints(waypoints[waypoints.length - 1]);
 
     // this.changeMode(MODES.POLY);
   };
+
+  clearAll = () => {
+    this.router.setWaypoints([]);
+  }
 }