issue #250. Changed topbarbutton class back to the original code.