more icon replacement; whitspace fixes