Merge changes for issues #11728 and #11729

Merge changes for issues #11728 and #11729. Add missing logoff icon.