Merge "Fix a close button colors" into tm-dev