LPS-44532 Source format
LPS-44532 Fix remove icon displaying when it should not