Remove unused icons
Remove unused icons
Remove unused resource
Code clean-up
RELEASE 2.5