some cleanup and button icon