Added title bar icon handling