define to const, select favorite bug fixed, new icons
Merge remote-tracking branch 'origin/master'
merge conflicts