Implementation of new toolbar

This patch implement the proposal from Gary Martin.
Unification of model between game and creation mode and
save game are not implemented in this patch.

Signed-of-by: Gonzalo Odiard <gonzalo@laptop.org>
Reviewed-by: Manuel Quiñones <manuq@laptop.org>

6 files changed, 0 insertions, 845 deletions

diff --git a/images/equal_pairs1.svg b/images/equal_pairs1.svg
deleted file mode 100644
index 47544eb..0000000
--- a/images/equal_pairs1.svg
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="55"
-   height="55"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="equal_pairs1.svg"
-   sodipodi:docbase="/home/msgodoi/olpc/workspace/Memorize.activity/images"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#404040"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="12.309091"
-     inkscape:cx="27.5"
-     inkscape:cy="27.5"
-     inkscape:document-units="px"
-     inkscape:current-layer="g5562"
-     width="55px"
-     height="55px"
-     inkscape:window-width="1432"
-     inkscape:window-height="871"
-     inkscape:window-x="4"
-     inkscape:window-y="25" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g5499"
-       transform="translate(-0.7444609,-1.3648449)">
-      <g
-         id="g5512"
-         transform="matrix(1.0512821,0,0,1.051282,-6.381851e-2,0.8717949)">
-        <g
-           id="g5562"
-           transform="translate(0.4512195,17.493391)">
-          <rect
-             style="fill:#404040;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.42682922;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             id="rect4522"
-             width="23.304878"
-             height="23.304878"
-             x="1.9822657"
-             y="-15.359758"
-             ry="2.184521"
-             rx="2.184521" />
-          <rect
-             style="fill:#404040;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.42682922;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             id="rect4470"
-             width="23.304878"
-             height="23.304878"
-             x="27.665192"
-             y="-15.359757"
-             ry="2.184521"
-             rx="2.184521" />
-          <rect
-             style="fill:#404040;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.42682922;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             id="rect4476"
-             width="23.304878"
-             height="23.304878"
-             x="1.9822657"
-             y="10.32317"
-             ry="2.184521"
-             rx="2.184521" />
-          <rect
-             style="fill:#404040;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.42682922;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             id="rect4482"
-             width="23.304878"
-             height="23.304878"
-             x="27.665192"
-             y="10.323171"
-             ry="2.184521"
-             rx="2.184521" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/images/equal_pairs2.svg b/images/equal_pairs2.svg
deleted file mode 100644
index 700d0cb..0000000
--- a/images/equal_pairs2.svg
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="55"
-   height="55"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="equal_pairs2.svg"
-   sodipodi:docbase="/home/msgodoi/olpc/workspace/Memorize.activity/images"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#404040"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="12.309091"
-     inkscape:cx="27.5"
-     inkscape:cy="27.5"
-     inkscape:document-units="px"
-     inkscape:current-layer="g5562"
-     width="55px"
-     height="55px"
-     inkscape:window-width="1432"
-     inkscape:window-height="871"
-     inkscape:window-x="4"
-     inkscape:window-y="25" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g5499"
-       transform="translate(-0.7444609,-1.3648449)">
-      <g
-         id="g5512"
-         transform="matrix(1.0512821,0,0,1.051282,-6.381851e-2,0.8717949)">
-        <g
-           id="g5562"
-           transform="translate(0.4512195,17.493391)">
-          <rect
-             style="fill:#404040;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.42682922;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             id="rect4522"
-             width="23.304878"
-             height="23.304878"
-             x="1.9822657"
-             y="-15.359758"
-             ry="2.184521"
-             rx="2.184521" />
-          <text
-             xml:space="preserve"
-             style="font-size:11.1061306px;font-style:normal;font-weight:normal;fill:#c7c8cc;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-             x="5.497498"
-             y="4.3117237"
-             id="text4526"><tspan
-               sodipodi:role="line"
-               id="tspan4528"
-               x="5.497498"
-               y="4.3117237"
-               style="font-size:22px;font-weight:bold;fill:#c7c8cc;fill-opacity:1">1</tspan></text>
-          <rect
-             style="fill:#404040;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.42682922;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             id="rect4470"
-             width="23.304878"
-             height="23.304878"
-             x="27.665192"
-             y="-15.359757"
-             ry="2.184521"
-             rx="2.184521" />
-          <text
-             xml:space="preserve"
-             style="font-size:11.1061306px;font-style:normal;font-weight:normal;fill:#c7c8cc;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-             x="31.180424"
-             y="4.3117247"
-             id="text4472"><tspan
-               sodipodi:role="line"
-               id="tspan4474"
-               x="31.180424"
-               y="4.3117247"
-               style="font-size:22px;font-weight:bold;fill:#c7c8cc;fill-opacity:1">1</tspan></text>
-          <rect
-             style="fill:#404040;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.42682922;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             id="rect4476"
-             width="23.304878"
-             height="23.304878"
-             x="1.9822657"
-             y="10.32317"
-             ry="2.184521"
-             rx="2.184521" />
-          <text
-             xml:space="preserve"
-             style="font-size:11.1061306px;font-style:normal;font-weight:normal;fill:#c7c8cc;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-             x="6.066834"
-             y="30.139671"
-             id="text4478"><tspan
-               sodipodi:role="line"
-               id="tspan4480"
-               x="6.066834"
-               y="30.139671"
-               style="font-size:22px;font-weight:bold;fill:#c7c8cc;fill-opacity:1">2</tspan></text>
-          <rect
-             style="fill:#404040;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.42682922;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             id="rect4482"
-             width="23.304878"
-             height="23.304878"
-             x="27.665192"
-             y="10.323171"
-             ry="2.184521"
-             rx="2.184521" />
-          <text
-             xml:space="preserve"
-             style="font-size:11.1061306px;font-style:normal;font-weight:normal;fill:#c7c8cc;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-             x="31.74976"
-             y="30.139671"
-             id="text4484"><tspan
-               sodipodi:role="line"
-               id="tspan4486"
-               x="31.74976"
-               y="30.139671"
-               style="font-size:22px;font-weight:bold;fill:#c7c8cc;fill-opacity:1">2</tspan></text>
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/images/game-load.svg b/images/game-load.svg
deleted file mode 100644
index 4222b7a..0000000
--- a/images/game-load.svg
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   enable-background="new 0 0 55 55"
-   height="55px"
-   version="1.1"
-   viewBox="0 0 55 55"
-   width="55px"
-   x="0px"
-   xml:space="preserve"
-   y="0px"
-   id="svg5142"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   sodipodi:docname="game-load.svg"
-   sodipodi:docbase="/home/msgodoi/olpc/workspace/Memorize.activity/images"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata
-     id="metadata5176"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
-     id="defs5174">
-	
-
-		
-		
-		
-		
-		
-		
-			
-		
-	
-			
-				
-			
-		</defs><sodipodi:namedview
-     inkscape:window-height="871"
-     inkscape:window-width="1432"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.96862745"
-     guidetolerance="10.0"
-     gridtolerance="10.0"
-     objecttolerance="10.0"
-     borderopacity="1.0"
-     bordercolor="#666666"
-     pagecolor="#4b4b4b"
-     id="base"
-     inkscape:zoom="12.145455"
-     inkscape:cx="27.5"
-     inkscape:cy="30.793413"
-     inkscape:window-x="4"
-     inkscape:window-y="25"
-     inkscape:current-layer="g4140" /><g
-     id="g5125"
-     transform="translate(-2,2)"><g
-       id="g5147">
-			<g
-   id="g5149">
-				<path
-   style="fill:#ffffff;stroke:#8c8c8c;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round"
-   id="path5151"
-   d="M 6.736,49.002 L 31.256,49.002 C 33.481,49.002 34.695,47.555 34.695,45.561 L 34.695,18.281 C 34.695,16.551 32.963,14.84 31.256,14.84 L 26.867,14.84" />
-			</g>
-		</g><g
-       id="g5153">
-			<g
-   id="g5155">
-				<path
-   style="fill:#ffffff;stroke:#8c8c8c;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round"
-   id="path5157"
-   d="M 26.867,38.592 C 26.867,40.428 25.522,41.793 23.426,42.639 L 6.736,49.002 L 6.736,14.84 L 23.426,6.241 C 25.654,5.847 26.867,7.081 26.867,9.075 L 26.867,38.592 z " />
-			</g>
-		</g><path
-       style="fill:none;stroke:#8c8c8c;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round"
-       id="path5159"
-       d="M 9.424,42.607 C 9.424,42.607 8.073,42.064 6.722,42.064 C 5.371,42.064 4.019,42.607 4.019,42.607" /><path
-       style="fill:none;stroke:#8c8c8c;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round"
-       id="path5161"
-       d="M 9.424,32.006 C 9.424,32.006 8.185,31.463 6.609,31.463 C 5.032,31.463 4.019,32.006 4.019,32.006" /><path
-       style="fill:none;stroke:#8c8c8c;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round"
-       id="path5163"
-       d="M 9.424,21.678 C 9.424,21.678 8.299,21.134 6.497,21.134 C 4.695,21.134 4.019,21.678 4.019,21.678" /><line
-       style="fill:none;stroke:#8c8c8c;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round"
-       id="line5165"
-       y2="11.505"
-       y1="46.533001"
-       x2="13.209"
-       x1="13.209" /></g><g
-     id="g4140"
-     transform="matrix(0.8372116,0,0,0.8372116,8.751416,-7.2720533e-2)"><rect
-       style="fill:#ffffff;stroke:#ffffff;stroke-width:1.79166174;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect2221"
-       height="5.0509453"
-       width="5.0529833"
-       y="2.5762157"
-       x="32.743912" /><rect
-       style="fill:#404040;stroke:#ffffff;stroke-width:1.79166175;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;fill-opacity:1"
-       id="rect2223"
-       height="5.0509453"
-       width="5.0529833"
-       y="2.5764074"
-       x="40.25333" /><rect
-       style="fill:#ffffff;stroke:#ffffff;stroke-width:1.79166175;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;fill-opacity:1"
-       id="rect2225"
-       height="5.0509453"
-       width="5.0529833"
-       y="2.5764074"
-       x="47.70649" /><rect
-       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.79166174;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect2227"
-       height="5.0509453"
-       width="5.0529833"
-       y="10.110711"
-       x="32.743912" /><rect
-       style="fill:#404040;fill-opacity:1;stroke:#ffffff;stroke-width:1.79166174;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect2229"
-       height="5.0509453"
-       width="5.0529833"
-       y="17.624184"
-       x="40.25333" /><rect
-       style="fill:#404040;stroke:#ffffff;stroke-width:1.79166175;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;fill-opacity:1"
-       id="rect2231"
-       height="5.0509453"
-       width="5.0529833"
-       y="10.110903"
-       x="47.70649" /><rect
-       style="fill:#404040;fill-opacity:1;stroke:#ffffff;stroke-width:1.79166174;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect2233"
-       height="5.0509453"
-       width="5.0529833"
-       y="17.623993"
-       x="32.743912" /><rect
-       style="fill:#ffffff;stroke:#ffffff;stroke-width:1.79166174;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect2235"
-       height="5.0509453"
-       width="5.0529833"
-       y="10.110903"
-       x="40.25333" /><rect
-       style="fill:#404040;stroke:#ffffff;stroke-width:1.79166175;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;fill-opacity:1"
-       id="rect2237"
-       height="5.0509453"
-       width="5.0529833"
-       y="17.624184"
-       x="47.70649" /></g><line
-     style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-     id="line5169"
-     y2="36.425068"
-     y1="22.462688"
-     x2="44.528595"
-     x1="44.72258" /><polyline
-     style="fill:none;stroke:#ffffff;stroke-width:5.1055975;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-     id="polyline5171"
-     points="     51.562,15.306 41.17,16.188 42.053,5.794    "
-     transform="matrix(-0.5053552,0.4648229,-0.493202,-0.4762768,73.4836,10.383118)" /><line
-     style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-     id="line4138"
-     y2="36.52364"
-     y1="36.329655"
-     x2="44.443764"
-     x1="36.409523" /></svg>
\ No newline at end of file
diff --git a/images/game-new.svg b/images/game-new.svg
deleted file mode 100644
index b71ccc1..0000000
--- a/images/game-new.svg
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Icon"
-   width="43.584"
-   height="43.292"
-   viewBox="0 0 43.584 43.292"
-   overflow="visible"
-   enable-background="new 0 0 43.584 43.292"
-   xml:space="preserve"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   sodipodi:docname="game-new.svg"
-   sodipodi:docbase="/home/msgodoi/olpc/workspace/Memorize.activity/images"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata
-   id="metadata2242"><rdf:RDF><cc:Work
-       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
-   id="defs2240" /><sodipodi:namedview
-   inkscape:window-height="879"
-   inkscape:window-width="1440"
-   inkscape:pageshadow="2"
-   inkscape:pageopacity="1"
-   guidetolerance="10.0"
-   gridtolerance="10.0"
-   objecttolerance="10.0"
-   borderopacity="1.0"
-   bordercolor="#666666"
-   pagecolor="#4b4b4b"
-   id="base"
-   inkscape:zoom="15.637993"
-   inkscape:cx="21.792"
-   inkscape:cy="26.761746"
-   inkscape:window-x="0"
-   inkscape:window-y="21"
-   inkscape:current-layer="Icon"
-   showguides="true"
-   inkscape:guide-bbox="true" />
-<rect
-   x="1.5007635"
-   y="1.5007635"
-   width="8.5757914"
-   height="8.5757914"
-   id="rect2221"
-   style="fill:#ffffff;stroke:#ffffff;stroke-width:3.00152707;stroke-opacity:1" />
-<rect
-   x="14.650882"
-   y="1.5007635"
-   width="8.5757914"
-   height="8.5757914"
-   id="rect2223"
-   style="fill:#404040;stroke:#ffffff;stroke-width:3.00152707;stroke-opacity:1;fill-opacity:1" />
-
-
-<rect
-   x="14.522763"
-   y="27.082636"
-   width="8.5757914"
-   height="8.5757914"
-   id="rect2229"
-   style="fill:#404040;fill-opacity:1;stroke:#ffffff;stroke-width:3.00152707;stroke-opacity:1" />
-<rect
-   x="27.300175"
-   y="14.320445"
-   width="8.5757914"
-   height="8.5757914"
-   id="rect2231"
-   style="fill:#404040;fill-opacity:1;stroke:#ffffff;stroke-width:3.00152707;stroke-opacity:1" />
-<rect
-   x="1.5007635"
-   y="27.049763"
-   width="8.5757914"
-   height="8.5757914"
-   id="rect2233"
-   style="fill:#404040;stroke:#ffffff;stroke-width:3.00152707;stroke-opacity:1;fill-opacity:1" />
-<rect
-   x="14.522988"
-   y="14.320445"
-   width="8.5757914"
-   height="8.5757914"
-   id="rect2235"
-   style="fill:#ffffff;stroke:#ffffff;stroke-width:3.00152707;stroke-opacity:1" />
-<rect
-   x="27.300175"
-   y="27.049763"
-   width="8.5757914"
-   height="8.5757914"
-   id="rect2237"
-   style="fill:#404040;fill-opacity:1;stroke:#ffffff;stroke-width:3.00152707;stroke-opacity:1" />
-<g
-   id="g8128"
-   transform="matrix(1.1533304,0,0,1.1849266,74.491613,11.842114)"
-   style="stroke:#ffffff;stroke-opacity:1"><path
-     sodipodi:nodetypes="cccccc"
-     id="path6167"
-     d="M -27.423669,19.213102 L -34.384959,18.667751 L -41.332006,19.051133 L -34.303975,19.649604 L -27.488656,19.213102 L -34.44067,18.736178"
-     style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;marker-start:none;stroke-opacity:1" /><path
-     sodipodi:nodetypes="cccccc"
-     id="path6165"
-     d="M -34.432262,26.112846 L -33.886911,19.151556 L -34.270293,12.204509 L -34.868764,19.23254 L -34.432262,26.047859 L -33.955338,19.095845"
-     style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;marker-start:none;stroke-opacity:1" /><path
-     sodipodi:nodetypes="cccccc"
-     id="path6169"
-     d="M -29.517762,24.133282 L -34.054516,18.825285 L -39.237912,14.184073 L -34.691527,19.576825 L -29.563716,24.087329 L -34.142295,18.834277"
-     style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;marker-start:none;stroke-opacity:1" /><path
-     sodipodi:nodetypes="cccccc"
-     id="path6171"
-     d="M -29.403233,14.298603 L -34.71123,18.835357 L -39.352442,24.018753 L -33.959691,19.472367 L -29.449186,14.344555 L -34.702238,18.923135"
-     style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;marker-start:none;stroke-opacity:1" /></g><rect
-   x="1.5007635"
-   y="14.320629"
-   width="8.5757914"
-   height="8.5757914"
-   id="rect2337"
-   style="fill:#ffffff;stroke:#ffffff;stroke-width:3.00152707;stroke-opacity:1" /><rect
-   x="27.299765"
-   y="1.5004449"
-   width="8.5757914"
-   height="8.5757914"
-   id="rect2339"
-   style="fill:#ffffff;stroke:#ffffff;stroke-width:3.00152707;stroke-opacity:1" /></svg>
\ No newline at end of file
diff --git a/images/game-restart.svg b/images/game-restart.svg
deleted file mode 100644
index 326d4c8..0000000
--- a/images/game-restart.svg
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
-   id="Icon"
-   width="55"
-   height="55"
-   viewBox="0 0 43.584 43.292"
-   overflow="visible"
-   enable-background="new 0 0 43.584 43.292"
-   xml:space="preserve"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   sodipodi:docname="game-restart.svg"
-   sodipodi:docbase="/home/msgodoi/olpc/workspace/Memorize.activity/images"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata
-   id="metadata2242"><rdf:RDF><cc:Work
-       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
-   id="defs2240" /><sodipodi:namedview
-   inkscape:window-height="871"
-   inkscape:window-width="1432"
-   inkscape:pageshadow="2"
-   inkscape:pageopacity="1"
-   guidetolerance="10.0"
-   gridtolerance="10.0"
-   objecttolerance="10.0"
-   borderopacity="1.0"
-   bordercolor="#666666"
-   pagecolor="#404040"
-   id="base"
-   inkscape:zoom="1"
-   inkscape:cx="27.5"
-   inkscape:cy="27.5"
-   inkscape:window-x="4"
-   inkscape:window-y="25"
-   inkscape:current-layer="g7707"
-   width="55px"
-   height="55px" />
-<rect
-   x="6.5091267"
-   y="12.102893"
-   width="9.3666306"
-   height="9.3634796"
-   id="rect2221"
-   style="fill:#ffffff;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-<rect
-   x="17.313606"
-   y="12.102893"
-   width="9.3666306"
-   height="9.3634796"
-   id="rect2223"
-   style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-<rect
-   x="28.118086"
-   y="12.102893"
-   width="9.3666306"
-   height="9.3634796"
-   id="rect2225"
-   style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-<rect
-   x="6.5091267"
-   y="22.765926"
-   width="9.3666306"
-   height="9.3634796"
-   id="rect2227"
-   style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-<rect
-   x="17.313606"
-   y="22.765926"
-   width="9.3666306"
-   height="9.3634796"
-   id="rect2229"
-   style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-<rect
-   x="28.118086"
-   y="22.765926"
-   width="9.3666306"
-   height="9.3634796"
-   id="rect2231"
-   style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-<rect
-   x="6.5091267"
-   y="33.428959"
-   width="9.3666306"
-   height="9.3634796"
-   id="rect2233"
-   style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-<rect
-   x="17.313606"
-   y="33.428959"
-   width="9.3666306"
-   height="9.3634796"
-   id="rect2235"
-   style="fill:#ffffff;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-<rect
-   x="28.118086"
-   y="33.428959"
-   width="9.3666306"
-   height="9.3634796"
-   id="rect2237"
-   style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-<g
-   transform="matrix(0.8205513,0,0,0.8205513,6.0016399,6.8019757)"
-   id="g3696"><g
-     id="g6733"
-     transform="matrix(1.4726213,0,0,1.7601655,-10.157993,1.3703924)"><g
-       id="g7707"
-       transform="matrix(0.7791286,0,0,0.7791286,3.4314416,-1.0263174)"><g
-         id="g8681"
-         transform="translate(-0.2716888,-0.7287783)"><path
-           style="fill:none;fill-rule:evenodd;stroke:#8c8c8c;stroke-width:2.91463447;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 21.479131,-3.6648374 C 21.479131,12.592068 21.479131,3.5218581 21.479131,9.1531062"
-           id="path8177"
-           sodipodi:nodetypes="cc" /><path
-           style="fill:none;fill-rule:evenodd;stroke:#8c8c8c;stroke-width:2.91463447;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 26.27629,4.3453376 C 20.432698,10.18893 23.693011,6.9286162 21.668843,8.9527852"
-           id="path9150"
-           sodipodi:nodetypes="cc" /><path
-           style="fill:none;fill-rule:evenodd;stroke:#8c8c8c;stroke-width:2.91463447;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 16.709475,4.3879849 C 22.553067,10.231577 19.292754,6.9712635 21.316922,8.9954325"
-           id="path9152"
-           sodipodi:nodetypes="cc" /></g></g></g></g></svg>
\ No newline at end of file
diff --git a/images/game-save.svg b/images/game-save.svg
deleted file mode 100644
index 67742a7..0000000
--- a/images/game-save.svg
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   enable-background="new 0 0 55 55"
-   height="55px"
-   version="1.1"
-   viewBox="0 0 55 55"
-   width="55px"
-   x="0px"
-   xml:space="preserve"
-   y="0px"
-   id="svg5142"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   sodipodi:docname="game-save.svg"
-   sodipodi:docbase="/home/msgodoi/olpc/workspace/Memorize.activity/images"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata
-     id="metadata5176"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
-     id="defs5174">
-	
-
-		
-		
-		
-		
-		
-		
-			
-		
-	
-			
-				
-			
-		</defs><sodipodi:namedview
-     inkscape:window-height="871"
-     inkscape:window-width="1432"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="1"
-     guidetolerance="10.0"
-     gridtolerance="10.0"
-     objecttolerance="10.0"
-     borderopacity="1.0"
-     bordercolor="#666666"
-     pagecolor="#4b4b4b"
-     id="base"
-     inkscape:zoom="12.145455"
-     inkscape:cx="27.5"
-     inkscape:cy="30.793413"
-     inkscape:window-x="4"
-     inkscape:window-y="25"
-     inkscape:current-layer="svg5142" /><g
-     id="g5125"
-     transform="translate(-2,2)"><g
-       id="g5147">
-			<g
-   id="g5149">
-				<path
-   style="fill:#ffffff;stroke:#8c8c8c;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round"
-   id="path5151"
-   d="M 6.736,49.002 L 31.256,49.002 C 33.481,49.002 34.695,47.555 34.695,45.561 L 34.695,18.281 C 34.695,16.551 32.963,14.84 31.256,14.84 L 26.867,14.84" />
-			</g>
-		</g><g
-       id="g5153">
-			<g
-   id="g5155">
-				<path
-   style="fill:#ffffff;stroke:#8c8c8c;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round"
-   id="path5157"
-   d="M 26.867,38.592 C 26.867,40.428 25.522,41.793 23.426,42.639 L 6.736,49.002 L 6.736,14.84 L 23.426,6.241 C 25.654,5.847 26.867,7.081 26.867,9.075 L 26.867,38.592 z " />
-			</g>
-		</g><path
-       style="fill:none;stroke:#8c8c8c;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round"
-       id="path5159"
-       d="M 9.424,42.607 C 9.424,42.607 8.073,42.064 6.722,42.064 C 5.371,42.064 4.019,42.607 4.019,42.607" /><path
-       style="fill:none;stroke:#8c8c8c;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round"
-       id="path5161"
-       d="M 9.424,32.006 C 9.424,32.006 8.185,31.463 6.609,31.463 C 5.032,31.463 4.019,32.006 4.019,32.006" /><path
-       style="fill:none;stroke:#8c8c8c;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round"
-       id="path5163"
-       d="M 9.424,21.678 C 9.424,21.678 8.299,21.134 6.497,21.134 C 4.695,21.134 4.019,21.678 4.019,21.678" /><line
-       style="fill:none;stroke:#8c8c8c;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round"
-       id="line5165"
-       y2="11.505"
-       y1="46.533001"
-       x2="13.209"
-       x1="13.209" /></g><line
-     style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-     id="line5169"
-     y2="36.425068"
-     y1="22.462688"
-     x2="45.845959"
-     x1="46.039944" /><polyline
-     style="fill:none;stroke:#ffffff;stroke-width:5.1055975;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-     id="polyline5171"
-     points="     51.562,15.306 41.17,16.188 42.053,5.794    "
-     transform="matrix(0.4648229,0.5053552,-0.4762768,0.493202,24.919883,7.4889306)" /><line
-     style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-     id="line4138"
-     y2="36.52364"
-     y1="36.329655"
-     x2="45.78508"
-     x1="37.750839" /><rect
-     style="fill:#ffffff;stroke:#ffffff;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     id="rect2221"
-     height="4.2287102"
-     width="4.2304163"
-     y="2.0430667"
-     x="36.411789" /><rect
-     style="fill:#404040;fill-opacity:1;stroke:#ffffff;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     id="rect2223"
-     height="4.2287102"
-     width="4.2304163"
-     y="2.0432274"
-     x="42.698757" /><rect
-     style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     id="rect2225"
-     height="4.2287102"
-     width="4.2304163"
-     y="2.0432274"
-     x="48.938633" /><rect
-     style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     id="rect2227"
-     height="4.2287102"
-     width="4.2304163"
-     y="8.3510332"
-     x="36.411789" /><rect
-     style="fill:#404040;fill-opacity:1;stroke:#ffffff;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     id="rect2229"
-     height="4.2287102"
-     width="4.2304163"
-     y="14.641401"
-     x="42.698757" /><rect
-     style="fill:#404040;fill-opacity:1;stroke:#ffffff;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     id="rect2231"
-     height="4.2287102"
-     width="4.2304163"
-     y="8.3511934"
-     x="48.938633" /><rect
-     style="fill:#404040;fill-opacity:1;stroke:#ffffff;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     id="rect2233"
-     height="4.2287102"
-     width="4.2304163"
-     y="14.641241"
-     x="36.411789" /><rect
-     style="fill:#ffffff;stroke:#ffffff;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     id="rect2235"
-     height="4.2287102"
-     width="4.2304163"
-     y="8.3511934"
-     x="42.698757" /><rect
-     style="fill:#404040;fill-opacity:1;stroke:#ffffff;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     id="rect2237"
-     height="4.2287102"
-     width="4.2304163"
-     y="14.641401"
-     x="48.938633" /></svg>
\ No newline at end of file