diff --git a/art/icon.svg b/art/icon.svg
index 3fe4e6e..8863d9d 100644
--- a/art/icon.svg
+++ b/art/icon.svg
@@ -15,8 +15,8 @@
    height="500"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="icon_debug.svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="icon.svg"
    enable-background="new"
    inkscape:export-filename="C:\Users\vahagnk\devel\_private\org.dyndns.vahagn.sokoban\res\drawable-xhdpi\icon_debug.png"
    inkscape:export-xdpi="17.280001"
@@ -203,7 +203,7 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="1.19"
-     inkscape:cx="351.60858"
+     inkscape:cx="27.238825"
      inkscape:cy="201.98681"
      inkscape:document-units="px"
      inkscape:current-layer="layer6"
@@ -213,8 +213,8 @@
      inkscape:snap-global="true"
      inkscape:object-nodes="false"
      inkscape:snap-intersection-paths="false"
-     inkscape:window-width="1920"
-     inkscape:window-height="1018"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
      inkscape:window-x="-8"
      inkscape:window-y="-8"
      inkscape:window-maximized="1"
@@ -237,7 +237,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -318,6 +318,28 @@
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccccc" />
   </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer6"
+     inkscape:label="Debug"
+     style="display:inline"
+     sodipodi:insensitive="true">
+    <g
+       id="g3905"
+       transform="matrix(2.2212804,0,0,2.3274208,-529.54915,-235.51353)"
+       style="fill:#ff0000;fill-opacity:0.36507939;stroke:none">
+      <path
+         id="Selection #4"
+         d="m 264.53125,126.46875 c -4.33805,-0.0576 -8.61719,3.71125 -8.125,12.53125 0.66,11.68 3.4825,24.69 9.0625,35 3.66634,9.32507 13.0186,14.43224 17.5625,21.4375 1.59,2.61 1.38125,6.5725 1.28125,9.5625 -0.05,1.84 -0.10625,4.0975 -1.15625,5.6875 -1.6,2.38 1.3125,3 -8.6875,3 l -25,0 c -10,0 -10,15 0,15 l 30,0 c 6.4,0.16 7.77,-0.13875 8,8.28125 0.13,4.84 -8.2625,9.5325 -12.0625,11.8125 -15.25031,9.72362 -23.93379,21.43976 -26.625,38.21875 -0.87,5.55 -2.44125,14.81 3.96875,17.25 3.96,1.51 8.89375,-0.255 10.34375,-4.375 L 265.625,284 c 7.68921,-14.25194 18.84375,-25.3125 28.84375,-25.3125 l 5,0 c 5,5 32.4,31.41 45,35 l 0,-75 c 0,-4.214 2.66703,-6.64779 5.75,-7.3125 0.54062,-0.11656 1.10201,-0.18026 1.65625,-0.1875 0.30775,-0.004 0.63136,0.002 0.9375,0.0312 0.0106,10e-4 0.0207,-0.001 0.0312,0 0.0533,0.005 0.10307,0.0248 0.15625,0.0312 0.23376,0.0298 0.48871,0.0754 0.71875,0.125 0.25757,0.0547 0.49953,0.108 0.75,0.1875 2.74711,0.88121 4.96875,3.26291 4.96875,7.125 l 0,75 c 12.6,-3.59 40,-30 45,-35 l 5,0 c 10,0 21.15454,11.06056 28.84375,25.3125 l 2.53125,15.875 c 1.45,4.12 6.38375,5.885 10.34375,4.375 6.41,-2.44 4.83875,-11.7 3.96875,-17.25 -2.69121,-16.77899 -11.37469,-28.49513 -26.625,-38.21875 -3.8,-2.28 -12.1925,-6.9725 -12.0625,-11.8125 0.23,-8.42 1.6,-8.12125 8,-8.28125 l 30,0 c 10,0 10,-15 0,-15 l -25,0 c -10,0 -7.0875,-0.62 -8.6875,-3 -1.05,-1.59 -1.10625,-3.8475 -1.15625,-5.6875 -0.1,-2.99 -0.30875,-6.9525 1.28125,-9.5625 4.5439,-7.00526 13.89616,-12.11243 17.5625,-21.4375 5.58,-10.31 8.4025,-23.32 9.0625,-35 0.49219,-8.82 -3.78695,-12.58885 -8.125,-12.53125 -2.27231,0.0302 -4.565,1.12031 -6.1875,3.0625 C 430.998,132.15125 431.58,140.96 431,145 c -2.22,15.45 -1.515,17.41 -11.625,30 -14.89167,14.29404 -39.82403,21.40669 -64.90625,21.71875 l 0,-0.0312 c -0.83523,0.0197 -1.66396,0.0266 -2.5,0.0312 -0.84123,-0.005 -1.69083,-0.0114 -2.53125,-0.0312 l 0,0.0312 C 324.36577,196.4012 299.41676,189.28813 284.53125,175 c -10.11,-12.59 -9.405,-14.55 -11.625,-30 -0.58,-4.04 0.002,-12.84875 -2.1875,-15.46875 -1.6225,-1.94219 -3.91519,-3.03235 -6.1875,-3.0625 z"
+         style="fill:#ff0000;fill-opacity:0.36507939;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path3862"
+         d="m 347.65625,103.34375 c -9.48344,2.07571 -16.71892,10.22816 -17.5,20.21875 -17.80948,5.15553 -30.125,16.29235 -30.125,29.1875 0,17.80423 23.48386,32.21875 52.46875,32.21875 28.98489,0 52.46875,-14.41452 52.46875,-32.21875 0,-12.93887 -12.4054,-24.08642 -30.3125,-29.21875 -0.7555,-9.49386 -7.35456,-17.32688 -16.15625,-19.84375 4.12235,2.1741 6.9375,6.61131 6.9375,11.71875 0,7.25653 -5.69061,13.125 -12.71875,13.125 -7.02814,0 -12.71875,-5.86847 -12.71875,-13.125 0,-5.392 3.1563,-10.03743 7.65625,-12.0625 z"
+         style="fill:#ff0000;fill-opacity:0.36507939;stroke:none"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
   <g
      inkscape:groupmode="layer"
      id="layer2"
@@ -350,15 +372,15 @@
        height="189.63731"
        width="194.64587"
        id="rect4119"
-       style="fill:#ffd42a;fill-opacity:1;stroke:none;display:inline" />
+       style="fill:#ffd42a;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" />
     <path
        sodipodi:nodetypes="ccccc"
        inkscape:connector-curvature="0"
        id="path4121"
        d="m 342.65518,239.83473 -39.6072,39.94872 194.64588,-1e-5 -39.93747,-39.89529 z"
-       style="fill:#ff9600;fill-opacity:1;stroke:none;display:inline" />
+       style="fill:#ff9600;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" />
     <path
-       style="fill:#ffb82a;fill-opacity:1;stroke:#ffa600;stroke-width:1.18690801px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:#ffb82a;fill-opacity:1;fill-rule:nonzero;stroke:#ffa600;stroke-width:1.18690801px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 302.35841,279.78344 32.71853,0 -0.67621,188.90069 -31.92777,0 z"
        id="path4184"
        inkscape:connector-curvature="0"
@@ -368,9 +390,9 @@
        inkscape:connector-curvature="0"
        id="path4186"
        d="m 464.97533,279.78344 32.71853,0 -0.0305,188.90069 -32.36559,0 z"
-       style="fill:#ffb82a;fill-opacity:1;stroke:#ffa600;stroke-width:1.18690801px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
+       style="fill:#ffb82a;fill-opacity:1;fill-rule:nonzero;stroke:#ffa600;stroke-width:1.18690801px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
     <path
-       style="fill:#ffc52a;fill-opacity:1;stroke:#ffa600;stroke-width:1.18690801;stroke-linejoin:round;stroke-opacity:1"
+       style="fill:#ffc52a;fill-opacity:1;fill-rule:nonzero;stroke:#ffa600;stroke-width:1.18690801;stroke-linejoin:round;stroke-opacity:1"
        d="m 302.47296,280.191 195.19042,0 0,30.87636 -195.19042,0 z"
        id="rect4190"
        inkscape:connector-curvature="0"
@@ -380,54 +402,54 @@
        inkscape:connector-curvature="0"
        id="path4193"
        d="m 302.47296,437.80778 195.19042,0 0,30.87635 -195.19042,0 z"
-       style="fill:#ffc52a;fill-opacity:1;stroke:#ffa600;stroke-width:1.18690801;stroke-linejoin:round;stroke-opacity:1" />
+       style="fill:#ffc52a;fill-opacity:1;fill-rule:nonzero;stroke:#ffa600;stroke-width:1.18690801;stroke-linejoin:round;stroke-opacity:1" />
     <rect
-       style="fill:#ffdd55;fill-opacity:1;stroke:#ffa600;stroke-width:1.18690801;stroke-linejoin:round;stroke-opacity:1;display:inline"
+       style="fill:#ffdd55;fill-opacity:1;fill-rule:nonzero;stroke:#ffa600;stroke-width:1.18690801;stroke-linejoin:round;stroke-opacity:1;display:inline"
        id="rect4195-4"
        width="32.343575"
        height="126.74043"
        x="367.3085"
        y="311.06735" />
     <rect
-       style="fill:#ffcc00;fill-opacity:1;stroke:#ffa600;stroke-width:1.18690801;stroke-linejoin:round;stroke-opacity:1;display:inline"
+       style="fill:#ffcc00;fill-opacity:1;fill-rule:nonzero;stroke:#ffa600;stroke-width:1.18690801;stroke-linejoin:round;stroke-opacity:1;display:inline"
        id="rect4195"
        width="32.343575"
        height="126.74043"
        x="334.965"
        y="311.06738" />
     <rect
-       style="fill:#ffcc00;fill-opacity:1;stroke:#ffa600;stroke-width:1.18690801;stroke-linejoin:round;stroke-opacity:1;display:inline"
+       style="fill:#ffcc00;fill-opacity:1;fill-rule:nonzero;stroke:#ffa600;stroke-width:1.18690801;stroke-linejoin:round;stroke-opacity:1;display:inline"
        id="rect4195-9"
        width="32.343575"
        height="126.74043"
        x="432.68518"
        y="311.06735" />
     <path
-       style="fill:#ffba08;fill-opacity:1;stroke:#ffa600;stroke-width:1.18690801;stroke-opacity:1;display:inline"
+       style="fill:#ffba08;fill-opacity:1;fill-rule:nonzero;stroke:#ffa600;stroke-width:1.18690801;stroke-opacity:1;display:inline"
        d="m 309.96367,311.08035 138.05026,126.73752 44.73381,0 -138.05027,-126.73752 z"
        id="rect4222-6"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccccc" />
     <path
-       style="fill:#fab826;fill-opacity:1;stroke:#ffaf00;stroke-width:1.18690801;stroke-opacity:1"
+       style="fill:#fab826;fill-opacity:1;fill-rule:nonzero;stroke:#ffaf00;stroke-width:1.18690801;stroke-opacity:1"
        d="m 445.72641,311.08035 -135.83535,126.73752 44.33437,0 135.83538,-126.73752 z"
        id="rect4222"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccccc" />
     <path
-       style="fill:#aa4400;stroke:none"
+       style="fill:#aa4400;fill-rule:nonzero;stroke:none"
        d="m 364.06882,239.84466 -27.85671,40.34634 31.10207,0 17.00384,-40.33693 z"
        id="path5801"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccccc" />
     <path
-       style="fill:#ff6600;stroke:none"
+       style="fill:#ff6600;fill-rule:nonzero;stroke:none"
        d="m 367.84163,280.191 16.78684,-40.33679 21.10779,0.01 -5.90794,40.32709 z"
        id="path5803"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccccc" />
     <path
-       style="fill:#ff7f2a;stroke:none;display:inline"
+       style="fill:#ff7f2a;fill-rule:nonzero;stroke:none;display:inline"
        d="m 431.57529,280.191 -6.40565,-40.23712 -19.12278,-0.0898 -5.86864,40.33002 z"
        id="path5803-6"
        inkscape:connector-curvature="0"
@@ -439,37 +461,37 @@
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccccc" />
     <path
-       style="fill:#d4aa00;stroke:none"
+       style="fill:#d4aa00;fill-rule:nonzero;stroke:none"
        d="m 464.4348,280.191 0.0873,-4.67444 32.70213,0.25851 0.24774,4.65329 z"
        id="path5855"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccccc" />
     <path
-       style="fill:#ffcc00;stroke:none"
+       style="fill:#ffcc00;fill-rule:nonzero;stroke:none"
        d="m 464.52216,275.51656 -22.27583,-37.3704 0.0599,1.73482 22.25514,40.32804 z"
        id="path5857"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccccc" />
     <path
-       style="fill:#ff9600;fill-opacity:1;stroke:none"
+       style="fill:#ff9600;fill-opacity:1;fill-rule:nonzero;stroke:none"
        d="m 464.52216,275.51656 32.70215,0.25851 -39.05814,-37.66825 -15.94328,0 z"
        id="path5859"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccccc" />
     <path
-       style="fill:#d4aa00;fill-opacity:1;stroke:none"
+       style="fill:#d4aa00;fill-opacity:1;fill-rule:nonzero;stroke:none"
        d="m 303.27493,279.82968 0,0 32.26901,0.40752 -0.20102,-3.20718 -32.03678,-0.46042 z"
        id="path5891"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cccccc" />
     <path
-       style="fill:#ff9600;fill-opacity:1;stroke:none"
+       style="fill:#ff9600;fill-opacity:1;fill-rule:nonzero;stroke:none"
        d="m 335.64188,277.03326 -32.226,-0.34915 40.16321,-38.57729 19.74096,0 z"
        id="path5893"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccccc" />
     <path
-       style="fill:#aa8800;fill-opacity:1;stroke:none"
+       style="fill:#aa8800;fill-opacity:1;fill-rule:nonzero;stroke:none"
        d="m 335.35265,277.18557 27.9674,-39.07875 0,1.95445 -27.77481,40.41628 z"
        id="path5897"
        inkscape:connector-curvature="0"
@@ -540,25 +562,4 @@
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="scscs" />
   </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer6"
-     inkscape:label="Debug"
-     sodipodi:insensitive="true">
-    <g
-       id="g3905"
-       transform="matrix(0.98040698,0,0,1.1018985,-231.55864,-107.84749)"
-       style="fill:none;stroke:#f90000;stroke-width:9.36715698;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
-      <path
-         id="Selection #4"
-         d="m 264.53125,126.46875 c -4.33805,-0.0576 -8.61719,3.71125 -8.125,12.53125 0.66,11.68 3.4825,24.69 9.0625,35 3.66634,9.32507 13.0186,14.43224 17.5625,21.4375 1.59,2.61 1.38125,6.5725 1.28125,9.5625 -0.05,1.84 -0.10625,4.0975 -1.15625,5.6875 -1.6,2.38 1.3125,3 -8.6875,3 l -25,0 c -10,0 -10,15 0,15 l 30,0 c 6.4,0.16 7.77,-0.13875 8,8.28125 0.13,4.84 -8.2625,9.5325 -12.0625,11.8125 -15.25031,9.72362 -23.93379,21.43976 -26.625,38.21875 -0.87,5.55 -2.44125,14.81 3.96875,17.25 3.96,1.51 8.89375,-0.255 10.34375,-4.375 L 265.625,284 c 7.68921,-14.25194 18.84375,-25.3125 28.84375,-25.3125 l 5,0 c 5,5 32.4,31.41 45,35 l 0,-75 c 0,-4.214 2.66703,-6.64779 5.75,-7.3125 0.54062,-0.11656 1.10201,-0.18026 1.65625,-0.1875 0.30775,-0.004 0.63136,0.002 0.9375,0.0312 0.0106,10e-4 0.0207,-0.001 0.0312,0 0.0533,0.005 0.10307,0.0248 0.15625,0.0312 0.23376,0.0298 0.48871,0.0754 0.71875,0.125 0.25757,0.0547 0.49953,0.108 0.75,0.1875 2.74711,0.88121 4.96875,3.26291 4.96875,7.125 l 0,75 c 12.6,-3.59 40,-30 45,-35 l 5,0 c 10,0 21.15454,11.06056 28.84375,25.3125 l 2.53125,15.875 c 1.45,4.12 6.38375,5.885 10.34375,4.375 6.41,-2.44 4.83875,-11.7 3.96875,-17.25 -2.69121,-16.77899 -11.37469,-28.49513 -26.625,-38.21875 -3.8,-2.28 -12.1925,-6.9725 -12.0625,-11.8125 0.23,-8.42 1.6,-8.12125 8,-8.28125 l 30,0 c 10,0 10,-15 0,-15 l -25,0 c -10,0 -7.0875,-0.62 -8.6875,-3 -1.05,-1.59 -1.10625,-3.8475 -1.15625,-5.6875 -0.1,-2.99 -0.30875,-6.9525 1.28125,-9.5625 4.5439,-7.00526 13.89616,-12.11243 17.5625,-21.4375 5.58,-10.31 8.4025,-23.32 9.0625,-35 0.49219,-8.82 -3.78695,-12.58885 -8.125,-12.53125 -2.27231,0.0302 -4.565,1.12031 -6.1875,3.0625 C 430.998,132.15125 431.58,140.96 431,145 c -2.22,15.45 -1.515,17.41 -11.625,30 -14.89167,14.29404 -39.82403,21.40669 -64.90625,21.71875 l 0,-0.0312 c -0.83523,0.0197 -1.66396,0.0266 -2.5,0.0312 -0.84123,-0.005 -1.69083,-0.0114 -2.53125,-0.0312 l 0,0.0312 C 324.36577,196.4012 299.41676,189.28813 284.53125,175 c -10.11,-12.59 -9.405,-14.55 -11.625,-30 -0.58,-4.04 0.002,-12.84875 -2.1875,-15.46875 -1.6225,-1.94219 -3.91519,-3.03235 -6.1875,-3.0625 z"
-         style="fill:none;stroke:#f90000;stroke-width:9.36715698;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path3862"
-         d="m 347.65625,103.34375 c -9.48344,2.07571 -16.71892,10.22816 -17.5,20.21875 -17.80948,5.15553 -30.125,16.29235 -30.125,29.1875 0,17.80423 23.48386,32.21875 52.46875,32.21875 28.98489,0 52.46875,-14.41452 52.46875,-32.21875 0,-12.93887 -12.4054,-24.08642 -30.3125,-29.21875 -0.7555,-9.49386 -7.35456,-17.32688 -16.15625,-19.84375 4.12235,2.1741 6.9375,6.61131 6.9375,11.71875 0,7.25653 -5.69061,13.125 -12.71875,13.125 -7.02814,0 -12.71875,-5.86847 -12.71875,-13.125 0,-5.392 3.1563,-10.03743 7.65625,-12.0625 z"
-         style="fill:none;stroke:#f90000;stroke-width:9.36715698;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         inkscape:connector-curvature="0" />
-    </g>
-  </g>
 </svg>