diff --git a/app/views/events/_sponsors.html.haml b/app/views/events/_sponsors.html.haml
deleted file mode 100644
index 6b52e6ea1..000000000
--- a/app/views/events/_sponsors.html.haml
+++ /dev/null
@@ -1,4 +0,0 @@
-- sponsors.each do |sponsor|
-  .col-4.pl-3.pr-3
-    =link_to sponsor.website, class: 'border-0' do
-      = image_tag(sponsor.avatar.url, class: 'sponsor', alt: sponsor.name)
diff --git a/app/views/events/show.html.haml b/app/views/events/show.html.haml
index c314b5d8e..989f41b4b 100644
--- a/app/views/events/show.html.haml
+++ b/app/views/events/show.html.haml
@@ -22,11 +22,9 @@
   .row
     .col
       - if @event.announce_only
-        %a{ name: "information" }
-        %h3{ "data-magellan-destination" => "information"} Information
+        %h3 Information
       - else
-        %a{ name: "schedule" }
-        %h3{ "data-magellan-destination" => "schedule"}
+        %h3
           = t('events.schedule')
       = dot_markdown(@event.schedule)
 
@@ -34,36 +32,37 @@
   .stripe.reverse
     .row
       .col
-        %a{ name: "faq" }
-          %h2{ "data-magellan-destination" => "faq"}
-            .text-center FAQ
+        %h2.text-center FAQ
         - if @event.announce_only
           %p.text-center If you have any questions, #{mail_to(@event.email, "get in contact")}
-
         - else
           = render partial: 'events/faq'
 
 -if @event.sponsors?
-  .stripe.reverse
+  #sponsors.container-fluid.stripe.reverse
     .row
       .col
-        %a{ name: "sponsors" }
-        %h2.text-center{ "data-magellan-destination" => "sponsors"}
+        %h2.text-center
           = t('events.sponsors')
         %p.text-center
           %i= t('events.thx_to_sponsors')
-    .row.mt-4
       - if @event.sponsors?(:gold)
-        %h3.text-center Gold
-        = render partial: "sponsors", object: @event.gold_sponsors
+        .row.mt-4
+          .col
+            %h3.text-center Gold
+        = render partial: 'shared/sponsors', object: @event.gold_sponsors
       - if @event.sponsors?(:silver)
-        %h3.text-center Silver
-        = render partial: "sponsors", object: @event.silver_sponsors
+        .row.mt-4
+          .col
+            %h3.text-center Silver
+        = render partial: 'shared/sponsors', object: @event.silver_sponsors
       - if @event.sponsors?(:bronze)
-        %h3.text-center Bronze
-        = render partial: "sponsors", object: @event.bronze_sponsors
+        .row.mt-4
+          .col
+            %h3.text-center Bronze
+        = render partial: 'shared/sponsors', object: @event.bronze_sponsors
       - if @event.sponsors?(:standard)
-        = render partial: "sponsors", object: @event.sponsors
+        = render partial: 'shared/sponsors', object: @event.sponsors
 
 - if @event.verified_coaches.any?
   .container-fluid.stripe.reverse
diff --git a/app/views/shared/_sponsors.html.haml b/app/views/shared/_sponsors.html.haml
new file mode 100644
index 000000000..f3b2ee2a2
--- /dev/null
+++ b/app/views/shared/_sponsors.html.haml
@@ -0,0 +1,4 @@
+.row.align-items-center
+  - sponsors.each do |sponsor|
+    .col-4.col-md-3.col-lg-2.mt-3
+      = link_to image_tag(sponsor.avatar, class: 'small-image', alt: sponsor.name), sponsor.website, title: sponsor.name, class: 'd-inline-block'
diff --git a/app/views/workshops/show.html.haml b/app/views/workshops/show.html.haml
index 907e3b1a4..a978d02b8 100644
--- a/app/views/workshops/show.html.haml
+++ b/app/views/workshops/show.html.haml
@@ -23,15 +23,11 @@
 .container-fluid.stripe.reverse
   = render partial: 'shared/venue', locals: { venue: @workshop.host, address: @workshop.address}
 
-
-#sponsors.container-fluid.stripe.reverse.text-center
+#sponsors.container-fluid.stripe.reverse
   .row
     .col
-      %h3 Sponsors
-  .row.mt-4
-    - @workshop.sponsors.each do |sponsor|
-      .col-4
-        = image_tag(sponsor.avatar.url, class: 'sponsor-md', alt: sponsor.name)
+      %h3.text-center Sponsors
+  = render partial: 'shared/sponsors', object: @workshop.sponsors
 
 .container-fluid.stripe.reverse
   = render partial: 'members/organisers_grid', locals: { members: @workshop.organisers, show_info: false }