clean up old logic
tweak icon positioning