diff --git a/src/components/fill-mode/fill-mode.jsx b/src/components/fill-mode/fill-mode.jsx
index bd5e3e7d..52834070 100644
--- a/src/components/fill-mode/fill-mode.jsx
+++ b/src/components/fill-mode/fill-mode.jsx
@@ -7,9 +7,9 @@ import fillIcon from './fill.svg';
 const FillModeComponent = props => (
     <ToolSelectComponent
         imgDescriptor={{
-            defaultMessage: 'Definitely not fill',
-            description: 'Label for a tool that is definitely not the fill tool',
-            id: 'paint.fillMode.definitelyNotFill'
+            defaultMessage: 'Fill',
+            description: 'Label for the fill tool',
+            id: 'paint.fillMode.fill'
         }}
         imgSrc={fillIcon}
         isSelected={props.isSelected}
diff --git a/src/components/fill-mode/fill.svg b/src/components/fill-mode/fill.svg
index e5879b4e..ed3608f0 100644
--- a/src/components/fill-mode/fill.svg
+++ b/src/components/fill-mode/fill.svg
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="32px" height="32px" viewBox="160.5 256.5 32 32" enable-background="new 160.5 256.5 32 32" xml:space="preserve">
-<polygon fill="#FFFFFF" stroke="#575E75" stroke-miterlimit="10" points="172.171,267.359 165.125,272.941 175.93,283.747 
-	181.633,276.82 "/>
-<path fill="#575E75" d="M182.887,267.846c1.937-1.373,2.828-1.869,3.301-2.342c0.996-0.997,0.996-2.611,0-3.607s-2.61-0.996-3.606,0
-	c-0.488,0.487-1.08,1.482-2.478,3.494c-0.235,0.34-0.758,1.248-1.194,0.873l-3.304-2.222l-2.938,2.042l10.25,10.25l1.958-2.884
-	l-2.624-3.998C181.896,268.958,182.047,268.441,182.887,267.846z M184.234,262.775c0.593,0,1.07,0.479,1.07,1.069
-	s-0.479,1.07-1.07,1.07c-0.59,0-1.068-0.479-1.068-1.07S183.645,262.775,184.234,262.775z"/>
-<polygon fill="#575E75" points="167.342,275.039 172.695,270.5 167.945,275.646 "/>
-<polygon fill="#575E75" points="169.275,276.986 174.63,272.448 169.882,277.596 "/>
-<polygon fill="#575E75" points="171.212,278.936 176.564,274.396 171.816,279.544 "/>
-<polygon fill="#575E75" points="173.146,280.883 178.5,276.346 173.751,281.492 "/>
-</svg>
+<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 48.1 (47250) - http://www.bohemiancoding.com/sketch -->
+    <title>fill</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="fill" fill="#575E75">
+            <path d="M14.0450969,9.69349504 L14.0306818,9.67916207 C13.4396629,9.36383682 12.5170968,8.69018743 11.4215496,7.60088203 C11.0900024,7.27122381 10.7872854,6.95589857 10.5422288,6.65490628 C10.71521,6.4399118 10.8881911,6.22491731 11.0611722,6.00992282 C11.3783043,6.26791621 11.7242666,6.58324146 12.084644,6.9415656 C12.3152855,7.17089305 12.5026817,7.37155458 12.690078,7.5722161 C12.7189081,7.61521499 12.7621534,7.65821389 12.8198138,7.70121279 C13.6270591,8.6185226 14.1027573,9.36383682 14.3189837,9.7938258 C14.3189837,9.80815877 14.3333988,9.82249173 14.3333988,9.8368247 C14.2469082,9.7938258 14.1460025,9.7508269 14.0450969,9.69349504 M10.5998892,10.0661521 C9.7349835,10.53914 8.91332309,10.983462 7.61596455,10.6824697 C6.17445506,10.3528115 5.4825305,9.76515987 5.19422861,9.42116869 L8.3078891,5.40793826 C8.52411553,5.83792723 8.84124762,6.28224917 9.1727948,6.69790518 C8.82683252,7.21389195 8.55294572,7.64388093 8.42320986,7.84454245 C8.27905891,8.08820287 8.35113439,8.41786108 8.6106061,8.5755237 C8.69709667,8.63285557 8.79800233,8.6615215 8.8844929,8.6615215 C9.07188913,8.6615215 9.24487027,8.56119074 9.34577594,8.40352811 C9.50434198,8.13120176 9.69173821,7.84454245 9.89354954,7.55788313 C10.1962665,7.90187431 10.4701533,8.17420066 10.6575496,8.36052922 C11.0755873,8.77618523 11.4936251,9.14884234 11.8972477,9.47850055 C11.4215496,9.60749724 11.0035119,9.85115766 10.5998892,10.0661521 M10.2106816,5.33627343 C10.0953609,5.49393605 9.96562502,5.65159868 9.85030426,5.79492834 C9.50434198,5.33627343 9.28811556,4.96361632 9.1727948,4.70562293 C9.41785141,4.80595369 9.76381369,5.02094818 10.2106816,5.33627343 M13.5117384,4.07497244 C13.6703044,4.07497244 13.8432855,4.10363837 13.8721157,4.1753032 C14.0450969,4.49062845 13.6270591,5.49393605 13.0648704,6.3969129 L12.848644,6.18191841 C12.6180025,5.95259096 12.2287949,5.59426681 11.781927,5.20727674 C12.4450213,4.53362734 13.0504553,4.07497244 13.5117384,4.07497244 M16.5533234,12.1587652 C16.337097,11.5997795 15.9911347,11.0981257 15.587512,10.6681367 C15.5442667,10.6108049 15.4866064,10.567806 15.428946,10.5248071 C15.6740026,9.99448732 15.2703799,9.23484013 14.9244177,8.69018743 C14.6505309,8.24586549 14.2757384,7.74421169 13.8288705,7.24255788 C14.3910592,6.38257993 15.3568705,4.676957 14.8379271,3.67364939 C14.679361,3.37265711 14.3189837,3 13.5117384,3 L13.4973233,3 C12.6756629,3 11.7675119,3.65931643 10.9458515,4.51929438 C10.0232854,3.84564498 9.01422875,3.31532525 8.40879477,3.65931643 C8.35113439,3.68798236 8.27905891,3.71664829 8.23581363,3.77398015 C8.22139853,3.78831312 8.19256835,3.80264609 8.17815325,3.83131202 C8.16373816,3.84564498 8.14932306,3.85997795 8.13490797,3.88864388 L8.12049287,3.91730981 L4.12751158,9.04851158 C4.11309649,9.04851158 4.11309649,9.04851158 4.09868139,9.06284454 L3.20494551,10.2238148 L3.16170023,10.2668137 C3.11845494,10.3098126 3.08962475,10.3671444 3.07520966,10.4101433 L3.07520966,10.4244763 C2.62834171,11.3417861 4.28607763,13.1334068 5.06449275,13.92172 C5.75641731,14.6097023 7.28441737,16 8.23581363,16 C8.43762496,16 8.596191,15.9426681 8.74034195,15.8136714 L14.2613233,11.5567806 C14.2901535,11.5424476 14.3045686,11.5137817 14.3333988,11.4851158 C14.362229,11.5137817 14.3766441,11.5567806 14.3910592,11.5854465 C14.5640403,11.9294377 14.679361,12.2877619 14.6937761,12.6747519 C14.7370214,13.061742 14.7081912,13.463065 14.6505309,13.8500551 L14.6505309,13.8643881 C14.6361158,13.9790518 14.6361158,14.0793826 14.6505309,14.1940463 C14.7514365,14.8390298 15.3568705,15.2833517 15.9911347,15.1830209 C16.639814,15.0826902 17.0866819,14.4807056 16.9857762,13.8357222 C16.8992857,13.2767365 16.7839649,12.7034179 16.5533234,12.1587652" id="Fill-1"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/helper/selection-tools/point-tool.js b/src/helper/selection-tools/point-tool.js
index 7a898556..0c88d2f9 100644
--- a/src/helper/selection-tools/point-tool.js
+++ b/src/helper/selection-tools/point-tool.js
@@ -178,7 +178,6 @@ class PointTool {
                 seg.origPoint = null;
             }
         }
-        // TODO trace the shape here to make sure no overlapping paths
 
         // If no drag occurred between mouse down and mouse up, then we can go through with deselect
         // and delete