Finish adding icons, update typewriter