Fixed a bug when angular inject $$haskey
Moved icons