diff --git a/templates/blog.html.twig b/templates/blog.html.twig
index 839c274..eae3e74 100755
--- a/templates/blog.html.twig
+++ b/templates/blog.html.twig
@@ -44,8 +44,11 @@
     {% if show_breadcrumbs and config.plugins.breadcrumbs.enabled %}
       {% include 'partials/breadcrumbs.html.twig' %}
     {% endif %}
+    
     {% if image %}
-      {{ image.cropZoom(1038,437).loading('lazy').html(title, title, 'image featured')|raw }}
+    <span class="image featured">
+      {{ image.cropZoom(1038,437).loading('lazy').html(title, title)|raw }}
+    </span>
     {% endif %}
 
     {{ page.content|raw }}
diff --git a/templates/default.html.twig b/templates/default.html.twig
index 7cbd75e..9c7d2e8 100755
--- a/templates/default.html.twig
+++ b/templates/default.html.twig
@@ -18,9 +18,11 @@
         {% endif %}
       </div>
     </header>
-
+    
     {% if image %}
-      {{ image.cropZoom(1038,437).loading('lazy').html(title, title, 'image featured')|raw }}
+    <span class="image featured">
+      {{ image.cropZoom(1038,437).loading('lazy').html(title, title)|raw }}
+    </span>
     {% endif %}
 
     {{ page.content|raw }}
diff --git a/templates/modular.html.twig b/templates/modular.html.twig
index c639e0c..6a99e5a 100755
--- a/templates/modular.html.twig
+++ b/templates/modular.html.twig
@@ -27,7 +27,9 @@
     </header>
 
     {% if image %}
-      {{ image.cropZoom(1038,437).loading('lazy').html(title, title, 'image featured')|raw }}
+    <span class="image featured">
+      {{ image.cropZoom(1038,437).loading('lazy').html(title, title)|raw }}
+    </span>
     {% endif %}
 
     {{ page.content|raw}}
diff --git a/templates/partials/blog_item.html.twig b/templates/partials/blog_item.html.twig
index d6ea18c..6bcf492 100644
--- a/templates/partials/blog_item.html.twig
+++ b/templates/partials/blog_item.html.twig
@@ -7,8 +7,10 @@
   {% else %}
     {% set author = page.taxonomy.author[0] %}
   {% endif %}
-
+  
   {% set avatar = page.media[page.header.avatarImage].url|e %}
+  {% set image = page.media[page.header.primaryImage] ?: page.media.images|first %}
+  {% set title = page.title|raw %}
 
   <header>
     <div class="title">
@@ -44,11 +46,11 @@
     </div>
   </header>
 
-  {% if page.header.primaryImage %}
-    <a href="{{ page.url }}">{{ page.media[page.header.primaryImage].cropZoom(1038,437).loading('lazy').html(page.title, page.title, 'image featured')|raw }}</a>
-  {% elseif page.media.images %}
-    <a href="{{ page.url }}">{{ page.media.images|first.cropZoom(1038,437).loading('lazy').html(page.title, page.title, 'image featured')|raw }}</a>
-  {% endif %}
+  {% if image %}
+    <span class="image featured">
+      {{ image.cropZoom(1038,437).loading('lazy').html(title, title)|raw }}
+    </span>
+    {% endif %}
 
   <div itemprop="articleBody">
     {% if page.header.continue_link is sameas(false) %}
diff --git a/templates/partials/social.html.twig b/templates/partials/social.html.twig
index d0a298b..fe55af7 100644
--- a/templates/partials/social.html.twig
+++ b/templates/partials/social.html.twig
@@ -1,3 +1,3 @@
 {% for item in theme_config.social %}
-  <li><a href="{{ item.url }}" class="icon brands {{item.icon}}"><span class="label">{{item.name}}</span></a></li>
+  <li><a href="{{ item.url }}" class="icon brands {{item.icon}}" aria-label="{{item.name}}"><span class="label">{{item.name}}</span></a></li>
 {% endfor %}
\ No newline at end of file
diff --git a/templates/portfolio.html.twig b/templates/portfolio.html.twig
index ce493d1..a810476 100755
--- a/templates/portfolio.html.twig
+++ b/templates/portfolio.html.twig
@@ -21,7 +21,9 @@
       </div>
     </header>
     {% if image %}
-      {{ image.cropZoom(1038,437).loading('lazy').html(title, title, 'image featured')|raw }}
+    <span class="image featured">
+      {{ image.cropZoom(1038,437).loading('lazy').html(title, title)|raw }}
+    </span>
     {% endif %}
 
     {{ page.content|raw}}