diff --git a/commonBody.html b/commonBody.html
index 434ebdb6e..eb9f27dc4 100644
--- a/commonBody.html
+++ b/commonBody.html
@@ -1,9 +1,9 @@
 <ul>
 {% set address = tagsPrefix(tags, 'addr:') %}
 {% if address %}
-<li>
-  <i class="fa fa-map-marker symbol" aria-hidden="true"></i>
-  <span class='key'>{{ keyTrans('addr') }}</span>
+<li class='hasSymbol'>
+  <i class="fa fa-map-marker" aria-hidden="true"></i>
+  <span class='key'>{{ keyTrans('addr') }}:</span>
   <span class='value'>
     {{ attribute(tags, 'addr:street') }}
     {{ attribute(tags, 'addr:housenumber') }},
@@ -14,9 +14,9 @@
 {% endif %}
 
 {% if tags.phone %}
-<li>
-  <i class="fa fa-phone symbol" aria-hidden="true"></i>
-  <span class='key'>{{ keyTrans('phone') }}</span>
+<li class='hasSymbol'>
+  <i class="fa fa-phone" aria-hidden="true"></i>
+  <span class='key'>{{ keyTrans('phone') }}:</span>
   <span class='value'>
     <a href='tel:{{ tags.phone }}'>{{ tags.phone }}</a>
   </span>
@@ -25,9 +25,9 @@
 
 {% set payment = tagsPrefix(tags, 'payment:') %}
 {% if payment %}
-<li>
-  <i class="fa fa-money symbol" aria-hidden="true"></i>
-  <span class='key'>{{ keyTrans('payment') }}</span>
+<li class='hasSymbol'>
+  <i class="fa fa-money" aria-hidden="true"></i>
+  <span class='key'>{{ keyTrans('payment') }}:</span>
   <span class='value'>
     {% for k, tag in payment %}
     {% if tags[tag] == 'no' %}<s>{{ k }}</s> {% else %}{{ k }} {% endif %}
@@ -37,18 +37,18 @@
 {% endif %}
 
 {% if attribute(tags, 'wheelchair') %}
-<li>
-  <i class="fa fa-wheelchair-alt symbol {{ tags.wheelchair }}" aria-hidden="true"></i>
-  <span class='key'>{{ keyTrans('wheelchair') }}</span>
+<li class='hasSymbol'>
+  <i class="fa fa-info-circle" aria-hidden="true"></i>
+  <span class='key'>{{ trans('facilities') }}:</span>
   <span class='value'>
-    {{ tagTrans('wheelchair', tags.wheelchair) -}}
 
-    {%- if attribute(tags, 'toilets:wheelchair') -%}
-      , <span class='{{ attribute(tags, 'toilets:wheelchair') }}'>&#128701;</span> {{ keyTrans('amenity', 'toilets') }}: {{ tagTrans('toilets:wheelchair', attribute(tags, 'toilets:wheelchair')) }}</span>
-    {% endif %}
+  {% if attribute(tags, 'wheelchair') %}
+    <i class="fa fa-wheelchair-alt {{ tags.wheelchair }}" aria-hidden="true" title='{{ keyTrans('wheelchair') }}: {{ tagTrans('wheelchair', tags.wheelchair) }}'></i>
 
-    <br/>
-    {{ localizedTag(tags, 'wheelchair:description') }}
+    {% if attribute(tags, 'toilets:wheelchair') %}
+      (<span class='{{ attribute(tags, 'toilets:wheelchair') }}' title='{{ keyTrans('toilets:wheelchair') }}: {{ tagTrans('toilets:wheelchair', attribute(tags, 'toilets:wheelchair')) }}'>&#128701;</span>)
+    {% endif %}
+  {% endif %}
   </span>
 </li>
 {% endif %}
diff --git a/gastro.json b/gastro.json
index 88ac064f3..94d2cf275 100644
--- a/gastro.json
+++ b/gastro.json
@@ -21,7 +21,7 @@
     },
     "feature": {
         "markerSign": "{% if tags.amenity=='bar' %}&#127864;{% elseif tags.amenity=='biergarten'%}&#127867;{% elseif tags.amenity=='cafe' %}&#9749;{% elseif tags.amenity=='fast_food' %}&#127828;{% elseif tags.amenity=='ice_cream' %}&#127848;{% elseif tags.amenity=='pub' %}&#127866;{% else %}&#127860;{% endif %}",
-        "body": "<span class='description'>\n{{ tagTrans('amenity', tags.amenity) }}\n</span>\n<ul>\n  <li>\n   <i class=\"fa fa-cutlery symbol\" aria-hidden=\"true\"></i>\n   <span class='key'>{{ keyTrans('cuisine') }}</span>\n   <span class='value'>{{ tagTransList('cuisine', tags.cuisine)|default(trans('unknown')) }}</span>\n  </li>\n</ul>",
+        "body": "<span class='description'>\n{{ tagTrans('amenity', tags.amenity) }}\n</span>\n<ul>\n  <li class='hasSymbol'>\n   <i class=\"fa fa-cutlery\" aria-hidden=\"true\"></i>\n   <span class='key'>{{ keyTrans('cuisine') }}:</span>\n   <span class='value'>{{ tagTransList('cuisine', tags.cuisine)|default(trans('unknown')) }}</span>\n  </li>\n</ul>",
         "description": "{{ tagTrans('amenity', tags.amenity) }}"
     }
 }