Merge "Fixed a bug where both icons were visible initially"