OPAL-2054, OPAL-2053: Changing icon from remove to trash