merge master

Feature #14125

Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>

diff --cc src/components/icon/icon.tsx
index 5ca0f9c0e572dfd67d50301301d20762ec1d6e02,0ec7ccf48b97e9d42f1cb4433fdf328b64491b5e..afc0fed1adbc6c6aba4d4b8096d794d3f7e154fa
--- 1/src/components/icon/icon.tsx
--- 2/src/components/icon/icon.tsx
+++ b/src/components/icon/icon.tsx
@@@ -28,7 -29,7 +30,8 @@@ import LastPage from '@material-ui/icon
  import LibraryBooks from '@material-ui/icons/LibraryBooks';
  import Menu from '@material-ui/icons/Menu';
  import MoreVert from '@material-ui/icons/MoreVert';
 +import Mail from '@material-ui/icons/Mail';
+ import MoveToInbox from '@material-ui/icons/MoveToInbox';
  import Notifications from '@material-ui/icons/Notifications';
  import People from '@material-ui/icons/People';
  import Person from '@material-ui/icons/Person';
@@@ -38,9 -39,9 +41,10 @@@ import RateReview from '@material-ui/ic
  import RestoreFromTrash from '@material-ui/icons/History';
  import Search from '@material-ui/icons/Search';
  import SettingsApplications from '@material-ui/icons/SettingsApplications';
+ import SettingsEthernet from '@material-ui/icons/SettingsEthernet';
  import Star from '@material-ui/icons/Star';
  import StarBorder from '@material-ui/icons/StarBorder';
 +import HelpOutline from '@material-ui/icons/HelpOutline';
  
  export type IconType = React.SFC<{ className?: string }>;
  
@@@ -83,5 -87,3 +90,6 @@@ export const TrashIcon: IconType = (pro
  export const UserPanelIcon: IconType = (props) => <Person {...props} />;
  export const UsedByIcon: IconType = (props) => <Folder {...props} />;
  export const WorkflowIcon: IconType = (props) => <Code {...props} />;
 +export const ImportContactsIcon: IconType = (props) => <ImportContacts {...props} />;
 +export const HelpOutlineIcon: IconType = (props) => <HelpOutline {...props} />;
++export const MailIcon: IconType = (props) => <Mail {...props} />;