Merge commit 'fdef97bdc8865661667f8cdbcd078e55f16fd138' * commit 'fdef97bdc8865661667f8cdbcd078e55f16fd138': fix the "right icon" in the titlebar