Merge "Fixing issue with inconsistent icon filename. (Bug 16992882)" into lmp-dev