Fix condition where library groupings would load multiple times
Allow overriding icons in available shortcut groupings

Also fixes potential infinite loop when default icon is not available