diff --git a/django_lostplaces/lostplaces/templates/explorer/profile.html b/django_lostplaces/lostplaces/templates/explorer/profile.html
index 4cf7948..cf4cd63 100644
--- a/django_lostplaces/lostplaces/templates/explorer/profile.html
+++ b/django_lostplaces/lostplaces/templates/explorer/profile.html
@@ -45,65 +45,63 @@
 </div>
 
 <section class="LP-Section">
-	<div class="LP-PlaceList">
-		<h1 class="LP-Headline">{% trans 'Places submitted by' %} {{explorer.user.username}}</h1>
-		<ul class="LP-PlaceList__List">
-			{% for place in place_list %}
-			<li class="LP-PlaceList__Item">
-				<a href="{% url 'place_detail' pk=place.pk %}" class="LP-Link">
-					{% include 'partials/place_teaser.html' with place=place extended=True %}
-				</a>
-			</li>
-			{% endfor %}
-		</ul>
+    <div class="LP-PlaceList">
+        <h1 class="LP-Headline">{% trans 'Places submitted by' %} {{explorer.user.username}}</h1>
+        <ul class="LP-PlaceList__List">
+            {% for place in place_list %}
+            <li class="LP-PlaceList__Item">
+                {% include 'partials/place_teaser.html' with place=place extended=True %}
+            </li>
+            {% endfor %}
+        </ul>
 
-		{% include 'partials/nav/pagination.html' %}
+        {% include 'partials/nav/pagination.html' %}
 
-	</div>
+    </div>
 </section>
 
 <section class="LP-Section">
-	<h1 class="LP-Headline">{% trans 'Images submitted by' %} {{explorer.user.username}}</h1>
-	<div class="LP-ImageGrid">
-		<ul class="LP-ImageGrid__Container">
-			{% for place_image in assets.placeimages.all %}
-			<li class="LP-ImageGrid__Item">
-				<a href="{{ place_image.filename.large.url }}" class="LP-Link">
-					<img class="LP-Image" src="{{ place_image.filename.thumbnail.url }}">
-				</a>
-				{% if user.explorer == place_image.submitted_by%}
-				<span class="LP-ImageGrid__DeleteItem" title="Bild löschen">
-					<a href="{% url 'place_image_delete' pk=place_image.id %}" class="LP-Link">
-						<img class="LP-Icon" src="{% static 'icons/cancel.svg' %}" />
-					</a>
-				</span>
-				{% endif %}
-			</li>
-			{% endfor %}
-		</ul>
-	</div>
+    <h1 class="LP-Headline">{% trans 'Images submitted by' %} {{explorer.user.username}}</h1>
+    <div class="LP-ImageGrid">
+        <ul class="LP-ImageGrid__Container">
+            {% for place_image in assets.placeimages.all %}
+            <li class="LP-ImageGrid__Item">
+                <a href="{{ place_image.filename.large.url }}" class="LP-Link">
+                    <img class="LP-Image" src="{{ place_image.filename.thumbnail.url }}">
+                </a>
+                {% if user.explorer == place_image.submitted_by%}
+                <span class="LP-ImageGrid__DeleteItem" title="Bild löschen">
+                    <a href="{% url 'place_image_delete' pk=place_image.id %}" class="LP-Link">
+                        <img class="LP-Icon" src="{% static 'icons/cancel.svg' %}" />
+                    </a>
+                </span>
+                {% endif %}
+            </li>
+            {% endfor %}
+        </ul>
+    </div>
 </section>
 
 <section class=" LP-Section">
-	<h1 class="LP-Headline">{% trans 'Photo albums submitted by' %} {{explorer.user.username}}</h1>
-	<div class="LP-LinkList">
-		<ul class="LP-LinkList__Container">
-			{% for photo_album in assets.photoalbums.all %}
-			<li class="LP-LinkList__Item">
-				<a target="_blank" href="{{photo_album.url}}" class="LP-Link">
-					<span class="LP-Text">{{photo_album.label}}</span>
-				</a>
-				{% if user.explorer == photo_album.submitted_by%}
-				<a href="{% url 'photo_album_delete' pk=photo_album.pk%}" class="LP-Link LP-LinkList__ItemHover" title="Delete Photo Album">
-					<div class="RV-Iconized__Container RV-Iconized__Container--small">
-						{% icon 'trash' className="RV-Iconized__Icon" %}
-					</div>
-				</a>
-				{% endif %}
-			</li>
-			{% endfor %}
-		</ul>
-	</div>
+    <h1 class="LP-Headline">{% trans 'Photo albums submitted by' %} {{explorer.user.username}}</h1>
+    <div class="LP-LinkList">
+        <ul class="LP-LinkList__Container">
+            {% for photo_album in assets.photoalbums.all %}
+            <li class="LP-LinkList__Item">
+                <a target="_blank" href="{{photo_album.url}}" class="LP-Link">
+                    <span class="LP-Text">{{photo_album.label}}</span>
+                </a>
+                {% if user.explorer == photo_album.submitted_by%}
+                <a href="{% url 'photo_album_delete' pk=photo_album.pk%}" class="LP-Link LP-LinkList__ItemHover" title="Delete Photo Album">
+                    <div class="RV-Iconized__Container RV-Iconized__Container--small">
+                        {% icon 'trash' className="RV-Iconized__Icon" %}
+                    </div>
+                </a>
+                {% endif %}
+            </li>
+            {% endfor %}
+        </ul>
+    </div>
 </section>
 
 {% endblock maincontent %}
\ No newline at end of file
diff --git a/django_lostplaces/lostplaces/templates/home.html b/django_lostplaces/lostplaces/templates/home.html
index 1694e93..db7168b 100644
--- a/django_lostplaces/lostplaces/templates/home.html
+++ b/django_lostplaces/lostplaces/templates/home.html
@@ -21,9 +21,7 @@
     <ul class="LP-PlaceGrid__Grid">
         {% for place in place_list %}
         <li class="LP-PlaceGrid__Item">
-            <a href="{% url 'place_detail' pk=place.pk %}" class="LP-Link">
-                {% include 'partials/place_teaser.html' with place=place%}
-            </a>
+            {% include 'partials/place_teaser.html' with place=place%}
         </li>
         {% endfor %}
     </ul>
diff --git a/django_lostplaces/lostplaces/templates/partials/place_teaser.html b/django_lostplaces/lostplaces/templates/partials/place_teaser.html
index 15929a5..35e5242 100644
--- a/django_lostplaces/lostplaces/templates/partials/place_teaser.html
+++ b/django_lostplaces/lostplaces/templates/partials/place_teaser.html
@@ -1,13 +1,15 @@
 {%load static %}
 
 <article class="LP-PlaceTeaser {% if extended %} LP-PlaceTeaser--extended{% endif %}">
-    <div class="LP-PlaceTeaser__Image">
-        {% if place.placeimages.all|length > 0 %}
+    <a href="{% url 'place_detail' pk=place.pk %}" class="LP-Link">
+        <div class="LP-PlaceTeaser__Image">
+            {% if place.placeimages.all|length > 0 %}
             <img class="LP-Image" src="{{ place.placeimages.first.filename.thumbnail.url}}" />
-        {% else %}
+            {% else %}
             <img class="LP-Image" src="{% static 'images/missing_image.png' %}" />
-        {% endif %}
-    </div>
+            {% endif %}
+        </div>
+    </a>
     <div class="LP-PlaceTeaser__Meta">
         <div class="LP-PlaceTeaser__Info">
             <span class="LP-PlaceTeaser__Title">
@@ -20,15 +22,15 @@
         <div class="LP-PlaceTeaser__Description">
             <p class="LP-Paragraph">
                 {% if place.description|length > 210 %}
-                    {{place.description|truncatechars:210|truncatewords:-1}}
+                {{place.description|truncatechars:210|truncatewords:-1}}
                 {% else %}
-                    {{place.description}}
+                {{place.description}}
                 {% endif %}
             </p>
         </div>
         <div class="LP-PlaceTeaser__Icons">
             <ul class="LP-Icon__List">
-                <li class="LP-Icon__Item"><img class="LP-Icon" src="{% static '/icons/favourite.svg' %}" /></li>
+                <li class="LP-Icon__Item">{% include 'partials/icons/place_favorite.html' with place=place%}</li>
                 <li class="LP-Icon__Item"><img class="LP-Icon" src="{% static '/icons/location.svg' %}" /></li>
                 <li class="LP-Icon__Item"><img class="LP-Icon" src="{% static '/icons/flag.svg' %}" /></li>
             </ul>
diff --git a/django_lostplaces/lostplaces/templates/place/place_list.html b/django_lostplaces/lostplaces/templates/place/place_list.html
index 058bee1..c23f451 100644
--- a/django_lostplaces/lostplaces/templates/place/place_list.html
+++ b/django_lostplaces/lostplaces/templates/place/place_list.html
@@ -17,9 +17,7 @@
     <ul class="LP-PlaceList__List">
         {% for place in place_list %}
         <li class="LP-PlaceList__Item">
-            <a href="{% url 'place_detail' pk=place.pk %}" class="LP-Link">
-                {% include 'partials/place_teaser.html' with place=place extended=True %}
-            </a>
+            {% include 'partials/place_teaser.html' with place=place extended=True %}
         </li>
         {% endfor %}
     </ul>