Case 2787 - Changed SFX button markup.
Merge branch 'case-2787' into case-2796

* case-2787:
  Case 2787 - Changed SFX button markup.
Case 2796 - Modified class.