Changed swtich to use path for adding icons, removed else if