UI cleanup & new icon