     @$replace_button.hide()
     @$edit_button.hide()
 
-    if (@$snapshot_button.length > 0) and (@current_src or @current_thumbnail)
-      # This is a shutterbug question, so it's answered if there's a thumbnail
-      @show_edit_buttons()
-    else if (@$drawing_button.length > 0) and (@current_annotation or @annotated_url)
-      # This is a drawing question, so an annotation is needed for it to be answered
+    if @has_image_content()
       @show_edit_buttons()
 
     @set_svg_background()


    # Constant selectors:
    @form_prefix          = "embeddable_image_question_answer"
    @dialog_sel             = "#image_question_answer_form_#{@image_question_id}"
    @svg_canvas_id        = "image_question_annotation_for_#{@image_question_id}"
    @form_sel           = "#image_question_#{@image_question_id}"
    @sb_svg_src           = "#sb_svg_src_#{@image_question_id}"
    @interactive_selector = ".interactive-mod > *:first-child"



      @$sb_svg_src.css('width',w)
      @$sb_svg_src.css('height',h)
      @$sb_svg_src.css('background-image',  "url(#{@current_src})")
      @$sb_svg_src.css('background-repeat',  "no-repeat")
      @$sb_svg_src.css('background-position',  "center")
      @$sb_svg_src.css('background-size',  "contain")
      @$sb_svg_src.css('background-color',  "#ffffff")
      @$sb_svg_src.html(data)
      @shutterbug_svg.getDomSnapshot()

