Code clean, use newer icons