Fix overrotation issue, add missing icon