[Restyling] Project update/merge with conflict UI issues

See screenshots. When updating or merging a project with conflicts, UI labels/images are messed up.

Steps to reproduce:

1. Go to the projects perspective 
2. Select the Q project
3. Merge
4. Press Update once more

Expected result:

The items are aligned.

Actual result:

See screenshot.