diff --git a/public/views/css/d.poi.css b/public/views/css/d.poi.css
index 308d90f..808df07 100755
--- a/public/views/css/d.poi.css
+++ b/public/views/css/d.poi.css
@@ -48,8 +48,15 @@ section.archive > * {
 	opacity: 0.5;
 }
 
-/* Comments of a poi */
+#comments_photos_gallery {
+	padding: 30px 0 0 0;
+}
+#comments_photos_gallery a, #comments_photos_gallery img {
+	height: 60px;
+	border-radius: 5px;
+}
 
+/* Comments of a poi */
 
 #new_comment {
 	clear: both;
diff --git a/public/views/d.poi.view.html b/public/views/d.poi.view.html
index f9b1c24..df2098b 100644
--- a/public/views/d.poi.view.html
+++ b/public/views/d.poi.view.html
@@ -179,6 +179,22 @@
 
 
 				<?php if ($isCommentable) { ?>
+					<?php if (isset($poi_comments) && $poi_comments->number > 0) { ?>
+						<div id="comments_photos_gallery" class="gallery">
+							<?php foreach ($poi_comments->objs as $comment) { ?>
+								<?php if (!empty($comment->photo)) { ?>
+						            <a href="<?=$config['rel_root_folder'].'medias/comment_photos/'.$comment->photo?>">
+						            	<img src="<?=$config['rel_root_folder'].'medias/comment_photos/'.$comment->photo?>" title="<?= (mb_strlen($comment->comment) > 50 ? mb_substr($comment->comment, 0, 50) . '...' : $comment->comment) ?>">
+						            </a>
+								<?php } ?>
+							<?php } ?>
+						</div>
+
+						<script type="text/javascript">
+							var lightbox = new SimpleLightbox('.gallery a');
+						</script>
+					<?php } ?>
+
 					<!-- Comments -->
 					<div id="new_comment">
 						<form class="form" action="<?=$config['rel_root_folder']?>poi/<?=$poi->permalink?>/new_comment" method="post" enctype="multipart/form-data">
diff --git a/src/Controllers/d.poi.php b/src/Controllers/d.poi.php
index 37c6a34..056368b 100755
--- a/src/Controllers/d.poi.php
+++ b/src/Controllers/d.poi.php
@@ -282,7 +282,7 @@ switch ($controller->splitted_url[1]) {
 						        $wmHeight = imagesy($wm);
 
 						        $x = $newWidth - $wmWidth - 20;
-						        $y = $newHeight - $wmHeight - 20;
+						        $y = 20;
 
 						        // Fusion
 						        imagecopy($dst, $wm, $x, $y, 0, 0, $wmWidth, $wmHeight);
@@ -338,8 +338,8 @@ switch ($controller->splitted_url[1]) {
 				$poi->author_name = $tempUser->name;
 				unset($tempUser);
 
-				$head['third'] = "leaflet/leaflet.js;leaflet-fullscreen/Leaflet.fullscreen.min.js;leaflet-easybutton/easy-button.js";
-				$head['css'] .= ";../third/leaflet/leaflet.css;../third/leaflet-fullscreen/leaflet.fullscreen.css;../third/leaflet-easybutton/easy-button.css";
+				$head['third'] = "leaflet/leaflet.js;leaflet-fullscreen/Leaflet.fullscreen.min.js;leaflet-easybutton/easy-button.js;simplelightbox/simple-lightbox.min.js";
+				$head['css'] .= ";../third/leaflet/leaflet.css;../third/leaflet-fullscreen/leaflet.fullscreen.css;../third/leaflet-easybutton/easy-button.css;../third/simplelightbox/simple-lightbox.min.css";
 				$head['js'] = "d.poi_map.js";
 
 				$head['title'] = $poi->name;