diff --git a/app/views/question/_question.haml b/app/views/question/_question.haml
index ef1e336d..015d1541 100644
--- a/app/views/question/_question.haml
+++ b/app/views/question/_question.haml
@@ -1,11 +1,11 @@
 .card.question--fixed{class: if hidden then 'question--hidden' end, tabindex: if hidden then '-1' end, aria: { hidden: if hidden then :true end }}
   .container
     .card-body
-      .media.question-media
+      .media
         - unless question.author_is_anonymous
           %a.pull-left{href: unless hidden then show_user_profile_path(question.user.screen_name) end}
-            %img.avatar-sm{src: question.user.profile_picture.url(:medium)}
-        .media-body.question-body
+            %img.answerbox__question-user-avatar.avatar-md{src: question.user.profile_picture.url(:medium)}
+        .media-body
           - if user_signed_in?
             .pull-right
               .btn-group
@@ -23,7 +23,7 @@
                         %a{href: '#', tabindex: -1, data: { action: 'ab-question-report', q_id: question.id }}
                           %i.fa.fa-exclamation-triangle
                           = t 'views.actions.report'
-          %h6.text-muted.media-heading.answerbox--question-user
+          %h6.text-muted.media-heading.answerbox__question-user
             - if hidden
               = user_screen_name question.user, anonymous: question.author_is_anonymous, url: false
             - else
diff --git a/app/views/question/show.haml b/app/views/question/show.haml
index c05bf2a8..bb460154 100644
--- a/app/views/question/show.haml
+++ b/app/views/question/show.haml
@@ -14,8 +14,7 @@
 
   - if user_signed_in? && !current_user.answered?(@question) && current_user != @question.user && @question.user&.privacy_allow_stranger_answers
     .card#q-answer-box
-      .card-header
-        %h3.card-title= t('views.question.title')
+      .card-header= t('views.question.title')
       .card-body
         %textarea#q-answer.form-control{placeholder: t('views.placeholder.inbox'), data: { id: @question.id }}
         %br/