[kde-plasma-akonadi-contacts/f18] (2 commits) ...Fix icon conflicts