Merge branch 'ide-mr-icon-fixes' into 'master'

Fixed tooltip & spacing of merge request icon in IDE

Closes #46121 and #46123

See merge request gitlab-org/gitlab-ce!18805

app/assets/javascripts/ide/components/mr_file_icon.vue

@@ -16,8 +16,8 @@ export default {
   <icon
     name="git-merge"
     v-tooltip
-    title="__('Part of merge request changes')"
-    css-classes="ide-file-changed-icon"
+    :title="__('Part of merge request changes')"
+    css-classes="append-right-8"
     :size="12"
   />
 </template>