IssueID #31: update text, icons on various pages