Fixed issues except bookmark close icon painting.