diff --git a/django_lostplaces/lostplaces/templates/explorer/profile.html b/django_lostplaces/lostplaces/templates/explorer/profile.html
index 4cf7948..68c0072 100644
--- a/django_lostplaces/lostplaces/templates/explorer/profile.html
+++ b/django_lostplaces/lostplaces/templates/explorer/profile.html
@@ -63,25 +63,8 @@
 </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>
+	{% translate 'Images submitted by' as submitted_by %}
+	{% include 'partials/placeImageGrid.html' with headline=submitted_by|add:' '|add:explorer.user.username image_list=assets.placeimages.all%}
 </section>
 
 <section class=" LP-Section">
diff --git a/django_lostplaces/lostplaces/templates/partials/placeImageGrid.html b/django_lostplaces/lostplaces/templates/partials/placeImageGrid.html
new file mode 100644
index 0000000..7623d04
--- /dev/null
+++ b/django_lostplaces/lostplaces/templates/partials/placeImageGrid.html
@@ -0,0 +1,21 @@
+	{% load static %}
+	
+	{% if headline %}
+	<h1 class="LP-Headline">{{headline}}</h1>
+	{% endif %}
+	<div class="LP-ImageGrid">
+		<ul class="LP-ImageGrid__Container">
+		{% for image in image_list %}
+			<li class="LP-ImageGrid__Item">
+				{% include 'partials/image.html' with source_url=image.filename.thumbnail.url link_url=image.filename.large.url %}
+			{% if user.explorer == image.submitted_by%}
+				<span class="LP-ImageGrid__DeleteItem" title="Bild löschen">
+					<a href="{% url 'place_image_delete' pk=image.id %}" class="LP-Link">
+						<img class="LP-Icon" src="{% static 'icons/cancel.svg' %}" />
+					</a>
+				</span>
+			{% endif %}
+			</li>
+		{% endfor %}
+		</ul>
+	</div>
\ No newline at end of file
diff --git a/django_lostplaces/lostplaces/templates/place/place_detail.html b/django_lostplaces/lostplaces/templates/place/place_detail.html
index 6d91170..aba45ac 100644
--- a/django_lostplaces/lostplaces/templates/place/place_detail.html
+++ b/django_lostplaces/lostplaces/templates/place/place_detail.html
@@ -25,9 +25,9 @@
     <header class="LP-PlaceDetail__Header">
         <h1 class="LP-Headline">{{ place.name }}</h1>
         {% if place.placeimages.first.filename.hero.url %}
-        <figure class="LP-PlaceDetail__Image">
-            <img src="{{ place.placeimages.first.filename.hero.url }}" class="LP-Image" />
-        </figure>
+        <div class="LP-PlaceDetail__Image">
+			{% include 'partials/image.html' with source_url=place.placeimages.first.filename.hero.url %}
+        </div>
         {% endif %}
     </header>
 
@@ -90,30 +90,8 @@
     </section>
 
     <section class="LP-Section">
-        <h1 class="LP-Headline">{% trans 'Images' %}</h1>
-        <div class="LP-ImageGrid">
-            <ul class="LP-ImageGrid__Container">
-                {% for place_image in place.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 or user.explorer ==  place.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 %}
-                <li class="LP-ImageGrid__Item LP-ImageGrid__Item--add" title="Bild hinzufügen">
-                    <a class="LP-Link" href="{% url 'place_image_create' place_id=place.id%}">
-                        <img class="LP-Icon" src="{% static 'icons/plus.svg' %}" />
-                    </a>
-                </li>
-            </ul>
-        </div>
+		{% translate 'Images' as t_images %}
+		{% include 'partials/placeImageGrid.html' with headline=t_images image_list=place.placeimages.all%}
     </section>
 
 </article>