Update to #6: rebooting the phone brought back the original set of icons such that touching system-settings launches the correct app and ditto for gmail.
Update to #6: rebooting the phone brought back the original set of icons such that touching system-settings launches the correct app and ditto for gmail.