More image button cleanup