Fixed issue #820 in default tempalte and updated icons for alpha in that same area.
Merge pull request #826 from sinfuljosh/dev

Fixed issue #820 in default tempalte and updated icons for alpha in that...