Make control styles more generic and adds iconButton