Icons everywhere! and update some dialog wording