Solve problems with icons - ref bug#7210