diff --git a/LICENSES b/LICENSES
index f9652eb6b..d0e7cd9b5 100644
--- a/LICENSES
+++ b/LICENSES
@@ -63,9 +63,9 @@ otherwise.
 - static/themes/default/icons/tahoe.png :: [[https://github.com/thekishanraval/Logos][GPLv3+]]
 - static/themes/default/icons/transmission.png :: [[https://transmissionbt.com/][GPL]]
 - static/themes/default/icons/ttrss.png :: [[https://tt-rss.org/gitlab/fox/tt-rss][GPL]]
-- static/themes/default/icons/f-droid.png :: [[https://commons.wikimedia.org/wiki/File%3AGet_it_on_F-Droid_(material_design).svg][GPLv3]]
-- static/themes/default/icons/google-play.png :: [[https://upload.wikimedia.org/wikipedia/commons/c/cd/Get_it_on_Google_play.svg][Public Domain]]
-- static/themes/default/icons/app-store.png :: [[https://upload.wikimedia.org/wikipedia/commons/thumb/3/3c/Download_on_the_App_Store_Badge.svg/500px-Download_on_the_App_Store_Badge.svg.png][Public Domain]]
+- static/themes/default/icons/f-droid.png :: [[https://gitlab.com/fdroid/artwork/blob/master/fdroid-logo-2015/fdroid-logo.svg][CC-BY-SA 3.0 or GPLv3+]]
+- static/themes/default/icons/google-play.png :: [[https://thenounproject.com/icon/887917/download/color/000000/png/][CC BY 3.0 US]]
+- static/themes/default/icons/app-store.png :: [[https://thenounproject.com/icon/162372/download/color/000000/png/][CC BY 3.0 US]]
 - static/themes/default/icons/apple.png :: [[https://thenounproject.com/icon/1203053/download/color/000000/png][CC BY 3.0 US]]
 - static/themes/default/icons/windows.png :: [[https://thenounproject.com/icon/1206946/download/color/000000/png][CC BY 3.0 US]]
 - static/themes/default/icons/gnu-linux.png :: [[https://upload.wikimedia.org/wikipedia/commons/9/95/Tux-icon-mono.svg][Public Domain]]
diff --git a/plinth/modules/ejabberd/manifest.py b/plinth/modules/ejabberd/manifest.py
index 7c7d6f066..12d222b32 100644
--- a/plinth/modules/ejabberd/manifest.py
+++ b/plinth/modules/ejabberd/manifest.py
@@ -49,7 +49,7 @@ _clients = [{
     }]
 }, {
     'name':
-        _('Chat secure - Encrypted Messenger'),
+        _('Chat secure'),
     'description':
         _('ChatSecure is a free and open source '
           'messaging app that features OTR encryption '
diff --git a/plinth/templates/clients.html b/plinth/templates/clients.html
index 069cfc951..0e9158d7b 100644
--- a/plinth/templates/clients.html
+++ b/plinth/templates/clients.html
@@ -33,78 +33,44 @@
 
     {% if clients|has_web_clients %}
       {% with clients|of_type:'web' as web_clients %}
-        <tr>
-          <th rowspan=" {{ web_clients|length }}"> Web </th>
-          {% with web_clients|first as client %}
+        {% for client in web_clients %}
+          <tr>
+            {% if forloop.counter == 1 %}
+              <th rowspan=" {{ web_clients|length }}"> Web </th>
+            {% endif %}
             {% for platform in client.platforms %}
               {% if platform.type == 'web' %}
                 <td> {{ client.name }} </td>
                 <td>
-                  <a href="{{ platform.url }}">
-                    <button type="button" class="btn btn-success">Launch</button>
+                  <a class="btn btn-success" href="{{ platform.url }}" role="button">
+                    Launch  <span class="glyphicon glyphicon-new-window"></span>
                   </a>
                 </td>
               {% endif %}
             {% endfor %}
-          {% endwith %}
-        </tr>
-        {% for client in web_clients|slice:"1:" %}
-          {% for platform in client.platforms %}
-            {% if platform.type == 'web' %}
-              <tr>
-                <td> {{ client.name }} </td>
-                <td>
-                  <a href="{{ platform.url }}">
-                    <button type="button" class="btn btn-success">Launch</button>
-                  </a>
-                </td>
-              </tr>
-            {% endif %}
-          {% endfor %}
+          </tr>
         {% endfor %}
       {% endwith %}
     {% endif %}
 
     {% if clients|has_desktop_clients %}
       {% with clients|of_type:'desktop' as desktop_clients %}
-        <tr>
-          <th rowspan="{{ desktop_clients|length }}"> Desktop </th>
-          {% with desktop_clients|first as client %}
-            <td> {{ client.name }} </td>
-            <td>
-              <div class ="row">
-                {% for platform in client.platforms %}
-                  {% if platform.type == 'download' %}
-                    <div class="col-md-2 col-xs-4">
-                      <a href="{{ platform.url }}">
-                        {% with 'theme/icons/'|add:platform.os|add:'.png' as icon %}
-                          <img class="os-icon" src="{% static icon %}" />
-                        {% endwith %}
-                      </a>
-                    </div>
-                  {% endif %}
-                {% endfor %}
-              </div>
-            </td>
-          {% endwith %}
-        </tr>
-        {% for client in desktop_clients|slice:"1:" %}
+        {% for client in desktop_clients %}
           <tr>
+            {% if forloop.counter == 1 %}
+              <th rowspan="{{ desktop_clients|length }}"> Desktop </th>
+            {% endif %}
             <td> {{ client.name }} </td>
             <td>
-              <div class ="row">
-                {% for platform in client.platforms %}
-                  {% if platform.type == 'download' %}
-                    <div class="col-md-2 col-xs-4">
-                      <a href="{{ platform.url }}">
-                        {% with 'theme/icons/'|add:platform.os|add:'.png' as icon %}
-                          <img class="os-icon" src="{% static icon %}" />
-                        {% endwith %}
-                      </a>
-                    </div>
-                  {% endif %}
-                {% endfor %}
-              </div>
+              {% for platform in client.platforms %}
+                {% if platform.type == 'download' %}
+                  <a class="btn btn-default" href="{{ platform.url }}" role="button">
+                    {% with 'theme/icons/'|add:platform.os|add:'.png' as icon %}
+                      <img class="client-icon" src="{% static icon %}" /> {{ platform.os|display_name }}
+                    {% endwith %}
+                  </a>
+                {% endif %}
+              {% endfor %}
             </td>
           </tr>
         {% endfor %}
@@ -113,44 +79,22 @@
 
     {% if clients|has_mobile_clients %}
       {% with clients|of_type:'mobile' as mobile_clients %}
-        <tr>
-          <th rowspan="{{ mobile_clients|length }}"> Mobile </th>
-          {% with mobile_clients|first as client %}
-            <td> {{ client.name }} </td>
-            <td>
-              <div class="row">
-                {% for platform in client.platforms %}
-                  {% if platform.type == 'store' and platform.os == 'android' or platform.os == 'ios' %}
-                    <div class="col-md-2 col-xs-4">
-                      <a href="{{ platform.url }}">
-                        {% with 'theme/icons/'|add:platform.store_name|add:'.png' as icon %}
-                          <img class="store-icon" src="{% static icon %}" />
-                        {% endwith %}
-                      </a>
-                    </div>
-                  {% endif %}
-                {% endfor %}
-              </div>
-            </td>
-          {% endwith %}
-        </tr>
-        {% for client in mobile_clients|slice:"1:" %}
+        {% for client in mobile_clients %}
           <tr>
+            {% if forloop.counter == 1 %}
+              <th rowspan="{{ mobile_clients|length }}"> Mobile </th>
+            {% endif %}
             <td> {{ client.name }} </td>
             <td>
-              <div class="row">
-                {% for platform in client.platforms %}
-                  {% if platform.type == 'store' and platform.os == 'android' or platform.os == 'ios' %}
-                    <div class="col-md-2 col-xs-4">
-                      <a href="{{ platform.url }}">
-                        {% with 'theme/icons/'|add:platform.store_name|add:'.png' as icon %}
-                          <img class="store-icon" src="{% static icon %}" />
-                        {% endwith %}
-                      </a>
-                    </div>
-                  {% endif %}
-                {% endfor %}
-              </div>
+              {% for platform in client.platforms %}
+                {% if platform.type == 'store' and platform.os == 'android' or platform.os == 'ios' %}
+                  <a class="btn btn-default" href="{{ platform.url }}" role="button">
+                    {% with 'theme/icons/'|add:platform.store_name|add:'.png' as icon %}
+                      <img class="client-icon" src="{% static icon %}" />  {{ platform.store_name|display_name }}
+                    {% endwith %}
+                  </a>
+                {% endif %}
+              {% endfor %}
             </td>
           </tr>
         {% endfor %}
@@ -159,28 +103,11 @@
 
     {% if clients|has_package_clients %}
       {% with clients|of_type:'package' as package_clients %}
-        <tr>
-          <th rowspan="{{ package_clients|length }}"> Package </th>
-          {% with package_clients|first as client %}
-            <td> {{ client.name }} </td>
-            <td>
-              <div class="row">
-                <ul>
-                  {% for platform in client.platforms %}
-                    {% if platform.type == 'package' and platform.format == 'deb' %}
-                      <li> <strong> Debian: </strong> {{ platform.name }} </li>
-                    {% endif %}
-                    {% if platform.type == 'package' and platform.format == 'brew' %}
-                      <li> <strong> HomeBrew: </strong> {{ platform.name }} </li>
-                    {% endif %}
-                  {% endfor %}
-                </ul>
-              </div>
-            </td>
-          {% endwith %}
-        </tr>
-        {% for client in package_clients|slice:"1:" %}
+        {% for client in package_clients %}
           <tr>
+            {% if forloop.counter == 1 %}
+              <th rowspan="{{ package_clients|length }}"> Package </th>
+            {% endif %}
             <td> {{ client.name }} </td>
             <td>
               <div class="row">
@@ -204,5 +131,5 @@
     {% endif %}
 
   </table>
-
 {% endif %}
+
diff --git a/plinth/templatetags/plinth_extras.py b/plinth/templatetags/plinth_extras.py
index d490a9996..c62ae89de 100644
--- a/plinth/templatetags/plinth_extras.py
+++ b/plinth/templatetags/plinth_extras.py
@@ -132,3 +132,16 @@ def of_type(clients, typ):
         'package': has_package_clients,
     }
     return list(filter(filters.get(typ, lambda x: x), clients))
+
+
+@register.filter(name='display_name')
+def display_name(string):
+    names = {
+        'gnu-linux': 'GNU/Linux',
+        'windows': 'Windows',
+        'mac-os': 'macOS',
+        'google-play': 'Play Store',
+        'f-droid': 'F-Droid',
+        'app-store': 'App Store'
+    }
+    return names.get(string, string)
diff --git a/static/themes/default/css/plinth.css b/static/themes/default/css/plinth.css
index 37ce770c4..a2aeb5583 100644
--- a/static/themes/default/css/plinth.css
+++ b/static/themes/default/css/plinth.css
@@ -144,19 +144,22 @@ footer license-info p {
     left: -18px;
 }
 
-.store-icon {
-    display: block;
+.client-icon {
+    display: inline-block;
     width: 100%;
     height: auto;
+    max-height: 20px;
+    max-width: 20px;
+    margin: auto;
 }
 
-.os-icon {
-    display: block;
-    width: auto;
-    height: auto;
-    max-height: 40px;
-    max-width: 40px;
-    margin: auto;
+#clients .btn {
+    width: 8em;
+    margin-right: 1em;
+}
+
+#clients th, #clients td {
+    line-height: 3.1em;
 }
 
 .shortcut-label {
diff --git a/static/themes/default/icons/app-store.png b/static/themes/default/icons/app-store.png
index 1842b0fae..0c582da2a 100644
Binary files a/static/themes/default/icons/app-store.png and b/static/themes/default/icons/app-store.png differ
diff --git a/static/themes/default/icons/app-store.svg b/static/themes/default/icons/app-store.svg
new file mode 100644
index 000000000..585314db5
--- /dev/null
+++ b/static/themes/default/icons/app-store.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" x="0px" y="0px" viewBox="0 0 100 100" enable-background="new 0 0 100 100" xml:space="preserve"><path d="M79.032,11.72H20.996c-5.219,0-9.45,4.231-9.45,9.45v57.658c0,5.219,4.231,9.45,9.45,9.45h58.035  c5.219,0,9.451-4.231,9.451-9.45V21.171C88.482,15.951,84.251,11.72,79.032,11.72z M20.538,55.867  c-0.002-2.529-0.003-5.057,0.001-7.585c0.001-0.961,0.518-1.507,1.47-1.509c4.566-0.008,9.132-0.003,13.698-0.001  c0.054,0,0.108,0.012,0.259,0.03c-0.107,0.212-0.179,0.371-0.266,0.522c-1.861,3.227-3.727,6.451-5.578,9.684  c-0.184,0.322-0.383,0.447-0.762,0.444c-2.419-0.019-4.839-0.008-7.258-0.01C21.036,57.44,20.538,56.937,20.538,55.867z   M30.645,72.454c-1.52,1.055-3.056,2.088-4.6,3.108c-0.171,0.113-0.491,0.183-0.641,0.098c-0.174-0.1-0.238-0.394-0.29-0.493  c0.229-1.936,0.426-3.722,0.66-5.503c0.087-0.662,0.616-0.937,1.201-0.62c1.227,0.667,2.439,1.361,3.638,2.077  C31.189,71.467,31.204,72.066,30.645,72.454z M32.194,69.707c-0.109-0.039-0.362-0.093-0.578-0.213  c-1.111-0.62-2.216-1.25-3.315-1.891c-0.806-0.47-0.995-1.177-0.526-1.991c5.337-9.259,10.678-18.515,16.02-27.77  c0.485-0.84,1.186-1.03,2.028-0.558c1.078,0.604,2.152,1.215,3.222,1.834c0.863,0.499,1.05,1.198,0.546,2.072  c-5.327,9.243-10.658,18.484-15.986,27.727C33.321,69.411,32.928,69.713,32.194,69.707z M44.038,57.409  c0.107-0.2,0.186-0.358,0.274-0.511c1.851-3.211,3.711-6.416,5.545-9.637c0.222-0.39,0.468-0.519,0.898-0.503  c0.853,0.031,1.71-0.006,2.563,0.023c0.172,0.006,0.427,0.14,0.495,0.285c1.609,3.396,3.199,6.802,4.79,10.207  c0.013,0.029,0.002,0.069,0.002,0.136C53.767,57.409,48.931,57.409,44.038,57.409z M63.448,59.957  c-0.746-1.351-1.546-2.676-2.218-4.063c-4.22-8.713-8.082-17.588-11.774-26.536c-0.523-1.268-0.832-2.626-1.226-3.947  c-0.072-0.24-0.075-0.501-0.088-0.599c0-0.265-0.031-0.387,0.006-0.481c0.095-0.24,0.168-0.56,0.354-0.669  c0.132-0.077,0.501,0.075,0.65,0.233c0.495,0.529,1.006,1.064,1.39,1.672c1.386,2.197,2.707,4.435,4.081,6.64  c5.039,8.087,9.517,16.487,13.936,24.921c0.529,1.01,0.457,1.779-0.391,2.55c-0.903,0.82-1.923,1.449-3.23,1.266  C64.294,60.855,63.771,60.542,63.448,59.957z M68.637,67.995c-0.732-1.104-1.444-2.223-2.132-3.354  c-0.447-0.736-0.221-1.473,0.541-1.886c0.638-0.345,1.284-0.678,1.937-0.993c0.77-0.372,1.563-0.145,1.97,0.596  c0.585,1.065,1.134,2.15,1.685,3.233c0.104,0.205,0.145,0.443,0.19,0.583c-0.036,0.654-0.245,1.121-0.729,1.426  c-0.476,0.3-0.957,0.592-1.45,0.863C69.901,68.874,69.107,68.704,68.637,67.995z M74.394,75.242  c-0.693-0.357-1.42-0.653-2.089-1.048c-0.853-0.502-1.461-1.247-1.806-2.184c-0.376-1.021-0.042-2.133,0.894-2.659  c0.542-0.305,1.166-0.527,1.78-0.629c1.006-0.167,1.825,0.301,2.243,1.193c0.387,0.825,0.691,1.727,0.821,2.625  c0.182,1.263,0.169,2.555,0.238,3.819C75.689,75.935,75.047,75.578,74.394,75.242z M79.491,55.885  c-0.001,1.037-0.506,1.554-1.528,1.556c-2.273,0.004-4.547,0.001-6.681,0.001c-1.898-3.597-3.735-7.078-5.619-10.647  c0.243-0.011,0.412-0.026,0.582-0.026c3.875-0.001,7.751-0.003,11.626,0c1.124,0.001,1.62,0.506,1.621,1.638  C79.492,50.899,79.493,53.392,79.491,55.885z"></path></svg>
\ No newline at end of file
diff --git a/static/themes/default/icons/f-droid.png b/static/themes/default/icons/f-droid.png
index d12c7c485..7c94bbdd4 100644
Binary files a/static/themes/default/icons/f-droid.png and b/static/themes/default/icons/f-droid.png differ
diff --git a/static/themes/default/icons/f-droid.svg b/static/themes/default/icons/f-droid.svg
new file mode 100644
index 000000000..cf403478e
--- /dev/null
+++ b/static/themes/default/icons/f-droid.svg
@@ -0,0 +1,129 @@
+<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="48"
+   viewBox="0 0 48.000001 48.000001"
+   id="svg4230"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="f-droid.svg">
+  <defs
+     id="defs4232" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.1955207"
+     inkscape:cx="-432.5788"
+     inkscape:cy="-4.7599633"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1053"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     gridtolerance="10000" />
+  <metadata
+     id="metadata4235">
+    <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:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1004.3622)">
+    <path
+       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#030300;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 45.410845,1006.8622 -4.25,5.5"
+       id="path4181"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       id="path4945"
+       d="m 2.5889342,1006.8622 4.25,5.5"
+       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <rect
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect4144"
+       width="38"
+       height="13"
+       x="5"
+       y="1010.3622"
+       rx="3"
+       ry="3" />
+    <rect
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect4146"
+       width="38"
+       height="26"
+       x="5"
+       y="1024.3622"
+       rx="3"
+       ry="3" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 24,1031.1122 c -2.880662,0 -5.319789,1.9847 -6.033203,4.6504 h 3.212891 c 0.554316,-0.9854 1.59511,-1.6504 2.820312,-1.6504 1.812692,0 3.25,1.4373 3.25,3.25 0,1.8127 -1.437308,3.25 -3.25,3.25 -1.307381,0 -2.411251,-0.7527 -2.929688,-1.8496 h -3.154296 c 0.642247,2.7657 3.131894,4.8496 6.083984,4.8496 3.434013,0 6.25,-2.816 6.25,-6.25 0,-3.434 -2.815987,-6.25 -6.25,-6.25 z"
+       id="path4161"
+       inkscape:connector-curvature="0" />
+    <circle
+       style="opacity:1;fill:none;fill-opacity:0.40392157;stroke:#ffffff;stroke-width:1.89999998;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path4209"
+       cx="24"
+       cy="1037.3622"
+       r="9.5500002" />
+    <circle
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.89999998;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.69721117"
+       id="path4859"
+       cx="14.375"
+       cy="1017.4872"
+       r="3.375" />
+    <circle
+       r="3.375"
+       cy="1017.4872"
+       cx="33.875"
+       id="circle4177"
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.89999998;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.69721117" />
+  </g>
+</svg>
diff --git a/static/themes/default/icons/google-play.png b/static/themes/default/icons/google-play.png
index e757ccd4b..9d0d83290 100644
Binary files a/static/themes/default/icons/google-play.png and b/static/themes/default/icons/google-play.png differ
diff --git a/static/themes/default/icons/google-play.svg b/static/themes/default/icons/google-play.svg
new file mode 100644
index 000000000..1bbc4b48c
--- /dev/null
+++ b/static/themes/default/icons/google-play.svg
@@ -0,0 +1 @@
+<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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" viewBox="0 0 32 32.000001" version="1.1" x="0px" y="0px"><g transform="translate(0,-1020.3622)"><path style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0999999;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" d="M 6.5234375 4 A 0.50005 0.50005 0 0 0 6.4726562 4.0019531 A 0.50005 0.50005 0 0 0 6 4.5 L 6 27.5 A 0.50005 0.50005 0 0 0 6.7597656 27.929688 L 8.6992188 26.755859 A 0.5002941 0.5002941 0 0 0 8.8085938 26.689453 L 25.759766 16.429688 A 0.50005 0.50005 0 0 0 25.759766 15.572266 L 8.8164062 5.3183594 A 0.50005 0.50005 0 0 0 8.8066406 5.3125 A 0.50005 0.50005 0 0 0 8.6894531 5.2402344 L 6.7597656 4.0722656 A 0.50005 0.50005 0 0 0 6.5234375 4 z M 7 5.3867188 L 8.171875 6.0957031 L 16.324219 16.003906 L 8.1816406 25.898438 L 7 26.613281 L 7 5.3867188 z M 10.751953 7.6582031 L 19.054688 12.683594 L 16.970703 15.216797 L 10.751953 7.6582031 z M 19.919922 13.207031 L 24.53125 16 L 19.916016 18.794922 L 17.619141 16.003906 L 19.919922 13.207031 z M 16.970703 16.791016 L 19.050781 19.318359 L 10.763672 24.335938 L 16.970703 16.791016 z " transform="translate(0,1020.3622)"></path></g></svg>
\ No newline at end of file