Fix bugs; update icons