diff --git a/template/yoga/mainpage_categories.tpl b/template/yoga/mainpage_categories.tpl
index 9c810600b..e56b637aa 100644
--- a/template/yoga/mainpage_categories.tpl
+++ b/template/yoga/mainpage_categories.tpl
@@ -6,7 +6,7 @@
 		<div class="thumbnailCategory">
 			<div class="illustration">
 			<a href="{$cat.URL}">
-				<img src="{$cat.TN_SRC}" alt="{$cat.TN_ALT}" title="{'hint_category'|@translate}">
+				<img src="{$cat.TN_SRC}" alt="{$cat.TN_ALT}" title="{$cat.NAME|replace:'"':' '} - {'hint_category'|@translate}">
 			</a>
 			</div>
 			<div class="description">
diff --git a/template/yoga/picture_content.tpl b/template/yoga/picture_content.tpl
index 7e15a1bb3..5c9291357 100644
--- a/template/yoga/picture_content.tpl
+++ b/template/yoga/picture_content.tpl
@@ -2,7 +2,10 @@
 {if isset($high) }
 <a href="javascript:phpWGOpenWindow('{$high.U_HIGH}','{$high.UUID}','scrollbars=yes,toolbar=no,status=no,resizable=yes')">
 {/if}
-  <img src="{$SRC_IMG}" style="width:{$WIDTH_IMG}px;height:{$HEIGHT_IMG}px;" alt="{$ALT_IMG}">
+  <img src="{$SRC_IMG}" style="width:{$WIDTH_IMG}px;height:{$HEIGHT_IMG}px;" alt="{$ALT_IMG}" 
+	{if isset($COMMENT_IMG)}
+		title="{$COMMENT_IMG|replace:'"':' '}" {else} title="{$current.TITLE|replace:'"':' '} - {$ALT_IMG}"
+	{/if}>
 {if isset($high) }
 </a>
   <p>{'picture_high'|@translate}</p>