diff --git a/icons/Emblem-earth.svg b/icons/Emblem-earth.svg
new file mode 100644
index 000000000..40a7790b6
--- /dev/null
+++ b/icons/Emblem-earth.svg
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" 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:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="48px" height="48px" id="svg3440" sodipodi:version="0.32" inkscape:version="0.48.0 r9654" sodipodi:docname="Emblem-earth.svg" version="1.1">
+  <defs id="defs3">
+    <linearGradient id="linearGradient6527">
+      <stop style="stop-color:#346604;stop-opacity:1;" offset="0" id="stop6529"/>
+      <stop style="stop-color:#4e9a06;stop-opacity:1;" offset="1" id="stop6531"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" id="linearGradient6001">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop6003"/>
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop6005"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" id="linearGradient4825">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop4827"/>
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop4829"/>
+    </linearGradient>
+    <linearGradient id="linearGradient4126">
+      <stop style="stop-color:#ffffff;stop-opacity:1.0000000;" offset="0.0000000" id="stop4128"/>
+      <stop style="stop-color:#ffffff;stop-opacity:0.16494845;" offset="1.0000000" id="stop4130"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" id="linearGradient4114">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop4116"/>
+      <stop style="stop-color:#000000;stop-opacity:0;" offset="1" id="stop4118"/>
+    </linearGradient>
+    <linearGradient id="linearGradient3962">
+      <stop style="stop-color:#d3e9ff;stop-opacity:1.0000000;" offset="0.0000000" id="stop3964"/>
+      <stop style="stop-color:#d3e9ff;stop-opacity:1.0000000;" offset="0.15517241" id="stop4134"/>
+      <stop style="stop-color:#4074ae;stop-opacity:1.0000000;" offset="0.75000000" id="stop4346"/>
+      <stop style="stop-color:#36486c;stop-opacity:1.0000000;" offset="1.0000000" id="stop3966"/>
+    </linearGradient>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3962" id="radialGradient3968" gradientTransform="matrix(1.0056311,0,0,1.0056304,-1.7078855,0.3818364)" cx="18.247644" cy="15.716079" fx="18.247644" fy="15.716079" r="29.993349" gradientUnits="userSpaceOnUse"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient4114" id="radialGradient4120" gradientTransform="scale(1.643990,0.608276)" cx="15.115514" cy="63.965388" fx="15.115514" fy="63.965388" r="12.289036" gradientUnits="userSpaceOnUse"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient4126" id="radialGradient4132" gradientTransform="matrix(1.0056311,0,0,1.0056304,-1.7078855,0.3818364)" cx="15.601279" cy="12.142302" fx="15.601279" fy="12.142302" r="43.526714" gradientUnits="userSpaceOnUse"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient4825" id="radialGradient5983" gradientUnits="userSpaceOnUse" cx="12.071323" cy="12.493138" fx="12.071323" fy="12.493138" r="6.7175145"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient4825" id="radialGradient5985" gradientUnits="userSpaceOnUse" cx="12.071323" cy="12.493138" fx="12.071323" fy="12.493138" r="6.7175145"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient4825" id="radialGradient5987" gradientUnits="userSpaceOnUse" cx="12.071323" cy="12.493138" fx="12.071323" fy="12.493138" r="6.7175145"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient4825" id="radialGradient5989" gradientUnits="userSpaceOnUse" cx="12.071323" cy="12.493138" fx="12.071323" fy="12.493138" r="6.7175145"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6001" id="linearGradient6007" x1="-25.176178" y1="30.057165" x2="-22.252472" y2="21.041553" gradientUnits="userSpaceOnUse"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6001" id="linearGradient6011" gradientUnits="userSpaceOnUse" x1="-25.176178" y1="30.057165" x2="-22.113543" y2="22.661524"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6001" id="linearGradient6015" gradientUnits="userSpaceOnUse" x1="-22.822565" y1="28.337734" x2="-22.113543" y2="22.661524"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6001" id="linearGradient6019" gradientUnits="userSpaceOnUse" x1="-21.658581" y1="15.649428" x2="-21.962101" y2="21.336346"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient6527" id="radialGradient6533" cx="37.17944" cy="31.09733" fx="37.17944" fy="31.09733" r="19.094028" gradientTransform="matrix(0.95295618,-0.02665615,0.02617771,0.93591558,0.66318174,2.1792646)" gradientUnits="userSpaceOnUse"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient4126-4" id="radialGradient3976" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.5,0,20)" cx="23.857143" cy="40" fx="23.857143" fy="40" r="17.142857"/>
+    <linearGradient id="linearGradient4126-4" inkscape:collect="always">
+      <stop id="stop4128-3" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop id="stop4130-7" offset="1" style="stop-color:#000000;stop-opacity:0;"/>
+    </linearGradient>
+    <radialGradient r="17.142857" fy="40" fx="23.857143" cy="40" cx="23.857143" gradientTransform="matrix(1,0,0,0.5,0,20)" gradientUnits="userSpaceOnUse" id="radialGradient6386" xlink:href="#linearGradient4126-4" inkscape:collect="always"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient6527" id="radialGradient6405" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.95295618,-0.02665615,0.02617771,0.93591558,0.66318174,2.1792646)" cx="37.17944" cy="31.09733" fx="37.17944" fy="31.09733" r="19.094028"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient6527" id="radialGradient6407" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.95295618,-0.02665615,0.02617771,0.93591558,0.66318174,2.1792646)" cx="37.17944" cy="31.09733" fx="37.17944" fy="31.09733" r="19.094028"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient6527" id="radialGradient6409" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.95295618,-0.02665615,0.02617771,0.93591558,0.66318174,2.1792646)" cx="37.17944" cy="31.09733" fx="37.17944" fy="31.09733" r="19.094028"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient6527" id="radialGradient6411" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.95295618,-0.02665615,0.02617771,0.93591558,0.66318174,2.1792646)" cx="37.17944" cy="31.09733" fx="37.17944" fy="31.09733" r="19.094028"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient6527" id="radialGradient6413" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.95295618,-0.02665615,0.02617771,0.93591558,0.66318174,2.1792646)" cx="37.17944" cy="31.09733" fx="37.17944" fy="31.09733" r="19.094028"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient6527" id="radialGradient6415" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.95295618,-0.02665615,0.02617771,0.93591558,0.66318174,2.1792646)" cx="37.17944" cy="31.09733" fx="37.17944" fy="31.09733" r="19.094028"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient6527" id="radialGradient6417" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.95295618,-0.02665615,0.02617771,0.93591558,0.66318174,2.1792646)" cx="37.17944" cy="31.09733" fx="37.17944" fy="31.09733" r="19.094028"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient6527" id="radialGradient6419" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.95295618,-0.02665615,0.02617771,0.93591558,0.66318174,2.1792646)" cx="37.17944" cy="31.09733" fx="37.17944" fy="31.09733" r="19.094028"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient6527" id="radialGradient6421" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.95295618,-0.02665615,0.02617771,0.93591558,0.66318174,2.1792646)" cx="37.17944" cy="31.09733" fx="37.17944" fy="31.09733" r="19.094028"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient6527" id="radialGradient6423" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.95295618,-0.02665615,0.02617771,0.93591558,0.66318174,2.1792646)" cx="37.17944" cy="31.09733" fx="37.17944" fy="31.09733" r="19.094028"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient6527" id="radialGradient6425" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.95295618,-0.02665615,0.02617771,0.93591558,0.66318174,2.1792646)" cx="37.17944" cy="31.09733" fx="37.17944" fy="31.09733" r="19.094028"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient6527" id="radialGradient6427" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.95295618,-0.02665615,0.02617771,0.93591558,0.66318174,2.1792646)" cx="37.17944" cy="31.09733" fx="37.17944" fy="31.09733" r="19.094028"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient6527" id="radialGradient6429" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.95295618,-0.02665615,0.02617771,0.93591558,0.66318174,2.1792646)" cx="37.17944" cy="31.09733" fx="37.17944" fy="31.09733" r="19.094028"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient6527" id="radialGradient6431" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.95295618,-0.02665615,0.02617771,0.93591558,0.66318174,2.1792646)" cx="37.17944" cy="31.09733" fx="37.17944" fy="31.09733" r="19.094028"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient6527" id="radialGradient6433" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.95295618,-0.02665615,0.02617771,0.93591558,0.66318174,2.1792646)" cx="37.17944" cy="31.09733" fx="37.17944" fy="31.09733" r="19.094028"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient6527" id="radialGradient6435" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.95295618,-0.02665615,0.02617771,0.93591558,0.66318174,2.1792646)" cx="37.17944" cy="31.09733" fx="37.17944" fy="31.09733" r="19.094028"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient6527" id="radialGradient6437" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.95295618,-0.02665615,0.02617771,0.93591558,0.66318174,2.1792646)" cx="37.17944" cy="31.09733" fx="37.17944" fy="31.09733" r="19.094028"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient6527" id="radialGradient6439" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.95295618,-0.02665615,0.02617771,0.93591558,0.66318174,2.1792646)" cx="37.17944" cy="31.09733" fx="37.17944" fy="31.09733" r="19.094028"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient6527" id="radialGradient6441" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.95295618,-0.02665615,0.02617771,0.93591558,0.66318174,2.1792646)" cx="37.17944" cy="31.09733" fx="37.17944" fy="31.09733" r="19.094028"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient6527" id="radialGradient6443" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.95295618,-0.02665615,0.02617771,0.93591558,0.66318174,2.1792646)" cx="37.17944" cy="31.09733" fx="37.17944" fy="31.09733" r="19.094028"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient6527" id="radialGradient6445" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.95295618,-0.02665615,0.02617771,0.93591558,0.66318174,2.1792646)" cx="37.17944" cy="31.09733" fx="37.17944" fy="31.09733" r="19.094028"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient6527" id="radialGradient6447" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.95295618,-0.02665615,0.02617771,0.93591558,0.66318174,2.1792646)" cx="37.17944" cy="31.09733" fx="37.17944" fy="31.09733" r="19.094028"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient6527" id="radialGradient6449" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.95295618,-0.02665615,0.02617771,0.93591558,0.66318174,2.1792646)" cx="37.17944" cy="31.09733" fx="37.17944" fy="31.09733" r="19.094028"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient6527" id="radialGradient6451" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.95295618,-0.02665615,0.02617771,0.93591558,0.66318174,2.1792646)" cx="37.17944" cy="31.09733" fx="37.17944" fy="31.09733" r="19.094028"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient6527" id="radialGradient6453" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.95295618,-0.02665615,0.02617771,0.93591558,0.66318174,2.1792646)" cx="37.17944" cy="31.09733" fx="37.17944" fy="31.09733" r="19.094028"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient6527" id="radialGradient6455" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.95295618,-0.02665615,0.02617771,0.93591558,0.66318174,2.1792646)" cx="37.17944" cy="31.09733" fx="37.17944" fy="31.09733" r="19.094028"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient6527" id="radialGradient6457" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.95295618,-0.02665615,0.02617771,0.93591558,0.66318174,2.1792646)" cx="37.17944" cy="31.09733" fx="37.17944" fy="31.09733" r="19.094028"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient6527" id="radialGradient6459" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.95295618,-0.02665615,0.02617771,0.93591558,0.66318174,2.1792646)" cx="37.17944" cy="31.09733" fx="37.17944" fy="31.09733" r="19.094028"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient6527" id="radialGradient6461" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.95295618,-0.02665615,0.02617771,0.93591558,0.66318174,2.1792646)" cx="37.17944" cy="31.09733" fx="37.17944" fy="31.09733" r="19.094028"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient6527" id="radialGradient6463" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.95295618,-0.02665615,0.02617771,0.93591558,0.66318174,2.1792646)" cx="37.17944" cy="31.09733" fx="37.17944" fy="31.09733" r="19.094028"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient6527" id="radialGradient6465" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.95295618,-0.02665615,0.02617771,0.93591558,0.66318174,2.1792646)" cx="37.17944" cy="31.09733" fx="37.17944" fy="31.09733" r="19.094028"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient6527" id="radialGradient6467" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.95295618,-0.02665615,0.02617771,0.93591558,0.66318174,2.1792646)" cx="37.17944" cy="31.09733" fx="37.17944" fy="31.09733" r="19.094028"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient6527" id="radialGradient6469" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.95295618,-0.02665615,0.02617771,0.93591558,0.66318174,2.1792646)" cx="37.17944" cy="31.09733" fx="37.17944" fy="31.09733" r="19.094028"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient6527" id="radialGradient6471" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.95295618,-0.02665615,0.02617771,0.93591558,0.66318174,2.1792646)" cx="37.17944" cy="31.09733" fx="37.17944" fy="31.09733" r="19.094028"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient6527" id="radialGradient6473" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.95295618,-0.02665615,0.02617771,0.93591558,0.66318174,2.1792646)" cx="37.17944" cy="31.09733" fx="37.17944" fy="31.09733" r="19.094028"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient6527" id="radialGradient6475" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.95295618,-0.02665615,0.02617771,0.93591558,0.66318174,2.1792646)" cx="37.17944" cy="31.09733" fx="37.17944" fy="31.09733" r="19.094028"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient6527" id="radialGradient6477" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.95295618,-0.02665615,0.02617771,0.93591558,0.66318174,2.1792646)" cx="37.17944" cy="31.09733" fx="37.17944" fy="31.09733" r="19.094028"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient6527" id="radialGradient6479" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.95295618,-0.02665615,0.02617771,0.93591558,0.66318174,2.1792646)" cx="37.17944" cy="31.09733" fx="37.17944" fy="31.09733" r="19.094028"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient6527" id="radialGradient6481" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.95295618,-0.02665615,0.02617771,0.93591558,0.66318174,2.1792646)" cx="37.17944" cy="31.09733" fx="37.17944" fy="31.09733" r="19.094028"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient6527" id="radialGradient6483" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.95295618,-0.02665615,0.02617771,0.93591558,0.66318174,2.1792646)" cx="37.17944" cy="31.09733" fx="37.17944" fy="31.09733" r="19.094028"/>
+  </defs>
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="0.17254902" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:zoom="1" inkscape:cx="-27.274067" inkscape:cy="4.0121688" inkscape:current-layer="layer1" showgrid="true" inkscape:grid-bbox="true" inkscape:document-units="px" inkscape:window-width="1340" inkscape:window-height="876" inkscape:window-x="99" inkscape:window-y="0" inkscape:showpageshadow="false" inkscape:window-maximized="1">
+    <inkscape:grid type="xygrid" id="grid6369"/>
+  </sodipodi:namedview>
+  <metadata id="metadata4">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Jakub Steiner</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:contributor>
+          <cc:Agent>
+            <dc:title>Tuomas Kuosmanen</dc:title>
+          </cc:Agent>
+        </dc:contributor>
+        <cc:license rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/"/>
+        <dc:source>http://jimmac.musichall.cz</dc:source>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>internet</rdf:li>
+            <rdf:li>tools</rdf:li>
+            <rdf:li>applications</rdf:li>
+            <rdf:li>category</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+      <cc:License rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
+        <cc:permits rdf:resource="http://web.resource.org/cc/Reproduction"/>
+        <cc:permits rdf:resource="http://web.resource.org/cc/Distribution"/>
+        <cc:requires rdf:resource="http://web.resource.org/cc/Notice"/>
+        <cc:requires rdf:resource="http://web.resource.org/cc/Attribution"/>
+        <cc:permits rdf:resource="http://web.resource.org/cc/DerivativeWorks"/>
+        <cc:requires rdf:resource="http://web.resource.org/cc/ShareAlike"/>
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer">
+    <path inkscape:r_cy="true" inkscape:r_cx="true" transform="matrix(1.070555,0,0,0.525,-1.5403842,22.5)" d="M 41,40 A 17.142857,8.5714283 0 1 1 6.7142868,40 17.142857,8.5714283 0 1 1 41,40 z" sodipodi:ry="8.5714283" sodipodi:rx="17.142857" sodipodi:cy="40" sodipodi:cx="23.857143" id="path6548" style="opacity:0.6;color:#000000;fill:url(#radialGradient6386);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:block;overflow:visible" sodipodi:type="arc"/>
+    <path style="fill:url(#radialGradient3968);fill-opacity:1;fill-rule:nonzero;stroke:#39396c;stroke-width:0.99999994;stroke-miterlimit:4;stroke-opacity:1" d="m 42.499998,23.999308 c 0,10.769899 -8.731089,19.50069 -19.499752,19.50069 -10.76965,0 -19.5002462,-8.73089 -19.5002462,-19.50069 C 3.4999998,13.229902 12.230596,4.5 23.000246,4.5 c 10.768663,0 19.499752,8.729902 19.499752,19.499308 l 0,0 z" id="path3214" inkscape:connector-curvature="0"/>
+    <g id="g4136" style="fill:url(#radialGradient6533);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="matrix(0.98791378,0,0,0.98789128,-1.5861235,0.6160591)">
+      <g id="g4138" style="fill:url(#radialGradient6409);fill-opacity:1">
+        <g id="g4142" style="fill:url(#radialGradient6407);fill-opacity:1">
+          <path d="M 43.879656,20.648284 43.5264,21.3316 c -0.334,-0.3936 -0.709,-0.7246 -1.0898,-1.0703 l -0.8359,0.123 -0.7637,-0.8633 0,1.0684 0.6543,0.4951 0.4355,0.4932 0.582,-0.6582 c 0.1465,0.2744 0.291,0.5488 0.4365,0.8232 l 0,0.8223 -0.6553,0.7402 -1.1992,0.8232 -0.9082,0.9063 -0.582,-0.6602 0.291,-0.7402 -0.5811,-0.6582 -0.9814,-2.0977 -0.8359,-0.9453 -0.2188,0.2461 0.3281,1.1934 0.6172,0.6992 c 0.3525,1.0176 0.7012,1.9902 1.1641,2.9629 0.7178,0 1.3945,-0.0762 2.1074,-0.166 l 0,0.5762 -0.8721,2.1392 -0.7998,0.9043 -0.6543,1.4004 c 0,0.7676 0,1.5352 0,2.3027 l 0.2188,0.9063 -0.3633,0.4102 -0.8008,0.4941 -0.8359,0.6992 0.6914,0.7813 -0.9453,0.8242 0.1816,0.5332 -1.418,1.6055 -0.9443,0 -0.7998,0.4941 -0.5098,0 0,-0.6582 -0.2168,-1.3184 c -0.2813,-0.8262 -0.5742,-1.6465 -0.8721,-2.4668 0,-0.6055 0.0361,-1.2051 0.0723,-1.8105 l 0.3643,-0.8223 -0.5098,-0.9883 0.0371,-1.3574 -0.6914,-0.7813 0.3457,-1.1309 -0.5625,-0.6382 -0.9824,0 -0.3271,-0.3701 -0.9814,0.6177 -0.3994,-0.4536 -0.9092,0.7817 c -0.6172,-0.6997 -1.2354,-1.3989 -1.8535,-2.0981 l -0.7266,-1.7285 0.6543,-0.9863 -0.3633,-0.4111 0.7988,-1.8936 c 0.6563,-0.8164 1.3418,-1.5996 2.0352,-2.3857 l 1.2363,-0.3291 1.3809,-0.1641 0.9453,0.2471 1.3447,1.3564 0.4727,-0.5342 0.6533,-0.082 1.2363,0.4111 0.9453,0 0.6543,-0.5762 0.291,-0.4111 -0.6553,-0.4111 -1.0908,-0.082 c -0.3027,-0.4199 -0.584,-0.8613 -0.9434,-1.2344 l -0.3643,0.1641 -0.1455,1.0703 -0.6543,-0.7402 -0.1445,-0.8242 -0.7266,-0.5742 -0.292,0 0.7275,0.8223 -0.291,0.7402 -0.5811,0.1641 0.3633,-0.7402 -0.6553,-0.3281 -0.5801,-0.6582 -1.0918,0.2461 -0.1445,0.3281 -0.6543,0.4121 -0.3633,0.9053 -0.9082,0.4521 -0.4004,-0.4521 -0.4355,0 0,-1.4814 0.9453,-0.4941 0.7266,0 -0.1465,-0.5752 -0.5801,-0.5762 0.9805,-0.2061 0.5449,-0.6162 0.4355,-0.7412 0.8008,0 -0.2188,-0.5752 0.5098,-0.3291 0,0.6582 1.0898,0.2461 1.0898,-0.9043 0.0732,-0.4121 0.9443,-0.6577 c -0.3418,0.0425 -0.6836,0.0737 -1.0176,0.1646 l 0,-0.7411 0.3633,-0.8228 -0.3633,0 -0.7984,0.7402 -0.2188,0.4116 0.2188,0.5767 -0.3643,0.9863 -0.5811,-0.3291 -0.5078,-0.5752 -0.8008,0.5752 -0.291,-1.3159 1.3809,-0.9048 0,-0.4941 0.873,-0.5757 1.3809,-0.3296 0.9453,0.3296 1.7441,0.3291 -0.4355,0.4932 -0.9453,0 0.9453,0.9873 0.7266,-0.8223 0.157078,-0.282273 c 3.129549,2.868759 5.87898,6.664564 6.592678,11.694257 z" id="path4144" style="fill:url(#radialGradient6405);fill-opacity:1" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"/>
+        </g>
+      </g>
+      <g id="g4146" style="fill:url(#radialGradient6415);fill-opacity:1">
+        <g id="g4150" style="fill:url(#radialGradient6413);fill-opacity:1">
+          <path d="m 26.0703,9.2363 -0.0732,0.4932 0.5098,0.3291 0.8711,-0.5757 -0.4355,-0.4937 -0.582,0.3296 -0.29,-0.0825" id="path4152" style="fill:url(#radialGradient6411);fill-opacity:1" inkscape:connector-curvature="0"/>
+        </g>
+      </g>
+      <g id="g4154" style="fill:url(#radialGradient6421);fill-opacity:1">
+        <g id="g4158" style="fill:url(#radialGradient6419);fill-opacity:1">
+          <path d="m 26.8701,5.8633 -1.8906,-0.7407 -2.1797,0.2466 -2.6904,0.7402 -0.5088,0.4941 1.6719,1.1514 0,0.6582 -0.6543,0.6582 0.873,1.729 0.5801,-0.3301 0.7285,-1.1514 c 1.123,-0.3472 2.1299,-0.7407 3.1973,-1.2344 l 0.873,-2.2212" id="path4160" style="fill:url(#radialGradient6417);fill-opacity:1" inkscape:connector-curvature="0"/>
+        </g>
+      </g>
+      <g id="g4162" style="fill:url(#radialGradient6427);fill-opacity:1">
+        <g id="g4166" style="fill:url(#radialGradient6425);fill-opacity:1">
+          <path d="m 28.833,12.7749 -0.291,-0.7412 -0.5098,0.165 0.1465,0.9043 0.6543,-0.3281" id="path4168" style="fill:url(#radialGradient6423);fill-opacity:1" inkscape:connector-curvature="0"/>
+        </g>
+      </g>
+      <g id="g4170" style="fill:url(#radialGradient6433);fill-opacity:1">
+        <g id="g4174" style="fill:url(#radialGradient6431);fill-opacity:1">
+          <path d="m 29.123,12.6089 -0.1455,0.9883 0.7998,-0.165 0.5811,-0.5752 -0.5088,-0.4941 C 29.6787,11.9078 29.4824,11.483 29.2685,11.0465 l -0.4355,0 0,0.4932 0.29,0.3291 0,0.7402" id="path4176" style="fill:url(#radialGradient6429);fill-opacity:1" inkscape:connector-curvature="0"/>
+        </g>
+      </g>
+      <g id="g4178" style="fill:url(#radialGradient6439);fill-opacity:1">
+        <g id="g4182" style="fill:url(#radialGradient6437);fill-opacity:1">
+          <path d="m 18.3652,28.2422 -0.582,-1.1523 -1.0903,-0.2466 -0.5815,-1.5625 -1.4536,0.1641 -1.2354,-0.9043 -1.3091,1.1514 0,0.1816 c -0.396,-0.1143 -0.8828,-0.1299 -1.2354,-0.3467 l -0.291,-0.8223 0,-0.9053 -0.8721,0.082 c 0.0728,-0.5762 0.145,-1.1514 0.2183,-1.7275 l -0.5093,0 -0.5083,0.6582 -0.5093,0.2461 -0.7271,-0.4102 -0.0728,-0.9053 0.1455,-0.9873 1.0908,-0.8223 0.8721,0 0.145,-0.4941 1.0903,0.2461 0.7998,0.9883 0.1455,-1.6465 1.3813,-1.1514 0.5088,-1.2344 1.0176,-0.4111 0.5815,-0.8223 1.3081,-0.248 0.6548,-0.9863 c -0.6543,0 -1.3086,0 -1.9629,0 l 1.2358,-0.5762 0.8716,0 1.2363,-0.4121 0.1455,-0.4922 -0.4365,-0.4121 -0.5088,-0.165 0.1455,-0.4932 -0.3633,-0.7402 -0.8726,0.3281 0.1455,-0.6577 -1.0176,-0.5762 -0.7993,1.3979 0.0723,0.4941 -0.7993,0.3301 -0.5093,1.0693 -0.2178,-0.9873 -1.3813,-0.5762 -0.2183,-0.7402 1.8174,-1.0703 0.7998,-0.7402 0.0728,-0.9048 -0.436,-0.2471 -0.5815,-0.0825 -0.3633,0.9053 c 0,0 -0.703332,0.055478 -0.859632,0.094078 C 9.9867169,11.059151 6.5013568,14.983265 5.6916,22.2885 c 0.0371,0.1738 0.6792,1.1816 0.6792,1.1816 l 1.5264,0.9043 1.5264,0.4121 0.6548,0.8232 1.0171,0.7402 0.5815,-0.082 0.436,0.1963 0,0.1328 -0.5811,1.563 -0.4365,0.6582 0.1455,0.3301 -0.3633,1.2324 1.3086,2.3867 1.3081,1.1523 0.582,0.8223 -0.0732,1.7285 0.4365,0.9863 -0.4365,1.8926 c 0,0 -0.0342,-0.0117 0.0215,0.1777 0.0562,0.1895 2.3291,1.4512 2.4736,1.3438 0.144,-0.1094 0.2671,-0.2051 0.2671,-0.2051 l -0.145,-0.4102 0.5811,-0.5762 0.2183,-0.5762 0.9453,-0.3301 0.7266,-1.8105 -0.2178,-0.4922 0.5078,-0.7402 1.0908,-0.248 0.582,-1.3164 -0.1455,-1.6445 0.8721,-1.2344 0.1455,-1.2344 C 20.7331,29.4607 19.5495,28.8513 18.365,28.242" id="path4184" style="fill:url(#radialGradient6435);fill-opacity:1" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"/>
+        </g>
+      </g>
+      <g id="g4186" style="fill:url(#radialGradient6445);fill-opacity:1">
+        <g id="g4190" style="fill:url(#radialGradient6443);fill-opacity:1">
+          <path d="m 16.7656,9.5649 0.7266,0.4937 0.582,0 0,-0.5757 -0.7266,-0.3291 -0.582,0.4111" id="path4192" style="fill:url(#radialGradient6441);fill-opacity:1" inkscape:connector-curvature="0"/>
+        </g>
+      </g>
+      <g id="g4194" style="fill:url(#radialGradient6451);fill-opacity:1">
+        <g id="g4198" style="fill:url(#radialGradient6449);fill-opacity:1">
+          <path d="m 14.876,8.9072 -0.3638,0.9048 0.7271,0 0.3638,-0.8228 C 15.9166,8.7675 16.2286,8.5444 16.5479,8.331 l 0.7271,0.2471 c 0.4844,0.3291 0.9688,0.6582 1.4536,0.9868 L 19.4561,8.9072 18.6558,8.5781 18.292,7.8374 16.9111,7.6728 16.8383,7.2612 16.184,7.4262 15.8936,8.002 15.5298,7.2613 l -0.145,0.3291 0.0728,0.8228 -0.5816,0.494" id="path4200" style="fill:url(#radialGradient6447);fill-opacity:1" inkscape:connector-curvature="0"/>
+        </g>
+      </g>
+      <g id="g4202" style="fill:url(#radialGradient6461);fill-opacity:1">
+        <g style="opacity:0.75;fill:url(#radialGradient6455);fill-opacity:1" id="g4204">
+          <path id="path4206" d="" style="fill:url(#radialGradient6453);fill-opacity:1" inkscape:connector-curvature="0"/>
+        </g>
+        <g id="g4208" style="fill:url(#radialGradient6459);fill-opacity:1">
+          <path id="path4210" d="" style="fill:url(#radialGradient6457);fill-opacity:1" inkscape:connector-curvature="0"/>
+        </g>
+      </g>
+      <g id="g4212" style="fill:url(#radialGradient6471);fill-opacity:1">
+        <g style="opacity:0.75;fill:url(#radialGradient6465);fill-opacity:1" id="g4214">
+          <path id="path4216" d="" style="fill:url(#radialGradient6463);fill-opacity:1" inkscape:connector-curvature="0"/>
+        </g>
+        <g id="g4218" style="fill:url(#radialGradient6469);fill-opacity:1">
+          <path id="path4220" d="" style="fill:url(#radialGradient6467);fill-opacity:1" inkscape:connector-curvature="0"/>
+        </g>
+      </g>
+      <g id="g4222" style="fill:url(#radialGradient6477);fill-opacity:1">
+        <g id="g4226" style="fill:url(#radialGradient6475);fill-opacity:1">
+          <path d="M 17.4922,6.8496 17.856,6.521 18.5831,6.3564 c 0.498,-0.2422 0.998,-0.4053 1.5264,-0.5762 l -0.29,-0.4937 -0.9385,0.1348 -0.4434,0.4419 -0.731,0.106 -0.6499,0.3052 -0.3159,0.1528 -0.1929,0.2583 0.9443,0.1641" id="path4228" style="fill:url(#radialGradient6473);fill-opacity:1" inkscape:connector-curvature="0"/>
+        </g>
+      </g>
+      <g id="g4230" style="fill:url(#radialGradient6483);fill-opacity:1">
+        <g id="g4234" style="fill:url(#radialGradient6481);fill-opacity:1">
+          <path d="m 18.7285,14.6665 0.4365,-0.6582 -0.6548,-0.4932 0.2183,1.1514" id="path4236" style="fill:url(#radialGradient6479);fill-opacity:1" inkscape:connector-curvature="0"/>
+        </g>
+      </g>
+    </g>
+    <path style="opacity:0.39560439;fill:none;stroke:url(#radialGradient4132);stroke-width:0.99999994;stroke-miterlimit:4;stroke-opacity:1" d="m 41.509682,23.999343 c 0,10.222944 -8.287677,18.51034 -18.509448,18.51034 -10.222709,0 -18.5099181,-8.287489 -18.5099181,-18.51034 0,-10.222477 8.2872091,-18.5090269 18.5099181,-18.5090269 10.221771,0 18.509448,8.2865499 18.509448,18.5090269 l 0,0 z" id="path4122" inkscape:connector-curvature="0"/>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/icons/satellite.png b/icons/satellite.png
deleted file mode 100644
index c582cde30..000000000
Binary files a/icons/satellite.png and /dev/null differ
diff --git a/qt-models/divetripmodel.cpp b/qt-models/divetripmodel.cpp
index 3b08e6838..fcba4a570 100644
--- a/qt-models/divetripmodel.cpp
+++ b/qt-models/divetripmodel.cpp
@@ -3,6 +3,7 @@
 #include "metrics.h"
 #include "divelist.h"
 #include "helpers.h"
+#include <QIcon>
 
 static int nitrox_sort_value(struct dive *dive)
 {
@@ -178,6 +179,13 @@ QVariant DiveItem::data(int column, int role) const
 			break;
 		}
 		break;
+	case Qt::DecorationRole:
+		if (column == LOCATION)
+			if (dive_has_gps_location(dive)) {
+				IconMetrics im = defaultIconMetrics();
+				retVal = QIcon(":satellite").pixmap(im.sz_small, im.sz_small);
+			}
+		break;
 	case Qt::ToolTipRole:
 		switch (column) {
 		case NR:
diff --git a/subsurface.qrc b/subsurface.qrc
index 7eff0d952..a28c86ad6 100644
--- a/subsurface.qrc
+++ b/subsurface.qrc
@@ -7,7 +7,6 @@
         <file alias="units">icons/units.png</file>
         <file alias="advanced">icons/advanced.png</file>
         <file alias="network">icons/network.png</file>
-        <file alias="edit">icons/advanced.png</file>
         <file alias="graph">icons/graph.png</file>
         <file alias="minimum">icons/minimum.png</file>
         <file alias="maximum">icons/maximum.png</file>
@@ -78,5 +77,6 @@
         <file alias="filter-hide">icons/go-top.svg</file>
         <file alias="filter-close">icons/process-stop.svg</file>
         <file alias="edit">icons/edit-circled.svg</file>
+        <file alias="satellite">icons/Emblem-earth.svg</file>
     </qresource>
 </RCC>