Inconsistent use of icons to represent a git merge

We are using different icons in a few places to represent merging a branch. I think we should probably standardize around one.

(My vote would be for the latter one as it looks much closer to our "branch" and "commit" icons)