Merge "Fix themed icon preview reload (2/3)" into udc-dev