Merge "Fix background colouring for settings themed icons"