Fix more warnings uncovered by -Wswitch-enum

There should be no functional changes, but the code is more explicit in
some places and a missing icon is added (currently unused).

One user-facing change has been split out to D14716.