diff --git a/app/views/events/index.html.haml b/app/views/events/index.html.haml
index 6e246c71..6e68220d 100644
--- a/app/views/events/index.html.haml
+++ b/app/views/events/index.html.haml
@@ -17,12 +17,14 @@
       title: ->(start_date) { raw link_to l(start_date, format: :month),
         root_url(start_date: start_date), class: 'month_selector' } do |date, events|
       .day_number= date.day
-      %ul.events
+      %ul.events.fa-ul
         - events.select { |e| (e.start_time.to_date..e.end_time.to_date).cover? date }
         -   .sort_by { |e| e.city }.each do |event|
-          %li.event
+          %li.event(title="#{display_date(event)}")
+            - if event.locality?
+              %em.locality.fa.fa-li.fa-globe
             = link_to event do
-              %strong.city= event.city
+              %strong.city(title="#{event.address}")= event.city
               = event.title
 
 - else
@@ -39,11 +41,11 @@
     %ul.events.fa-ul
       - events.select { |e| (e.start_time.to_date..e.end_time.to_date).cover? date }
       -   .sort_by { |e| e.city }.each do |event|
-        %li.event(class="#{event.locality? ? 'national' : 'local'}" title="#{display_date(event)}")
+        %li.event(title="#{display_date(event)}")
           - if event.locality?
-            %em.locality.fa.fa-li.fa-globe(title="#{Event.human_attribute_name :locality} #{t 'attributes.locality_1'}")
+            %em.locality.fa.fa-li.fa-globe
           = link_to event do
-            %strong.city(title="#{event.full_address}")= event.city
+            %strong.city(title="#{event.address}")= event.city
             = event.title
 
 .formats