diff --git a/app/views/discover/_userbox.html.haml b/app/views/discover/_userbox.html.haml
index 0f0fa626..c1d5cf9b 100644
--- a/app/views/discover/_userbox.html.haml
+++ b/app/views/discover/_userbox.html.haml
@@ -1,11 +1,11 @@
-.card.questionbox{data: { id: u.id }}
+.card{data: { id: u.id }}
   .card-body
     .media
       .pull-left
         %a{href: show_user_profile_path(u.screen_name)}
-          %img.answerbox--img{src: u.profile_picture.url(:medium)}
+          %img.avatar-md.mr-2{src: u.profile_picture.url(:medium)}
       .media-body
-        %h6.media-heading
+        %h6.media-heading.answerbox__question-user
           - if u.display_name.blank?
             %a{href: show_user_profile_path(u.screen_name)}
               %span= "@#{u.screen_name}"
diff --git a/app/views/shared/_question.html.haml b/app/views/shared/_question.html.haml
index e621ffcf..677c73ac 100644
--- a/app/views/shared/_question.html.haml
+++ b/app/views/shared/_question.html.haml
@@ -1,11 +1,11 @@
 - type ||= nil
-.card.questionbox{data: { id: q.id }}
+.card{data: { id: q.id }}
   .card-body
     .media
       - if type == "discover"
         .pull-left
           %a{href: user_screen_name(q.user, link_only: true)}
-            %img.answerbox--img{src: q.user&.profile_picture&.url(:medium)}
+            %img.avatar-md.mr-2{src: q.user&.profile_picture&.url(:medium)}
       .media-body
         - if user_signed_in?
           .pull-right
@@ -23,7 +23,7 @@
                     %a{href: '#', tabindex: -1, data: { action: 'ab-question-report', q_id: q.id }}
                       %i.fa.fa-exclamation-triangle
                       = t 'views.actions.report'
-        %h6.media-heading.text-muted.answerbox--question-user
+        %h6.media-heading.text-muted.answerbox__question-user
           = raw t('views.answerbox.asked', user: user_screen_name(q.user), time: time_tooltip(q))
           - if q.answer_count > 1
             ·