Fixed issue #608: Increased font size for icons
Fixed issue: Minor cleanup