diff --git a/src/printing/grantlee/themes/full/theme.html b/src/printing/grantlee/themes/full/theme.html
--- a/src/printing/grantlee/themes/full/theme.html
+++ b/src/printing/grantlee/themes/full/theme.html
@@ -82,8 +82,12 @@
 
   {% if address.formattedAddress %}
   <tr>
-   <td class=data_header>{{ address.type }}</td>
-   <td class=last_data>{{ address.formattedAddress|safe }}</td>
+   <td class=data_header>{{ address.typeLabel }}</td>
+   <td class=last_data>
+    {% with address.formattedAddress as fa %}
+    {% for line in fa.splitlines %}{{ line }}<br/>{% endfor %}
+    {% endwith %}
+   </td>
   </tr>
   {% endif %}
   {% endfor %}
diff --git a/src/viewertemplates/contact_embedded.html b/src/viewertemplates/contact_embedded.html
--- a/src/viewertemplates/contact_embedded.html
+++ b/src/viewertemplates/contact_embedded.html
@@ -72,13 +72,20 @@
       {% endif %}
 
       {% for address in contact.addresses %}
-        {% with address.type as title %}
-        {% with address.formattedAddressLink|safe as value %}
-        {% with address.formattedAddressIcon|safe as value2 %}
-        {% include "contact_row.html" %}
-        {% endwith %}
-        {% endwith %}
-        {% endwith %}
+      <tr>
+         <td align="right" valign="top" width="30%"><b><font color="grey">{{ address.typeLabel }}</font></b></td>
+         <td align="left" valign="top"><a href="address:?index={{ forloop.counter0 }}">
+         {% with address.formattedAddress as fa %}
+           {% for line in fa.splitlines %}
+             {{ line }}
+             {% if line and not forloop.last %}<br/>{% endif %}
+           {% endfor %}
+         {% endwith %}
+         </a></td>
+         <td align="left" valign="top"><a href="address:?index={{ forloop.counter0 }}">
+            <img src="map_icon" align="top"/>
+         </a></td>
+      </tr>
       {% endfor %}
 
       {% if contact.profession %}