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

... same area.