Added sorting icons.
Merge origin/master