Solve bug #7208
Merge branch '7208' into 1.9.x
Merge remote-tracking branch 'upstream/1.9.x' into 1.9.x
Solve problems with icons - ref bug#7210