diff --git a/data/stage1/image/options/logo.png b/data/stage1/image/options/logo.png
index b894f0f..f859397 100644
Binary files a/data/stage1/image/options/logo.png and b/data/stage1/image/options/logo.png differ
diff --git a/data/stage2/image/battle/hud/ship-effect-bad.png b/data/stage2/image/battle/hud/ship-effect-bad.png
index d6f62df..acbb9d3 100644
Binary files a/data/stage2/image/battle/hud/ship-effect-bad.png and b/data/stage2/image/battle/hud/ship-effect-bad.png differ
diff --git a/data/stage2/image/battle/hud/ship-effect-good.png b/data/stage2/image/battle/hud/ship-effect-good.png
index ee46fdf..e259027 100644
Binary files a/data/stage2/image/battle/hud/ship-effect-good.png and b/data/stage2/image/battle/hud/ship-effect-good.png differ
diff --git a/data/stage2/image/battle/hud/ship-enemy-playing.png b/data/stage2/image/battle/hud/ship-enemy-playing.png
new file mode 100644
index 0000000..288c12e
Binary files /dev/null and b/data/stage2/image/battle/hud/ship-enemy-playing.png differ
diff --git a/data/stage2/image/battle/hud/ship-enemy.png b/data/stage2/image/battle/hud/ship-enemy.png
index 7987014..1b18fd2 100644
Binary files a/data/stage2/image/battle/hud/ship-enemy.png and b/data/stage2/image/battle/hud/ship-enemy.png differ
diff --git a/data/stage2/image/battle/hud/ship-hover.png b/data/stage2/image/battle/hud/ship-hover.png
index c4d3ada..ac59a09 100644
Binary files a/data/stage2/image/battle/hud/ship-hover.png and b/data/stage2/image/battle/hud/ship-hover.png differ
diff --git a/data/stage2/image/battle/hud/ship-own-playing.png b/data/stage2/image/battle/hud/ship-own-playing.png
new file mode 100644
index 0000000..8c1d6cb
Binary files /dev/null and b/data/stage2/image/battle/hud/ship-own-playing.png differ
diff --git a/data/stage2/image/battle/hud/ship-own.png b/data/stage2/image/battle/hud/ship-own.png
index 061b7b1..b0deefe 100644
Binary files a/data/stage2/image/battle/hud/ship-own.png and b/data/stage2/image/battle/hud/ship-own.png differ
diff --git a/graphics/ui/battle.svg b/graphics/ui/battle.svg
index cfd902b..4bea56c 100644
--- a/graphics/ui/battle.svg
+++ b/graphics/ui/battle.svg
@@ -1611,6 +1611,38 @@
        fy="-214.00548"
        r="109.00001"
        gradientUnits="userSpaceOnUse" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath9988-1-3">
+      <path
+         inkscape:connector-curvature="0"
+         id="path9990-9-6"
+         d="m 1103.6304,498.39142 v 192.12646 h 192.124 V 498.39142 Z m 57.2615,21.62794 38.8005,67.20142 38.7979,-67.20142 6.2662,3.61879 -38.8005,67.20144 h 77.5983 v 7.23261 h -77.5983 l 38.8005,67.20143 -6.2662,3.61633 -38.7979,-67.20144 -38.8005,67.20144 -6.2636,-3.61633 38.798,-67.20143 h -77.5958 v -7.23261 h 77.5958 l -38.798,-67.20144 z"
+         style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.27869511px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </clipPath>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask1497">
+      <path
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2.81271362;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 1143.1656,547.45818 56.34,3.35849 56.3399,-3.35849 v 93.99459 l -56.3399,-3.35849 -56.34,3.35849 z"
+         id="path1499"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccc" />
+    </mask>
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter1527"
+       x="-0.071655376"
+       width="1.1433108"
+       y="-0.082740501"
+       height="1.165481">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="3.0820655"
+         id="feGaussianBlur1529" />
+    </filter>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -1619,11 +1651,11 @@
      borderopacity="1"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.49999998"
-     inkscape:cx="872.76791"
-     inkscape:cy="689.91168"
+     inkscape:zoom="3.9999998"
+     inkscape:cx="-348.59606"
+     inkscape:cy="331.22692"
      inkscape:document-units="px"
-     inkscape:current-layer="layer9"
+     inkscape:current-layer="layer1"
      showgrid="false"
      units="px"
      showguides="false"
@@ -1640,7 +1672,7 @@
      borderlayer="false"
      inkscape:snap-bbox-midpoints="true"
      inkscape:lockguides="true"
-     inkscape:snap-nodes="true"
+     inkscape:snap-nodes="false"
      inkscape:snap-others="true"
      inkscape:snap-bbox-edge-midpoints="false"
      inkscape:measure-start="626.938,751.563"
@@ -1666,7 +1698,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>
@@ -1698,13 +1730,13 @@
     <image
        sodipodi:absref="/home/michael/workspace/spacetac/graphics/ui/pics/sprite.png"
        xlink:href="pics/sprite.png"
-       width="84.542961"
-       height="84.542961"
-       preserveAspectRatio="none"
-       id="image9266"
-       x="930.039"
+       style="display:inline;enable-background:new"
        y="244.75706"
-       style="display:inline;enable-background:new" />
+       x="930.039"
+       id="image9266"
+       preserveAspectRatio="none"
+       height="84.542961"
+       width="84.542961" />
     <use
        x="0"
        y="0"
@@ -2746,12 +2778,12 @@
       <image
          sodipodi:absref="/home/michael/workspace/spacetac/graphics/ui/pics/portrait.png"
          xlink:href="pics/portrait.png"
-         width="183.97668"
-         height="183.97649"
-         preserveAspectRatio="none"
-         id="image6587"
+         y="497.55182"
          x="465.07187"
-         y="497.55182" />
+         id="image6587"
+         preserveAspectRatio="none"
+         height="183.97649"
+         width="183.97668" />
     </g>
   </g>
   <g
@@ -2879,17 +2911,17 @@
     <image
        sodipodi:absref="/home/michael/workspace/spacetac/graphics/ui/pics/action.png"
        xlink:href="pics/action.png"
-       style="display:inline;enable-background:new"
-       width="83.066681"
-       height="83.066681"
-       preserveAspectRatio="none"
-       id="image5902"
+       y="312.3288"
        x="-333.53336"
-       y="312.3288" />
+       id="image5902"
+       preserveAspectRatio="none"
+       height="83.066681"
+       width="83.066681"
+       style="display:inline;enable-background:new" />
     <g
        id="g10025-6"
        style="display:inline;fill:none;enable-background:new"
-       inkscape:export-filename="/home/michael/workspace/perso/spacetac/graphics/exported/battle/hud/ship-own.png"
+       inkscape:export-filename="/home/michael/workspace/spacetac/data/stage2/image/battle/hud/ship-own-playing.png"
        inkscape:export-xdpi="96"
        inkscape:export-ydpi="96"
        transform="matrix(0.9474435,0,0,0.9474435,-1507.8523,-51.648256)">
@@ -2939,7 +2971,7 @@
        transform="matrix(0.9474435,0,0,0.9474435,-1506.8523,70.351749)"
        inkscape:export-ydpi="96"
        inkscape:export-xdpi="96"
-       inkscape:export-filename="/home/michael/workspace/perso/spacetac/graphics/exported/battle/hud/ship-own.png"
+       inkscape:export-filename="/home/michael/workspace/spacetac/data/stage2/image/battle/hud/ship-enemy-playing.png"
        style="display:inline;fill:none;enable-background:new"
        id="g7821">
       <path
@@ -2992,7 +3024,10 @@
        transform="translate(155.5635)"
        width="100%"
        height="100%"
-       mask="url(#mask8492)" />
+       mask="url(#mask8492)"
+       inkscape:export-filename="/home/michael/workspace/spacetac/data/stage2/image/battle/hud/ship-own.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96" />
     <use
        x="0"
        y="0"
@@ -3001,7 +3036,10 @@
        transform="translate(154.5635)"
        width="100%"
        height="100%"
-       mask="url(#mask8497)" />
+       mask="url(#mask8497)"
+       inkscape:export-filename="/home/michael/workspace/spacetac/data/stage2/image/battle/hud/ship-enemy.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96" />
     <g
        id="g8128"
        transform="translate(0,-1.2500001)">
@@ -3141,6 +3179,50 @@
        transform="translate(1183.0283,-522.25003)"
        width="100%"
        height="100%" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path7819-7"
+       id="use1458"
+       transform="translate(1720.4498,-460.77799)"
+       width="100%"
+       height="100%" />
+    <g
+       id="g1533"
+       inkscape:export-filename="/home/michael/workspace/spacetac/data/stage2/image/battle/hud/ship-hover.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <path
+         mask="url(#mask1497)"
+         inkscape:export-ydpi="96"
+         inkscape:export-xdpi="96"
+         inkscape:export-filename="/home/michael/workspace/spacetac/data/stage2/image/battle/hud/ship-hover.png"
+         clip-path="url(#clipPath9988-1-3)"
+         d="m 1254.1701,594.45544 -27.239,47.17932 h -54.478 l -27.2389,-47.17932 27.2389,-47.17931 h 54.478 z"
+         inkscape:randomized="0"
+         inkscape:rounded="0"
+         inkscape:flatsided="true"
+         sodipodi:arg2="0.52359878"
+         sodipodi:arg1="0"
+         sodipodi:r2="47.179317"
+         sodipodi:r1="54.477982"
+         sodipodi:cy="594.45544"
+         sodipodi:cx="1199.6921"
+         sodipodi:sides="6"
+         id="path7819-7"
+         style="enable-background:new;display:inline;fill:none;fill-rule:evenodd;stroke:#faefed;stroke-width:3.16641573;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:type="star"
+         transform="matrix(0.9474435,0,0,0.9474435,-1509.6895,247.41563)" />
+      <use
+         style="filter:url(#filter1527);opacity:0.756"
+         height="100%"
+         width="100%"
+         transform="matrix(1.0919919,0,0,1.0919919,34.317474,-74.571239)"
+         id="use1501"
+         xlink:href="#path7819-7"
+         y="0"
+         x="0" />
+    </g>
   </g>
   <g
      inkscape:groupmode="layer"
@@ -3667,13 +3749,13 @@
           <image
              sodipodi:absref="/home/michael/workspace/spacetac/graphics/ui/pics/portrait.png"
              xlink:href="pics/portrait.png"
-             width="76.394867"
-             height="76.394867"
-             preserveAspectRatio="none"
-             id="image5590"
-             x="816.54016"
+             style="display:inline;enable-background:new"
              y="313.90408"
-             style="display:inline;enable-background:new" />
+             x="816.54016"
+             id="image5590"
+             preserveAspectRatio="none"
+             height="76.394867"
+             width="76.394867" />
         </g>
         <use
            transform="translate(96.619495)"
diff --git a/graphics/ui/options.svg b/graphics/ui/options.svg
index c137f3c..27df108 100644
--- a/graphics/ui/options.svg
+++ b/graphics/ui/options.svg
@@ -15,7 +15,7 @@
    viewBox="0 0 1920 1080"
    version="1.1"
    id="svg6044"
-   inkscape:version="0.92.1 r15371"
+   inkscape:version="0.92.4 (33fec40, 2019-01-16)"
    sodipodi:docname="options.svg">
   <defs
      id="defs6038">
@@ -318,71 +318,6 @@
          in2="result3"
          id="feBlend4626" />
     </filter>
-    <filter
-       inkscape:collect="always"
-       style="color-interpolation-filters:sRGB"
-       id="filter1099"
-       x="-0.010967931"
-       width="1.0219359"
-       y="-0.035877373"
-       height="1.0717547">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="5.7395903"
-         id="feGaussianBlur1101" />
-    </filter>
-    <filter
-       inkscape:collect="always"
-       style="color-interpolation-filters:sRGB"
-       id="filter1464"
-       x="-0.078658663"
-       width="1.1573173"
-       y="-0.30188829"
-       height="1.6037766">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="37.729402"
-         id="feGaussianBlur1466" />
-    </filter>
-    <filter
-       inkscape:collect="always"
-       style="color-interpolation-filters:sRGB"
-       id="filter1227"
-       x="-0.031058609"
-       width="1.0621172"
-       y="-0.10560248"
-       height="1.211205">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="4.2679239"
-         id="feGaussianBlur1229" />
-    </filter>
-    <filter
-       inkscape:collect="always"
-       style="color-interpolation-filters:sRGB"
-       id="filter1199"
-       x="-0.030298591"
-       width="1.0605972"
-       y="-0.11544904"
-       height="1.2308981">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="4.4615997"
-         id="feGaussianBlur1201" />
-    </filter>
-    <filter
-       inkscape:collect="always"
-       style="color-interpolation-filters:sRGB"
-       id="filter6506"
-       x="-0.024932763"
-       width="1.0498655"
-       y="-0.64152092"
-       height="2.2830417">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="10.468047"
-         id="feGaussianBlur6508" />
-    </filter>
     <linearGradient
        inkscape:collect="always"
        id="linearGradient6484">
@@ -747,15 +682,6 @@
          inkscape:export-xdpi="96"
          inkscape:export-ydpi="96" />
     </clipPath>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6484"
-       id="linearGradient4817"
-       gradientUnits="userSpaceOnUse"
-       x1="329.62024"
-       y1="698.93243"
-       x2="1312.3025"
-       y2="698.93243" />
     <filter
        inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
@@ -795,6 +721,172 @@
          stdDeviation="5.9752511"
          id="feGaussianBlur5167-9" />
     </filter>
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter1099-9"
+       x="-0.010967931"
+       width="1.0219359"
+       y="-0.035877373"
+       height="1.0717547">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="5.7395903"
+         id="feGaussianBlur1101-2" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter1464-2"
+       x="-0.078658663"
+       width="1.1573173"
+       y="-0.30188829"
+       height="1.6037766">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="37.729402"
+         id="feGaussianBlur1466-8" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter1227-9"
+       x="-0.031058609"
+       width="1.0621172"
+       y="-0.10560248"
+       height="1.211205">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="4.2679239"
+         id="feGaussianBlur1229-7" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter1199-3"
+       x="-0.030298591"
+       width="1.0605972"
+       y="-0.11544904"
+       height="1.2308981">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="4.4615997"
+         id="feGaussianBlur1201-6" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter6506-1"
+       x="-0.024932763"
+       width="1.0498655"
+       y="-0.64152092"
+       height="2.2830417">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="10.468047"
+         id="feGaussianBlur6508-2" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter1356"
+       x="-0.059728358"
+       width="1.1194566"
+       y="-0.32978171"
+       height="1.6595634">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="24.682331"
+         id="feGaussianBlur1358" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter1406"
+       x="-0.0099213645"
+       width="1.0198427"
+       y="-0.054779418"
+       height="1.1095588">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="4.0999353"
+         id="feGaussianBlur1408" />
+    </filter>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6070"
+       id="radialGradient7707-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(7.3294103,0.30753642,-0.03541702,0.84408361,-699.5184,699.92865)"
+       cx="201.79222"
+       cy="102.01662"
+       fx="201.79222"
+       fy="102.01662"
+       r="136.00291" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6078-4"
+       id="linearGradient7709-8"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.7795277,0,0,3.7795277,22.967702,412.1776)"
+       x1="259.38266"
+       y1="143.13321"
+       x2="259.57538"
+       y2="95.291969" />
+    <linearGradient
+       id="linearGradient6078-4"
+       inkscape:collect="always">
+      <stop
+         id="stop6072-5"
+         offset="0"
+         style="stop-color:#8e9599;stop-opacity:1" />
+      <stop
+         style="stop-color:#6c9bb1;stop-opacity:0.97254902"
+         offset="0.5514378"
+         id="stop6074-0" />
+      <stop
+         id="stop6076-3"
+         offset="1"
+         style="stop-color:#8ea2ac;stop-opacity:1" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6070"
+       id="radialGradient3972"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(7.3294103,0.30753642,-0.03541702,0.84408361,-699.5184,699.92865)"
+       cx="201.79222"
+       cy="102.01662"
+       fx="201.79222"
+       fy="102.01662"
+       r="136.00291" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6484"
+       id="linearGradient4193"
+       gradientUnits="userSpaceOnUse"
+       x1="329.62024"
+       y1="698.93243"
+       x2="1312.3025"
+       y2="698.93243" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6484"
+       id="linearGradient4213"
+       gradientUnits="userSpaceOnUse"
+       x1="329.62024"
+       y1="698.93243"
+       x2="1312.3025"
+       y2="698.93243" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6484"
+       id="linearGradient2261"
+       gradientUnits="userSpaceOnUse"
+       x1="329.62024"
+       y1="698.93243"
+       x2="1312.3025"
+       y2="698.93243" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -803,11 +895,11 @@
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.98994949"
-     inkscape:cx="808.60545"
-     inkscape:cy="635.58998"
+     inkscape:zoom="1.4"
+     inkscape:cx="945.0244"
+     inkscape:cy="778.82876"
      inkscape:document-units="px"
-     inkscape:current-layer="g5443"
+     inkscape:current-layer="layer9"
      showgrid="false"
      units="px"
      showborder="true"
@@ -815,7 +907,12 @@
      inkscape:snap-global="true"
      inkscape:pagecheckerboard="true"
      inkscape:object-paths="false"
-     showguides="false" />
+     showguides="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1058"
+     inkscape:window-x="0"
+     inkscape:window-y="20"
+     inkscape:window-maximized="0" />
   <metadata
      id="metadata6041">
     <rdf:RDF>
@@ -867,107 +964,138 @@
      id="layer9"
      inkscape:label="Logo">
     <g
-       style="display:inline"
-       id="g6308"
-       transform="matrix(1.5568275,0,0,1.5568275,591.04581,198.03194)"
+       transform="matrix(0.64214647,0,0,0.64214647,810.2284,27.184929)"
+       id="g4189"
        inkscape:export-filename="/home/michael/workspace/spacetac/data/stage1/image/options/logo.png"
        inkscape:export-xdpi="96"
        inkscape:export-ydpi="96">
       <g
-         id="g1352"
+         transform="matrix(0.64233192,0,0,0.64233192,-380.59583,-323.85696)"
          style="display:inline"
-         transform="matrix(0.26458334,0,0,0.26458334,-16.765468,-243.23751)">
+         id="g1352-6">
         <g
-           id="g1333"
-           style="display:inline">
+           style="display:inline"
+           id="g1333-1">
           <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             id="rect6272"
+             style="fill:#19323e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.04770947px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
              d="M 332.03215,657.01221 H 1587.9679 l -85.632,383.94719 H 417.66413 Z"
-             style="fill:#19323e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.04770947px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             style="opacity:0.46300001;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#6690a4;stroke-width:8;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter1099)"
-             d="M 332.03215,657.01221 H 1587.9679 l -85.632,383.94719 H 417.66413 Z"
-             id="path1061"
+             id="rect6272-0"
              inkscape:connector-curvature="0"
              sodipodi:nodetypes="ccccc" />
-          <path
-             inkscape:connector-curvature="0"
-             id="path6400"
-             d="m 451.29688,998.95898 c 339.13541,0 678.27082,0 1017.40622,0 22.2962,-99.98242 44.5925,-199.96484 66.8887,-299.94726 -383.7279,0 -767.45573,0 -1151.1836,0 22.29623,99.98242 44.59245,199.96484 66.88868,299.94726 z"
-             style="opacity:0.66600001;fill:#111b27;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.04770947px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter1464)" />
-        </g>
-        <g
-           style="opacity:0.29800002"
-           id="g1197">
-          <path
-             style="display:inline;opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#b5b381;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter1227)"
-             d="m 1179.7577,1022.959 h 308.1642 c 7.2107,-32.332 14.4214,-64.664 21.6322,-96.99599"
-             id="rect6272-3"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccc" />
-          <path
-             inkscape:connector-curvature="0"
-             id="path1147"
-             d="M 707.889,675.01172 H 354.47852 c 6.89503,30.9165 13.79007,61.83299 20.6851,92.74949"
-             style="display:inline;opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#b5b37f;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter1199)"
-             sodipodi:nodetypes="ccc" />
-          <use
-             x="0"
-             y="0"
-             xlink:href="#rect6272-3"
-             id="use1149"
-             transform="matrix(-1,0,0,1,1921.0065,0)"
-             width="100%"
-             height="100%" />
-          <use
-             x="0"
-             y="0"
-             xlink:href="#path1147"
-             id="use1151"
-             transform="matrix(-1,0,0,1,1918.5692,0)"
-             width="100%"
-             height="100%" />
-        </g>
-        <g
-           id="g6396">
-          <path
-             inkscape:connector-curvature="0"
-             id="path6490"
-             d="m 317.68555,681.78711 c 2.73244,12.24175 5.463,24.48392 8.1914,36.72656 330.05664,0 660.11328,0 990.16995,0 2.9101,-13.05448 5.8215,-26.10867 8.7363,-39.16211 -335.88086,0 -671.76172,0 -1007.64258,0 0.18165,0.81185 0.36329,1.6237 0.54493,2.43555 z"
-             style="opacity:0.39500002;fill:#131d22;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.0522899px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter6506)" />
           <path
              sodipodi:nodetypes="ccccc"
              inkscape:connector-curvature="0"
-             id="path6393"
+             id="path1061-6"
+             d="M 332.03215,657.01221 H 1587.9679 l -85.632,383.94719 H 417.66413 Z"
+             style="opacity:0.46300001;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#6690a4;stroke-width:8;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter1099-9)" />
+          <path
+             style="opacity:0.66600001;fill:#111b27;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.04770947px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter1464-2)"
+             d="m 451.29688,998.95898 c 339.13541,0 678.27082,0 1017.40622,0 22.2962,-99.98242 44.5925,-199.96484 66.8887,-299.94726 -383.7279,0 -767.45573,0 -1151.1836,0 22.29623,99.98242 44.59245,199.96484 66.88868,299.94726 z"
+             id="path6400-3"
+             inkscape:connector-curvature="0" />
+        </g>
+        <g
+           id="g1197-2"
+           style="opacity:0.29800002">
+          <path
+             sodipodi:nodetypes="ccc"
+             inkscape:connector-curvature="0"
+             id="rect6272-3-0"
+             d="m 1179.7577,1022.959 h 308.1642 c 7.2107,-32.332 14.4214,-64.664 21.6322,-96.99599"
+             style="display:inline;opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#b5b381;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter1227-9)" />
+          <path
+             sodipodi:nodetypes="ccc"
+             style="display:inline;opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#b5b37f;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter1199-3)"
+             d="M 707.889,675.01172 H 354.47852 c 6.89503,30.9165 13.79007,61.83299 20.6851,92.74949"
+             id="path1147-6"
+             inkscape:connector-curvature="0" />
+          <use
+             height="100%"
+             width="100%"
+             transform="matrix(-1,0,0,1,1921.0065,0)"
+             id="use1149-1"
+             xlink:href="#rect6272-3-0"
+             y="0"
+             x="0" />
+          <use
+             height="100%"
+             width="100%"
+             transform="matrix(-1,0,0,1,1918.5692,0)"
+             id="use1151-5"
+             xlink:href="#path1147-6"
+             y="0"
+             x="0" />
+        </g>
+        <g
+           id="g6396-5">
+          <path
+             style="opacity:0.39500002;fill:#131d22;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.0522899px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter6506-1)"
+             d="m 317.68555,681.78711 c 2.73244,12.24175 5.463,24.48392 8.1914,36.72656 330.05664,0 660.11328,0 990.16995,0 2.9101,-13.05448 5.8215,-26.10867 8.7363,-39.16211 -335.88086,0 -671.76172,0 -1007.64258,0 0.18165,0.81185 0.36329,1.6237 0.54493,2.43555 z"
+             id="path6490-4"
+             inkscape:connector-curvature="0" />
+          <path
+             style="fill:url(#linearGradient2261);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.0522899px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
              d="m 329.62024,689.35129 h 982.68226 l -4.2738,19.16233 H 333.89402 Z"
-             style="fill:url(#linearGradient4817);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.0522899px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+             id="path6393-7"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccccc" />
         </g>
         <use
-           transform="matrix(-1,0,0,1,1854.4715,301.84684)"
-           height="100%"
-           width="100%"
-           id="use6398"
-           xlink:href="#g6396"
+           x="0"
            y="0"
-           x="0" />
+           xlink:href="#g6396-5"
+           id="use6398-6"
+           width="100%"
+           height="100%"
+           transform="matrix(-1,0,0,1,1854.4715,301.84684)" />
+      </g>
+      <g
+         transform="matrix(0.64233192,0,0,0.64233192,-380.59583,-323.85696)"
+         style="display:inline"
+         id="g1368">
+        <text
+           inkscape:export-ydpi="96"
+           inkscape:export-xdpi="96"
+           inkscape:export-filename="/home/michael/workspace/perso/spacetac/out/assets/images/menu/title.png"
+           id="text1336"
+           y="911.17249"
+           x="464.10831"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:192px;line-height:25.00000191px;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, ';letter-spacing:0px;word-spacing:0px;display:inline;opacity:0.35100002;fill:#9fc4d6;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter1356)"
+           xml:space="preserve"><tspan
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:213.33334351px;line-height:24.98268127px;font-family:DAGGERSQUARE;-inkscape-font-specification:DAGGERSQUARE;fill:#9fc4d6;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             y="911.17249"
+             x="464.10831"
+             id="tspan1334"
+             sodipodi:role="line">SpaceTac</tspan></text>
+        <text
+           inkscape:export-ydpi="96"
+           inkscape:export-xdpi="96"
+           inkscape:export-filename="/home/michael/workspace/perso/spacetac/out/assets/images/menu/title.png"
+           id="text1372"
+           y="911.17249"
+           x="464.10831"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:192px;line-height:25.00000191px;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, ';letter-spacing:0px;word-spacing:0px;display:inline;fill:none;fill-opacity:1;stroke:#262626;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter1406)"
+           xml:space="preserve"><tspan
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:213.33334351px;line-height:24.98268127px;font-family:DAGGERSQUARE;-inkscape-font-specification:DAGGERSQUARE;fill:none;fill-opacity:1;stroke:#262626;stroke-width:6;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             y="911.17249"
+             x="464.10831"
+             id="tspan1370"
+             sodipodi:role="line">SpaceTac</tspan></text>
+        <text
+           xml:space="preserve"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:192px;line-height:25.00000191px;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, ';letter-spacing:0px;word-spacing:0px;display:inline;fill:url(#radialGradient7707-9);fill-opacity:1;stroke:url(#linearGradient7709-8);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           x="464.10831"
+           y="911.17249"
+           id="text4529"
+           inkscape:export-filename="/home/michael/workspace/perso/spacetac/out/assets/images/menu/title.png"
+           inkscape:export-xdpi="96"
+           inkscape:export-ydpi="96"><tspan
+             sodipodi:role="line"
+             id="tspan4527"
+             x="464.10831"
+             y="911.17249"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:213.33334351px;line-height:24.98268127px;font-family:DAGGERSQUARE;-inkscape-font-specification:DAGGERSQUARE;fill:url(#radialGradient7707-9);fill-opacity:1;stroke:url(#linearGradient7709-8);stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">SpaceTac</tspan></text>
       </g>
-      <text
-         transform="matrix(0.26458334,0,0,0.26458334,60.497452,-82.248833)"
-         xml:space="preserve"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:192px;line-height:25.00000191px;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, ';letter-spacing:0px;word-spacing:0px;display:inline;fill:url(#radialGradient7707);fill-opacity:1;stroke:url(#linearGradient7709);stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter6258)"
-         x="172.091"
-         y="302.71133"
-         id="text4529-3"
-         inkscape:export-filename="/home/michael/workspace/perso/spacetac/out/assets/images/menu/title.png"
-         inkscape:export-xdpi="96"
-         inkscape:export-ydpi="96"><tspan
-           sodipodi:role="line"
-           id="tspan4527-6"
-           x="172.091"
-           y="302.71133"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:213.33334351px;line-height:24.98268127px;font-family:DAGGERSQUARE;-inkscape-font-specification:DAGGERSQUARE;fill:url(#radialGradient7707);fill-opacity:1;stroke:url(#linearGradient7709);stroke-width:4;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">SpaceTac</tspan></text>
     </g>
   </g>
   <g
diff --git a/src/ui/battle/ArenaShip.ts b/src/ui/battle/ArenaShip.ts
index a0293bd..e7c02db 100644
--- a/src/ui/battle/ArenaShip.ts
+++ b/src/ui/battle/ArenaShip.ts
@@ -34,6 +34,7 @@ module TK.SpaceTac.UI {
 
         // Frames to indicate the owner, if the ship is hovered, and if it is hovered
         frame_owner: UIImage
+        frame_playing: UIImage
         frame_hover: UIImage
 
         // Effects display
@@ -58,6 +59,7 @@ module TK.SpaceTac.UI {
 
             // Add frame indicating which side this ship is on
             this.frame_owner = builder.image(this.enemy ? "battle-hud-ship-enemy" : "battle-hud-ship-own", 0, 0, true);
+            this.frame_playing = builder.image(this.enemy ? "battle-hud-ship-enemy-playing" : "battle-hud-ship-own-playing", 0, 0, true);
             this.setPlaying(false);
             this.frame_hover = builder.image("battle-hud-ship-hover", 0, 0, true);
             this.frame_hover.setVisible(false);
@@ -301,12 +303,12 @@ module TK.SpaceTac.UI {
          * This will alter the HUD frame to show this state
          */
         async setPlaying(playing: boolean, animate = true): Promise<void> {
-            this.frame_owner.alpha = playing ? 1 : 0.35;
-            this.frame_owner.visible = this.ship.alive;
+            this.frame_owner.setVisible(this.ship.alive);
+            this.frame_playing.setVisible(this.ship.alive && playing);
 
             if (playing && animate) {
                 this.battleview.audio.playOnce("battle-ship-change");
-                await this.battleview.animations.blink(this.frame_owner);
+                await this.battleview.animations.blink(this.frame_playing);
             }
         }
 
diff --git a/src/ui/battle/ShipTooltip.spec.ts b/src/ui/battle/ShipTooltip.spec.ts
index 532cf65..e2979f3 100644
--- a/src/ui/battle/ShipTooltip.spec.ts
+++ b/src/ui/battle/ShipTooltip.spec.ts
@@ -22,10 +22,12 @@ module TK.SpaceTac.UI.Specs {
             let texts = collectTexts((<any>tooltip).container);
             check.contains(images, "ship-fake-portrait");
             check.contains(images, "action-weapon");
+            check.contains(images, "battle-hud-ship-effect-good");
+            check.contains(images, "battle-hud-ship-effect-bad");
             check.equals(texts, [
                 "Level 1 Fury", "Plays in 2 turns",
                 "57", "max", "58", "100", "max", "140", "7", "9", "max", "12",
-                "Weapon", "• hull capacity +50", "• limit shield capacity to 2 for 3 turns",
+                "Weapon", "hull capacity +50", "limit shield capacity to 2 for 3 turns",
                 "Super ship model !"
             ]);
         });
diff --git a/src/ui/battle/ShipTooltip.ts b/src/ui/battle/ShipTooltip.ts
index c20a468..e51b3cb 100644
--- a/src/ui/battle/ShipTooltip.ts
+++ b/src/ui/battle/ShipTooltip.ts
@@ -39,7 +39,7 @@ module TK.SpaceTac.UI {
             });
 
             let enemy = player && !player.is(ship.fleet.player);
-            builder.text(ship.getName(), 230, 0, { color: enemy ? "#cc0d00" : "#ffffff", size: 22, bold: true });
+            builder.text(ship.getName(), 230, 0, { color: enemy ? "#c06858" : "#65a898", size: 22, bold: true });
 
             if (ship.alive) {
                 if (battle) {
@@ -65,8 +65,9 @@ module TK.SpaceTac.UI {
 
                 ship.active_effects.list().forEach(effect => {
                     if (!effect.isInternal()) {
-                        builder.text(`• ${effect.getDescription()}`, 0, iy, { color: effect.isBeneficial() ? "#afe9c6" : "#e9afaf" });
-                        iy += 32;
+                        builder.image(`battle-hud-ship-effect-${effect.isBeneficial() ? "good" : "bad"}`, 10, iy + 12);
+                        builder.text(effect.getDescription(), 46, iy + 8);
+                        iy += 40;
                     }
                 });