BUG #14962: Fixed issue with glyph panel.

Fixed the duplicate reset buttons. Also refactored the code to be a
little cleaners, with less duplication.

Change-Id: I6d6f360eaa0ad28a5d66ef2f2573774ca8b2384b
Merge topic '14962_fix_glyph_panel' into next

f7e149e6 BUG #14962: Fixed issue with glyph panel.