updated button and icons part 3