Merge pull request #905 from Arantor/release-2.1

! Fix the alignment of IM icons. (ref #889)