diff --git a/board.svg b/board.svg
index d3a5e7f..7009e68 100644
--- a/board.svg
+++ b/board.svg
@@ -41,7 +41,7 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="8.2888628"
-     inkscape:cx="8.7438681"
+     inkscape:cx="-13.152984"
      inkscape:cy="22.864462"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -61,7 +61,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>
@@ -71,21 +71,22 @@
      id="layer1">
     <g
        id="g3936"
-       transform="matrix(1.07372,0,0,1.2253945,-3.3921025,-6.4292846)">
+       transform="matrix(1.07372,0,0,1.2253945,-3.3921025,-6.4292846)"
+       style="fill:#ffffff;fill-opacity:1">
       <path
          id="rect3822"
          d="m 31.5625,16.1875 0,0.28125 c 0.06233,-0.09701 0.116505,-0.202952 0.1875,-0.28125 l -0.1875,0 z m 2.1875,0.96875 c -0.590149,0 -1.103388,0.628761 -1.3125,1.53125 l 4.25,0 c 0.8481,0 1.53125,1.177592 1.53125,2.65625 l 0,10.625 c 0,1.478658 -0.68315,2.65625 -1.53125,2.65625 l -4.34375,0 0,15.03125 c 0,1.371605 0.627703,2.46875 1.40625,2.46875 l 6.6875,0 c 0.164809,-0.429092 0.25,-0.945503 0.25,-1.5 l 0,-31.75 c 0,-0.652773 -0.122056,-1.251936 -0.34375,-1.71875 l -6.59375,0 z m -2.1875,35.65625 0,0.5 0.46875,0 c -0.178003,-0.118196 -0.32966,-0.281382 -0.46875,-0.5 z"
-         style="fill:#ebebeb;fill-opacity:0.92156863"
+         style="fill:#ffffff;fill-opacity:1"
          inkscape:connector-curvature="0" />
       <path
          id="rect2997"
          d="m 8.59375,13.75 c -1.662,0 -3,1.338 -3,3 l 0,35.75 c 0,1.662 1.338,3 3,3 l 56.1875,0 c 1.662,0 3,-1.338 3,-3 l 0,-35.75 c 0,-1.662 -1.338,-3 -3,-3 l -56.1875,0 z m 24.53125,2.3125 28.6875,0 c 0.8481,0 1.53125,1.177592 1.53125,2.65625 l 0,31.8125 c 0,1.478657 -0.68315,2.6875 -1.53125,2.6875 l -28.6875,0 c -0.8481,0 -1.53125,-1.208843 -1.53125,-2.6875 l 0,-31.8125 c 0,-1.478658 0.68315,-2.65625 1.53125,-2.65625 z m -13.90625,6.21875 c 2.134279,0 3.875,1.918195 3.875,4.28125 0,2.363054 -1.740721,4.28125 -3.875,4.28125 -2.134281,0 -3.875,-1.918196 -3.875,-4.28125 0,-2.363055 1.740719,-4.28125 3.875,-4.28125 z m -0.625,9.4375 0.625,0 c 0.76757,0 1.427333,0.323204 1.90625,0.8125 0.01382,0.0044 0.01744,0.02645 0.03125,0.03125 0.398269,0.138416 0.795793,0.426894 1.09375,0.84375 l 2.90625,4.0625 c 0.04418,0.06181 0.08746,0.124004 0.125,0.1875 l 2.875,1.875 c 0.636709,0.412254 0.811942,1.223592 0.40625,1.84375 l -0.03125,0.0625 c -0.405692,0.620158 -1.238291,0.787254 -1.875,0.375 L 23.625,39.84375 C 23.58353,39.82223 23.54078,39.80606 23.5,39.78125 23.45693,39.75336 23.4139,39.71903 23.375,39.6875 23.33873,39.66154 23.31659,39.62235 23.28125,39.59375 23.115691,39.459753 22.947672,39.314112 22.8125,39.125 l -0.96875,-1.34375 0,5.09375 c 0,0.05417 -0.02767,0.102996 -0.03125,0.15625 0.02054,0.02235 0.04275,0.03894 0.0625,0.0625 l 2.53125,3 c 0.489868,0.212626 0.81955,0.683211 0.8125,1.25 L 25.1875,51.0625 c -0.0094,0.755719 -0.646632,1.3844 -1.40625,1.375 -0.759617,-0.0094 -1.35315,-0.650531 -1.34375,-1.40625 l 0.03125,-2.8125 -2.5,-3 c -0.238476,0.06628 -0.487796,0.125 -0.75,0.125 l -0.625,0 c -0.09625,0 -0.18776,-0.02191 -0.28125,-0.03125 l -1.09375,2.78125 c -0.01891,0.118226 -0.04136,0.229499 -0.09375,0.34375 l -0.21875,0.46875 -0.3125,0.8125 c -0.08499,0.218647 -0.18381,0.421185 -0.3125,0.59375 -0.01657,0.02222 -0.04534,0.04113 -0.0625,0.0625 L 15.5625,51.84375 C 15.247183,52.531351 14.441145,52.813699 13.75,52.5 13.058847,52.186301 12.778433,51.375098 13.09375,50.6875 L 13.8125,49.125 c 0.0039,-0.0199 -0.0044,-0.04254 0,-0.0625 0.02743,-0.123055 0.04578,-0.251597 0.09375,-0.375 l 1.8125,-4.65625 c 0.0861,-0.221492 0.212909,-0.388359 0.34375,-0.5625 -0.04965,-0.190791 -0.09375,-0.387629 -0.09375,-0.59375 l 0,-5.59375 -0.9375,1.25 c -0.01858,0.02492 -0.04329,0.03852 -0.0625,0.0625 9.34e-4,0.02076 0,0.04151 0,0.0625 l 0,3.71875 c 0,0.755778 -0.584072,1.375 -1.34375,1.375 -0.759675,0 -1.375,-0.619222 -1.375,-1.375 l 0,-3.71875 c 0,-0.119479 0.03376,-0.233457 0.0625,-0.34375 -0.04472,-0.476122 0.08051,-1.021319 0.4375,-1.5 l 2.96875,-4 c 0.475465,-0.637541 1.16346,-0.948192 1.75,-0.875 0.0088,-0.0039 0.0224,0.0038 0.03125,0 0.331847,-0.141407 0.703884,-0.21875 1.09375,-0.21875 z"
-         style="fill:#ebebeb;fill-opacity:0.92156863"
+         style="fill:#ffffff;fill-opacity:1"
          inkscape:connector-curvature="0" />
       <path
          id="rect3822-0"
          d="m 63.425059,16.243187 0,0.28125 c -0.06233,-0.09701 -0.116505,-0.202952 -0.1875,-0.28125 l 0.1875,0 z m -2.1875,0.96875 c 0.590149,0 1.103388,0.628761 1.3125,1.53125 l -4.25,0 c -0.8481,0 -1.53125,1.177592 -1.53125,2.65625 l 0,10.625 c 0,1.478658 0.68315,2.65625 1.53125,2.65625 l 4.34375,0 0,15.03125 c 0,1.371605 -0.627703,2.46875 -1.40625,2.46875 l -6.6875,0 c -0.164809,-0.429092 -0.25,-0.945503 -0.25,-1.5 l 0,-31.75 c 0,-0.652773 0.122056,-1.251936 0.34375,-1.71875 l 6.59375,0 z m 2.1875,35.65625 0,0.5 -0.46875,0 c 0.178003,-0.118196 0.32966,-0.281382 0.46875,-0.5 z"
-         style="fill:#ebebeb;fill-opacity:0.92156863"
+         style="fill:#ffffff;fill-opacity:1"
          inkscape:connector-curvature="0" />
     </g>
   </g>
diff --git a/departure.png b/departure.png
index 0dbf7ca..6e597cd 100644
Binary files a/departure.png and b/departure.png differ
diff --git a/departure.svg b/departure.svg
index 8d86936..626b7a6 100644
--- a/departure.svg
+++ b/departure.svg
@@ -17,9 +17,9 @@
    version="1.0"
    sodipodi:docname="departure.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="F:\Workspaces\Android\bartrunner\res\drawable-hdpi\departure_icon.png"
-   inkscape:export-xdpi="60"
-   inkscape:export-ydpi="60">
+   inkscape:export-filename="F:\Workspaces\Android\bartrunner-git\departure.png"
+   inkscape:export-xdpi="160"
+   inkscape:export-ydpi="160">
   <defs
      id="defs4">
     <inkscape:perspective
@@ -41,7 +41,7 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="12.736111"
-     inkscape:cx="11.942478"
+     inkscape:cx="-2.30834"
      inkscape:cy="37.983218"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -70,12 +70,12 @@
      inkscape:groupmode="layer"
      id="layer1">
     <path
-       style="fill:#ebebeb;fill-opacity:0.92156863;fill-rule:evenodd;stroke:none"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
        d="m 24.743145,11.609206 c -6.026936,0.01276 -12.038191,1.041686 -15.6562502,3.3125 -2.2743865,1.374178 -5.4688336,32.650782 -2.625,34.34375 3.411287,2.030779 35.3254332,1.511637 37.2500002,0.75 2.789572,-1.103959 0.153375,-34.051105 -3.21875,-35.65625 -3.689897,-1.756404 -9.723064,-2.762765 -15.75,-2.75 z m -4.0625,4.53125 c 1.062477,-0.02811 1.892689,0.06556 2.25,0.28125 1.238507,0.747614 0.568709,23.049807 -0.71875,23.875 -0.923705,0.592046 -12.9122822,0.480838 -13.8437502,-0.65625 -1.12794,-1.376932 1.7050042,-19.923758 2.7187502,-21.09375 1.095658,-1.264526 6.40632,-2.321932 9.59375,-2.40625 z m -10.8125002,27.625 c 0.9719972,-0.01644 1.9046142,0.734366 2.0625002,1.6875 0.157886,0.953134 -0.496753,1.733559 -1.46875,1.75 -0.9719962,0.01644 -1.9046144,-0.734366 -2.0625002,-1.6875 -0.1578858,-0.953134 0.4967539,-1.733559 1.46875,-1.75 z m 29.0937502,0.46875 c 1.023155,-0.01731 1.985343,0.812007 2.15625,1.84375 0.170907,1.031743 -0.539345,1.888943 -1.5625,1.90625 -1.023154,0.01731 -1.985343,-0.812007 -2.15625,-1.84375 -0.170907,-1.031743 0.539346,-1.888943 1.5625,-1.90625 z"
        id="path2393"
        inkscape:connector-curvature="0" />
     <rect
-       style="fill:#ebebeb;fill-opacity:0.92156863"
+       style="fill:#ffffff;fill-opacity:1"
        id="rect3899"
        width="3.1943014"
        height="11.719805"
@@ -86,7 +86,7 @@
        inkscape:transform-center-x="0.45927426"
        inkscape:transform-center-y="1.8227312" />
     <rect
-       style="fill:#ebebeb;fill-opacity:0.92156863"
+       style="fill:#ffffff;fill-opacity:1"
        id="rect3899-1"
        width="3.1949658"
        height="11.717586"
@@ -95,7 +95,7 @@
        ry="1.6739407"
        transform="matrix(0.96996262,-0.24325402,0.22029776,0.97543267,0,0)" />
     <rect
-       style="fill:#ebebeb;fill-opacity:0.92156863"
+       style="fill:#ffffff;fill-opacity:1"
        id="rect3921"
        width="19.909697"
        height="16.784204"
@@ -104,7 +104,7 @@
        ry="1.6784203" />
     <path
        sodipodi:type="arc"
-       style="fill:#ebebeb;fill-opacity:0.92156863"
+       style="fill:#ffffff;fill-opacity:1"
        id="path3925"
        sodipodi:cx="56.610687"
        sodipodi:cy="23.986914"
@@ -113,7 +113,7 @@
        d="m 59.044711,23.986914 a 2.4340241,2.7088332 0 1 1 -4.868048,0 2.4340241,2.7088332 0 1 1 4.868048,0 z"
        transform="matrix(1.0142884,0,0,1.0688274,-2.8651784,-3.0240355)" />
     <rect
-       style="fill:#ebebeb;fill-opacity:0.92156863"
+       style="fill:#ffffff;fill-opacity:1"
        id="rect3927"
        width="3.7430229"
        height="9.2313118"
@@ -121,7 +121,7 @@
        y="26.096556"
        ry="1.6784203" />
     <rect
-       style="fill:#ebebeb;fill-opacity:0.92156863"
+       style="fill:#ffffff;fill-opacity:1"
        id="rect3929"
        width="1.8673232"
        height="5.852253"
@@ -132,7 +132,7 @@
        inkscape:transform-center-x="-1.9979099"
        inkscape:transform-center-y="1.6057666" />
     <rect
-       style="fill:#ebebeb;fill-opacity:0.92156863"
+       style="fill:#ffffff;fill-opacity:1"
        id="rect3931"
        width="1.7520533"
        height="4.363893"
@@ -140,7 +140,7 @@
        y="29.873003"
        ry="0.92313117" />
     <rect
-       style="fill:#ebebeb;fill-opacity:0.92156863"
+       style="fill:#ffffff;fill-opacity:1"
        id="rect3929-7"
        width="1.865285"
        height="5.8580422"
@@ -151,7 +151,7 @@
        inkscape:transform-center-x="0.83145975"
        inkscape:transform-center-y="2.4986547" />
     <rect
-       style="fill:#ebebeb;fill-opacity:0.92156863"
+       style="fill:#ffffff;fill-opacity:1"
        id="rect3931-4"
        width="1.8187417"
        height="4.208703"
@@ -160,7 +160,7 @@
        ry="0.89030248"
        transform="matrix(0.52546884,0.85081284,-0.8246912,0.56558325,0,0)" />
     <rect
-       style="fill:#ebebeb;fill-opacity:0.92156863"
+       style="fill:#ffffff;fill-opacity:1"
        id="rect3929-7-0"
        width="1.8448521"
        height="5.9197183"
@@ -171,7 +171,7 @@
        inkscape:transform-center-x="-1.5204516"
        inkscape:transform-center-y="2.1080532" />
     <rect
-       style="fill:#ebebeb;fill-opacity:0.92156863"
+       style="fill:#ffffff;fill-opacity:1"
        id="rect3931-9"
        width="1.7686416"
        height="4.3263474"
@@ -180,7 +180,7 @@
        ry="0.91518885"
        transform="matrix(0.90125744,-0.433284,0.39730647,0.91768599,0,0)" />
     <rect
-       style="fill:#ebebeb;fill-opacity:0.92156863"
+       style="fill:#ffffff;fill-opacity:1"
        id="rect3929-7-4"
        width="1.8729073"
        height="5.0959587"
@@ -191,7 +191,7 @@
        inkscape:transform-center-x="0.81643284"
        inkscape:transform-center-y="2.1779835" />
     <rect
-       style="fill:#ebebeb;fill-opacity:0.92156863"
+       style="fill:#ffffff;fill-opacity:1"
        id="rect3931-9-8"
        width="1.7520682"
        height="4.3638597"
diff --git a/res/drawable-hdpi-v11/ic_stat_notification.png b/res/drawable-hdpi-v11/ic_stat_notification.png
new file mode 100644
index 0000000..af46c31
Binary files /dev/null and b/res/drawable-hdpi-v11/ic_stat_notification.png differ
diff --git a/res/drawable-hdpi-v9/ic_stat_notification.png b/res/drawable-hdpi-v9/ic_stat_notification.png
new file mode 100644
index 0000000..d7e487d
Binary files /dev/null and b/res/drawable-hdpi-v9/ic_stat_notification.png differ
diff --git a/res/drawable-hdpi/boarding_icon.png b/res/drawable-hdpi/boarding_icon.png
deleted file mode 100644
index 8c4fd2c..0000000
Binary files a/res/drawable-hdpi/boarding_icon.png and /dev/null differ
diff --git a/res/drawable-hdpi/delete_icon.png b/res/drawable-hdpi/delete_icon.png
deleted file mode 100644
index ffd19d9..0000000
Binary files a/res/drawable-hdpi/delete_icon.png and /dev/null differ
diff --git a/res/drawable-hdpi/departure_icon.png b/res/drawable-hdpi/departure_icon.png
deleted file mode 100644
index 422dae9..0000000
Binary files a/res/drawable-hdpi/departure_icon.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_action_boarding.png b/res/drawable-hdpi/ic_action_boarding.png
new file mode 100644
index 0000000..4802a5b
Binary files /dev/null and b/res/drawable-hdpi/ic_action_boarding.png differ
diff --git a/res/drawable-hdpi/ic_action_delete.png b/res/drawable-hdpi/ic_action_delete.png
new file mode 100644
index 0000000..f20462d
Binary files /dev/null and b/res/drawable-hdpi/ic_action_delete.png differ
diff --git a/res/drawable-hdpi/ic_action_departure.png b/res/drawable-hdpi/ic_action_departure.png
new file mode 100644
index 0000000..c6614dd
Binary files /dev/null and b/res/drawable-hdpi/ic_action_departure.png differ
diff --git a/res/drawable-hdpi/ic_action_map.png b/res/drawable-hdpi/ic_action_map.png
new file mode 100644
index 0000000..50c133e
Binary files /dev/null and b/res/drawable-hdpi/ic_action_map.png differ
diff --git a/res/drawable-hdpi/ic_action_new.png b/res/drawable-hdpi/ic_action_new.png
new file mode 100644
index 0000000..81d535d
Binary files /dev/null and b/res/drawable-hdpi/ic_action_new.png differ
diff --git a/res/drawable-hdpi/ic_action_web.png b/res/drawable-hdpi/ic_action_web.png
new file mode 100644
index 0000000..e2dd74b
Binary files /dev/null and b/res/drawable-hdpi/ic_action_web.png differ
diff --git a/res/drawable-hdpi/ic_stat_notification.png b/res/drawable-hdpi/ic_stat_notification.png
new file mode 100644
index 0000000..cb9f6f0
Binary files /dev/null and b/res/drawable-hdpi/ic_stat_notification.png differ
diff --git a/res/drawable-hdpi/map_icon.png b/res/drawable-hdpi/map_icon.png
deleted file mode 100644
index e590707..0000000
Binary files a/res/drawable-hdpi/map_icon.png and /dev/null differ
diff --git a/res/drawable-hdpi/new_icon.png b/res/drawable-hdpi/new_icon.png
deleted file mode 100644
index ad8ada6..0000000
Binary files a/res/drawable-hdpi/new_icon.png and /dev/null differ
diff --git a/res/drawable-hdpi/web_icon.png b/res/drawable-hdpi/web_icon.png
deleted file mode 100644
index e154afd..0000000
Binary files a/res/drawable-hdpi/web_icon.png and /dev/null differ
diff --git a/res/drawable-ldpi-v11/ic_stat_notification.png b/res/drawable-ldpi-v11/ic_stat_notification.png
new file mode 100644
index 0000000..003b561
Binary files /dev/null and b/res/drawable-ldpi-v11/ic_stat_notification.png differ
diff --git a/res/drawable-ldpi-v9/ic_stat_notification.png b/res/drawable-ldpi-v9/ic_stat_notification.png
new file mode 100644
index 0000000..c441ff9
Binary files /dev/null and b/res/drawable-ldpi-v9/ic_stat_notification.png differ
diff --git a/res/drawable-ldpi/ic_action_boarding.png b/res/drawable-ldpi/ic_action_boarding.png
new file mode 100644
index 0000000..754da7b
Binary files /dev/null and b/res/drawable-ldpi/ic_action_boarding.png differ
diff --git a/res/drawable-ldpi/ic_action_delete.png b/res/drawable-ldpi/ic_action_delete.png
new file mode 100644
index 0000000..08708bd
Binary files /dev/null and b/res/drawable-ldpi/ic_action_delete.png differ
diff --git a/res/drawable-ldpi/ic_action_departure.png b/res/drawable-ldpi/ic_action_departure.png
new file mode 100644
index 0000000..ef372c0
Binary files /dev/null and b/res/drawable-ldpi/ic_action_departure.png differ
diff --git a/res/drawable-ldpi/ic_action_map.png b/res/drawable-ldpi/ic_action_map.png
new file mode 100644
index 0000000..6fed9d3
Binary files /dev/null and b/res/drawable-ldpi/ic_action_map.png differ
diff --git a/res/drawable-ldpi/ic_action_new.png b/res/drawable-ldpi/ic_action_new.png
new file mode 100644
index 0000000..b088e68
Binary files /dev/null and b/res/drawable-ldpi/ic_action_new.png differ
diff --git a/res/drawable-ldpi/ic_action_web.png b/res/drawable-ldpi/ic_action_web.png
new file mode 100644
index 0000000..797c647
Binary files /dev/null and b/res/drawable-ldpi/ic_action_web.png differ
diff --git a/res/drawable-ldpi/ic_stat_notification.png b/res/drawable-ldpi/ic_stat_notification.png
new file mode 100644
index 0000000..f61b11d
Binary files /dev/null and b/res/drawable-ldpi/ic_stat_notification.png differ
diff --git a/res/drawable-mdpi-v11/ic_stat_notification.png b/res/drawable-mdpi-v11/ic_stat_notification.png
new file mode 100644
index 0000000..cda3411
Binary files /dev/null and b/res/drawable-mdpi-v11/ic_stat_notification.png differ
diff --git a/res/drawable-mdpi-v9/ic_stat_notification.png b/res/drawable-mdpi-v9/ic_stat_notification.png
new file mode 100644
index 0000000..7d9bc63
Binary files /dev/null and b/res/drawable-mdpi-v9/ic_stat_notification.png differ
diff --git a/res/drawable-mdpi/boarding_icon.png b/res/drawable-mdpi/boarding_icon.png
deleted file mode 100644
index f7f6075..0000000
Binary files a/res/drawable-mdpi/boarding_icon.png and /dev/null differ
diff --git a/res/drawable-mdpi/delete_icon.png b/res/drawable-mdpi/delete_icon.png
deleted file mode 100644
index a8ee5f2..0000000
Binary files a/res/drawable-mdpi/delete_icon.png and /dev/null differ
diff --git a/res/drawable-mdpi/departure_icon.png b/res/drawable-mdpi/departure_icon.png
deleted file mode 100644
index e084421..0000000
Binary files a/res/drawable-mdpi/departure_icon.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_action_boarding.png b/res/drawable-mdpi/ic_action_boarding.png
new file mode 100644
index 0000000..6e3244f
Binary files /dev/null and b/res/drawable-mdpi/ic_action_boarding.png differ
diff --git a/res/drawable-mdpi/ic_action_delete.png b/res/drawable-mdpi/ic_action_delete.png
new file mode 100644
index 0000000..254ac23
Binary files /dev/null and b/res/drawable-mdpi/ic_action_delete.png differ
diff --git a/res/drawable-mdpi/ic_action_departure.png b/res/drawable-mdpi/ic_action_departure.png
new file mode 100644
index 0000000..7d4bb13
Binary files /dev/null and b/res/drawable-mdpi/ic_action_departure.png differ
diff --git a/res/drawable-mdpi/ic_action_map.png b/res/drawable-mdpi/ic_action_map.png
new file mode 100644
index 0000000..be4b804
Binary files /dev/null and b/res/drawable-mdpi/ic_action_map.png differ
diff --git a/res/drawable-mdpi/ic_action_new.png b/res/drawable-mdpi/ic_action_new.png
new file mode 100644
index 0000000..a4c84f0
Binary files /dev/null and b/res/drawable-mdpi/ic_action_new.png differ
diff --git a/res/drawable-mdpi/ic_action_web.png b/res/drawable-mdpi/ic_action_web.png
new file mode 100644
index 0000000..a626c0d
Binary files /dev/null and b/res/drawable-mdpi/ic_action_web.png differ
diff --git a/res/drawable-mdpi/ic_stat_notification.png b/res/drawable-mdpi/ic_stat_notification.png
new file mode 100644
index 0000000..df471f1
Binary files /dev/null and b/res/drawable-mdpi/ic_stat_notification.png differ
diff --git a/res/drawable-mdpi/map_icon.png b/res/drawable-mdpi/map_icon.png
deleted file mode 100644
index 21de201..0000000
Binary files a/res/drawable-mdpi/map_icon.png and /dev/null differ
diff --git a/res/drawable-mdpi/new_icon.png b/res/drawable-mdpi/new_icon.png
deleted file mode 100644
index 4d5d484..0000000
Binary files a/res/drawable-mdpi/new_icon.png and /dev/null differ
diff --git a/res/drawable-mdpi/web_icon.png b/res/drawable-mdpi/web_icon.png
deleted file mode 100644
index 41b56ec..0000000
Binary files a/res/drawable-mdpi/web_icon.png and /dev/null differ
diff --git a/res/drawable-xhdpi-v11/ic_stat_notification.png b/res/drawable-xhdpi-v11/ic_stat_notification.png
new file mode 100644
index 0000000..14ab311
Binary files /dev/null and b/res/drawable-xhdpi-v11/ic_stat_notification.png differ
diff --git a/res/drawable-xhdpi-v9/ic_stat_notification.png b/res/drawable-xhdpi-v9/ic_stat_notification.png
new file mode 100644
index 0000000..dab0dab
Binary files /dev/null and b/res/drawable-xhdpi-v9/ic_stat_notification.png differ
diff --git a/res/drawable-xhdpi/ic_action_boarding.png b/res/drawable-xhdpi/ic_action_boarding.png
new file mode 100644
index 0000000..a1eaab6
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_boarding.png differ
diff --git a/res/drawable-xhdpi/ic_action_delete.png b/res/drawable-xhdpi/ic_action_delete.png
new file mode 100644
index 0000000..155f1ea
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_delete.png differ
diff --git a/res/drawable-xhdpi/ic_action_departure.png b/res/drawable-xhdpi/ic_action_departure.png
new file mode 100644
index 0000000..705a770
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_departure.png differ
diff --git a/res/drawable-xhdpi/ic_action_map.png b/res/drawable-xhdpi/ic_action_map.png
new file mode 100644
index 0000000..f9a6499
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_map.png differ
diff --git a/res/drawable-xhdpi/ic_action_new.png b/res/drawable-xhdpi/ic_action_new.png
new file mode 100644
index 0000000..93eae7c
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_new.png differ
diff --git a/res/drawable-xhdpi/ic_action_web.png b/res/drawable-xhdpi/ic_action_web.png
new file mode 100644
index 0000000..52db90b
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_web.png differ
diff --git a/res/drawable-xhdpi/ic_stat_notification.png b/res/drawable-xhdpi/ic_stat_notification.png
new file mode 100644
index 0000000..9a9274c
Binary files /dev/null and b/res/drawable-xhdpi/ic_stat_notification.png differ
diff --git a/res/menu/departure_context_menu.xml b/res/menu/departure_context_menu.xml
index 24022b3..a027f9e 100644
--- a/res/menu/departure_context_menu.xml
+++ b/res/menu/departure_context_menu.xml
@@ -2,7 +2,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
     <item
         android:id="@+id/boardTrain"
-        android:icon="@drawable/boarding_icon"
+        android:icon="@drawable/ic_action_boarding"
         android:showAsAction="ifRoom|withText"
         android:title="@string/getting_on_this_train">
     </item>
diff --git a/res/menu/route_context_menu.xml b/res/menu/route_context_menu.xml
index 41f6c9e..2caed0e 100644
--- a/res/menu/route_context_menu.xml
+++ b/res/menu/route_context_menu.xml
@@ -3,13 +3,13 @@
 
     <item
         android:id="@+id/view"
-        android:icon="@drawable/departure_icon"
+        android:icon="@drawable/ic_action_departure"
         android:showAsAction="ifRoom|withText"
         android:title="@string/view_departures">
     </item>
     <item
         android:id="@+id/delete"
-        android:icon="@drawable/delete_icon"
+        android:icon="@drawable/ic_action_delete"
         android:showAsAction="ifRoom|withText"
         android:title="@string/delete">
     </item>
diff --git a/res/menu/route_menu.xml b/res/menu/route_menu.xml
index 466cf0e..10a14fb 100644
--- a/res/menu/route_menu.xml
+++ b/res/menu/route_menu.xml
@@ -3,13 +3,13 @@
 
     <item
         android:id="@+id/view_on_bart_site_button"
-        android:icon="@drawable/web_icon"
+        android:icon="@drawable/ic_action_web"
         android:showAsAction="ifRoom|withText"
         android:title="@string/view_on_bart_site">
     </item>
     <item
         android:id="@+id/view_system_map_button"
-        android:icon="@drawable/map_icon"
+        android:icon="@drawable/ic_action_map"
         android:showAsAction="ifRoom|withText"
         android:title="@string/view_system_map">
     </item>
diff --git a/res/menu/routes_list_menu.xml b/res/menu/routes_list_menu.xml
index cedd391..31b8fe2 100644
--- a/res/menu/routes_list_menu.xml
+++ b/res/menu/routes_list_menu.xml
@@ -3,13 +3,13 @@
 
     <item
         android:id="@+id/add_favorite_menu_button"
-        android:icon="@drawable/new_icon"
+        android:icon="@drawable/ic_action_new"
         android:showAsAction="ifRoom|withText"
         android:title="@string/add_route">
     </item>
     <item
         android:id="@+id/view_system_map_button"
-        android:icon="@drawable/map_icon"
+        android:icon="@drawable/ic_action_map"
         android:showAsAction="ifRoom|withText"
         android:title="@string/view_system_map">
     </item>
diff --git a/src/com/dougkeen/bart/NotificationService.java b/src/com/dougkeen/bart/NotificationService.java
index 4d3a6f3..0d43f19 100644
--- a/src/com/dougkeen/bart/NotificationService.java
+++ b/src/com/dougkeen/bart/NotificationService.java
@@ -294,12 +294,12 @@ public class NotificationService extends Service implements EtdServiceListener {
 
 		Builder notificationBuilder = new NotificationCompat.Builder(this)
 				.setOngoing(true)
-				.setSmallIcon(R.drawable.icon)
+				.setSmallIcon(R.drawable.ic_stat_notification)
 				.setContentTitle(
 						mStationPair.getOrigin().shortName + " to "
 								+ mStationPair.getDestination().shortName)
 				.setContentText(minutesText + " until departure")
-				.setContentIntent(mNotificationIntent);
+				.setContentIntent(mNotificationIntent).setWhen(0);
 		mNotificationManager.notify(DEPARTURE_NOTIFICATION_ID,
 				notificationBuilder.getNotification());
 	}
diff --git a/src/com/dougkeen/bart/ViewDeparturesActivity.java b/src/com/dougkeen/bart/ViewDeparturesActivity.java
index ffff4f8..7b11a0b 100644
--- a/src/com/dougkeen/bart/ViewDeparturesActivity.java
+++ b/src/com/dougkeen/bart/ViewDeparturesActivity.java
@@ -469,8 +469,8 @@ public class ViewDeparturesActivity extends SherlockFragmentActivity implements
 				refreshBoardedDeparture();
 
 				// Stop the notification service
-				/*stopService(new Intent(getApplicationContext(),
-						NotificationService.class));*/
+				stopService(new Intent(getApplicationContext(),
+						NotificationService.class));
 
 				// Don't prompt for alert if train is about to leave
 				if (mSelectedDeparture.getMeanSecondsLeft() / 60 > 1) {