Re-working button labels and icons