diff --git a/assets/sass/_theme/blocks/agenda.sass b/assets/sass/_theme/blocks/agenda.sass
index b005c94765df87d05177c4827448100a2af82e0d..dd3ac8ce95f7daa433e8cb55d9ff3cd4e9523779 100644
--- a/assets/sass/_theme/blocks/agenda.sass
+++ b/assets/sass/_theme/blocks/agenda.sass
@@ -1 +1,8 @@
-// Styled in sections/events
\ No newline at end of file
+// Styled in sections/events
+
+.block-agenda
+    .top
+        a
+            @include icon(arrow-right, after, true)
+            @include hover-translate-icon
+            text-decoration: none
\ No newline at end of file
diff --git a/layouts/partials/blocks/templates/agenda.html b/layouts/partials/blocks/templates/agenda.html
index cdcdff462012351320b4d1e43cec7d3ec182c990..95c40183dd1be439ae94466879cb7d57047eb6df 100644
--- a/layouts/partials/blocks/templates/agenda.html
+++ b/layouts/partials/blocks/templates/agenda.html
@@ -1,19 +1,27 @@
 {{- $block := .block }}
 {{- $block_class := partial "GetBlockClass" .block -}}
-
 {{- with .block.data -}}
   {{- $show_summary := .show_summary -}}
   {{- $show_category := .show_category -}}
   {{- $show_status := .show_status -}}
   {{- $layout := .layout | default "list" -}}
-
+  
   <div class="{{ $block_class }}">
     <div class="container">
       <div class="block-content">
+        {{ $events_page := site.GetPage "/events" }}
+        {{ $link := $events_page.Permalink }}
+
+        {{ if .category }}
+          {{ $term := site.GetPage (printf "/posts_categories%s" .category) }}
+          {{ $link = $term.Permalink }}
+        {{ end }}
+        
         {{ partial "blocks/top.html" (dict
           "title" $block.title
           "heading_level" $block.ranks.self
           "description" .description
+          "link" $link
         )}}
 
         {{ if .events }}
diff --git a/layouts/partials/events/event.html b/layouts/partials/events/event.html
index a3d4dbe2c67050423092620b20f3d2a46eec67c0..194a1dc2d0cc2132529b5e2cfac967eafcef3a53 100644
--- a/layouts/partials/events/event.html
+++ b/layouts/partials/events/event.html
@@ -45,9 +45,9 @@
         <p class="event-status">
           {{ if eq .Params.dates.status "current"}}
             {{- i18n "blocks.events.current" -}}
-          {{ else if .Params.dates.status "future" }}
+          {{ else if eq .Params.dates.status "future" }}
             {{- i18n "blocks.events.future" -}}
-          {{ else if .Params.dates.status "archive" }}
+          {{ else if eq .Params.dates.status "archive" }}
               {{- i18n "blocks.events.archive" -}}
           {{ end }}
         </p>