Merge commit '6ba03118790f57ec0c0c9d6ed3198de11a08b6a9' into kraken * commit '6ba03118790f57ec0c0c9d6ed3198de11a08b6a9': bug 2542580: fix bad icon.
Merge commit '6ba03118790f57ec0c0c9d6ed3198de11a08b6a9' into kraken * commit '6ba03118790f57ec0c0c9d6ed3198de11a08b6a9': bug 2542580: fix bad icon.