Reverted Style and improved buttons, some icons