Icons in menus are buggy

Problem/Motivation

Issues with icons that are added to links in menus

• Parent links - icon displays but we see some template source exposure too, so we need to debug
• Child links - icon displays fine, but we need a bit more of a gap betwen icons and label
  And test for when icon is before or after