Update className for sort button
Fix name icons