Fix some bugs, change icons