Move html elements from master mixins.scss

Had additional class for rtl, and some changes where left in after merge conflict resolution
Fixup for #1102 in master