diff --git a/src/shared/icons/add-remove.js b/src/shared/icons/add-remove.js
index 46c264e..1385a0c 100644
--- a/src/shared/icons/add-remove.js
+++ b/src/shared/icons/add-remove.js
@@ -1,254 +1,285 @@
-export const Add01Icon = (props) => (
-
-);
-Add01Icon.keywords = ['add', 'plus', 'create', 'new', 'insert', 'cross', 'ajouter', 'nouveau', 'créer', 'insérer'];
-Add01Icon.category = 'Add + Remove';
+const m = (fn, keywords) => Object.assign(fn, { keywords, category: 'Ajouter + Supprimer' });
-export const Add02Icon = (props) => (
-
+export const Add01Icon = m(
+ (props) => (
+
+ ),
+ ['add', 'plus', 'create', 'new', 'insert', 'cross', 'ajouter', 'nouveau', 'créer', 'insérer'],
);
-Add02Icon.keywords = ['add', 'plus', 'create', 'new', 'insert', 'cross', 'ajouter', 'nouveau', 'créer', 'insérer'];
-Add02Icon.category = 'Add + Remove';
-export const AddCircleIcon = (props) => (
-
+export const Add02Icon = m(
+ (props) => (
+
+ ),
+ ['add', 'plus', 'create', 'new', 'insert', 'cross', 'ajouter', 'nouveau', 'créer', 'insérer'],
);
-AddCircleIcon.keywords = ['add', 'plus', 'create', 'new', 'insert', 'circle', 'round', 'ajouter', 'nouveau', 'créer', 'insérer', 'cercle'];
-AddCircleIcon.category = 'Add + Remove';
-export const AddCircleHalfDotIcon = (props) => (
-
+export const AddCircleIcon = m(
+ (props) => (
+
+ ),
+ ['add', 'plus', 'create', 'new', 'insert', 'circle', 'round', 'ajouter', 'nouveau', 'créer', 'insérer', 'cercle'],
);
-AddCircleHalfDotIcon.keywords = ['add', 'plus', 'create', 'new', 'insert', 'circle', 'half', 'dot', 'ajouter', 'nouveau', 'créer', 'insérer', 'cercle', 'moitié', 'point'];
-AddCircleHalfDotIcon.category = 'Add + Remove';
-export const AddSquareIcon = (props) => (
-
+export const AddCircleHalfDotIcon = m(
+ (props) => (
+
+ ),
+ ['add', 'plus', 'create', 'new', 'insert', 'circle', 'half', 'dot', 'ajouter', 'nouveau', 'créer', 'insérer', 'cercle', 'moitié', 'point'],
);
-AddSquareIcon.keywords = ['add', 'plus', 'create', 'new', 'insert', 'square', 'ajouter', 'nouveau', 'créer', 'insérer', 'carré'];
-AddSquareIcon.category = 'Add + Remove';
-export const Cancel01Icon = (props) => (
-
+export const AddSquareIcon = m(
+ (props) => (
+
+ ),
+ ['add', 'plus', 'create', 'new', 'insert', 'square', 'ajouter', 'nouveau', 'créer', 'insérer', 'carré'],
);
-Cancel01Icon.keywords = ['cancel', 'close', 'dismiss', 'remove', 'cross', 'x', 'annuler', 'fermer', 'supprimer', 'croix'];
-Cancel01Icon.category = 'Add + Remove';
-export const Cancel02Icon = (props) => (
-
+export const Cancel01Icon = m(
+ (props) => (
+
+ ),
+ ['cancel', 'close', 'dismiss', 'remove', 'cross', 'x', 'annuler', 'fermer', 'supprimer', 'croix'],
);
-Cancel02Icon.keywords = ['cancel', 'close', 'dismiss', 'remove', 'cross', 'x', 'annuler', 'fermer', 'supprimer', 'croix'];
-Cancel02Icon.category = 'Add + Remove';
-export const CancelCircleIcon = (props) => (
-
+export const Cancel02Icon = m(
+ (props) => (
+
+ ),
+ ['cancel', 'close', 'dismiss', 'remove', 'cross', 'x', 'annuler', 'fermer', 'supprimer', 'croix'],
);
-CancelCircleIcon.keywords = ['cancel', 'close', 'dismiss', 'remove', 'cross', 'x', 'circle', 'round', 'annuler', 'fermer', 'supprimer', 'croix', 'cercle'];
-CancelCircleIcon.category = 'Add + Remove';
-export const CancelCircleHalfDotIcon = (props) => (
-
+export const CancelCircleIcon = m(
+ (props) => (
+
+ ),
+ ['cancel', 'close', 'dismiss', 'remove', 'cross', 'x', 'circle', 'round', 'annuler', 'fermer', 'supprimer', 'croix', 'cercle'],
);
-CancelCircleHalfDotIcon.keywords = ['cancel', 'close', 'dismiss', 'remove', 'cross', 'x', 'circle', 'half', 'dot', 'annuler', 'fermer', 'supprimer', 'croix', 'cercle', 'moitié', 'point'];
-CancelCircleHalfDotIcon.category = 'Add + Remove';
-export const CancelSquareIcon = (props) => (
-
+export const CancelCircleHalfDotIcon = m(
+ (props) => (
+
+ ),
+ ['cancel', 'close', 'dismiss', 'remove', 'cross', 'x', 'circle', 'half', 'dot', 'annuler', 'fermer', 'supprimer', 'croix', 'cercle', 'moitié', 'point'],
);
-CancelSquareIcon.keywords = ['cancel', 'close', 'dismiss', 'remove', 'cross', 'x', 'square', 'annuler', 'fermer', 'supprimer', 'croix', 'carré'];
-CancelSquareIcon.category = 'Add + Remove';
-export const Delete01Icon = (props) => (
-
+export const CancelSquareIcon = m(
+ (props) => (
+
+ ),
+ ['cancel', 'close', 'dismiss', 'remove', 'cross', 'x', 'square', 'annuler', 'fermer', 'supprimer', 'croix', 'carré'],
);
-Delete01Icon.keywords = ['delete', 'trash', 'bin', 'remove', 'garbage', 'waste', 'supprimer', 'corbeille', 'poubelle', 'déchets'];
-Delete01Icon.category = 'Add + Remove';
-export const Delete02Icon = (props) => (
-
+export const Delete01Icon = m(
+ (props) => (
+
+ ),
+ ['delete', 'trash', 'bin', 'remove', 'garbage', 'waste', 'supprimer', 'corbeille', 'poubelle', 'déchets'],
);
-Delete02Icon.keywords = ['delete', 'trash', 'bin', 'remove', 'garbage', 'waste', 'supprimer', 'corbeille', 'poubelle', 'déchets'];
-Delete02Icon.category = 'Add + Remove';
-export const Delete03Icon = (props) => (
-
+export const Delete02Icon = m(
+ (props) => (
+
+ ),
+ ['delete', 'trash', 'bin', 'remove', 'garbage', 'waste', 'supprimer', 'corbeille', 'poubelle', 'déchets'],
);
-Delete03Icon.keywords = ['delete', 'trash', 'bin', 'remove', 'garbage', 'waste', 'supprimer', 'corbeille', 'poubelle', 'déchets'];
-Delete03Icon.category = 'Add + Remove';
-export const Delete04Icon = (props) => (
-
+export const Delete03Icon = m(
+ (props) => (
+
+ ),
+ ['delete', 'trash', 'bin', 'remove', 'garbage', 'waste', 'supprimer', 'corbeille', 'poubelle', 'déchets'],
);
-Delete04Icon.keywords = ['delete', 'trash', 'bin', 'remove', 'garbage', 'waste', 'supprimer', 'corbeille', 'poubelle', 'déchets'];
-Delete04Icon.category = 'Add + Remove';
-export const DeletePutBackIcon = (props) => (
-
+export const Delete04Icon = m(
+ (props) => (
+
+ ),
+ ['delete', 'trash', 'bin', 'remove', 'garbage', 'waste', 'supprimer', 'corbeille', 'poubelle', 'déchets'],
);
-DeletePutBackIcon.keywords = ['delete', 'trash', 'bin', 'restore', 'put back', 'recover', 'undo', 'supprimer', 'corbeille', 'restaurer', 'récupérer', 'annuler'];
-DeletePutBackIcon.category = 'Add + Remove';
-export const DeleteThrowIcon = (props) => (
-
+export const DeletePutBackIcon = m(
+ (props) => (
+
+ ),
+ ['delete', 'trash', 'bin', 'restore', 'put back', 'recover', 'undo', 'supprimer', 'corbeille', 'restaurer', 'récupérer', 'annuler'],
);
-DeleteThrowIcon.keywords = ['delete', 'trash', 'throw', 'bin', 'discard', 'waste', 'supprimer', 'jeter', 'corbeille', 'poubelle', 'éliminer'];
-DeleteThrowIcon.category = 'Add + Remove';
-export const DiamondMinusIcon = (props) => (
-
+export const DeleteThrowIcon = m(
+ (props) => (
+
+ ),
+ ['delete', 'trash', 'throw', 'bin', 'discard', 'waste', 'supprimer', 'jeter', 'corbeille', 'poubelle', 'éliminer'],
);
-DiamondMinusIcon.keywords = ['diamond', 'minus', 'remove', 'subtract', 'shape', 'diamant', 'moins', 'soustraire', 'forme'];
-DiamondMinusIcon.category = 'Add + Remove';
-export const DiamondPlusIcon = (props) => (
-
+export const DiamondMinusIcon = m(
+ (props) => (
+
+ ),
+ ['diamond', 'minus', 'remove', 'subtract', 'shape', 'diamant', 'moins', 'soustraire', 'forme'],
);
-DiamondPlusIcon.keywords = ['diamond', 'plus', 'add', 'insert', 'shape', 'diamant', 'ajouter', 'insérer', 'forme'];
-DiamondPlusIcon.category = 'Add + Remove';
-export const Eraser01Icon = (props) => (
-
+export const DiamondPlusIcon = m(
+ (props) => (
+
+ ),
+ ['diamond', 'plus', 'add', 'insert', 'shape', 'diamant', 'ajouter', 'insérer', 'forme'],
);
-Eraser01Icon.keywords = ['eraser', 'erase', 'clear', 'delete', 'undo', 'remove', 'gomme', 'effacer', 'vider', 'supprimer'];
-Eraser01Icon.category = 'Add + Remove';
-export const EraserAddIcon = (props) => (
-
+export const Eraser01Icon = m(
+ (props) => (
+
+ ),
+ ['eraser', 'erase', 'clear', 'delete', 'undo', 'remove', 'gomme', 'effacer', 'vider', 'supprimer'],
);
-EraserAddIcon.keywords = ['eraser', 'add', 'erase', 'clear', 'plus', 'create', 'gomme', 'ajouter', 'effacer', 'créer'];
-EraserAddIcon.category = 'Add + Remove';
-export const Remove01Icon = (props) => (
-
+export const EraserAddIcon = m(
+ (props) => (
+
+ ),
+ ['eraser', 'add', 'erase', 'clear', 'plus', 'create', 'gomme', 'ajouter', 'effacer', 'créer'],
);
-Remove01Icon.keywords = ['remove', 'minus', 'subtract', 'reduce', 'dash', 'retirer', 'soustraire', 'réduire', 'moins'];
-Remove01Icon.category = 'Add + Remove';
-export const Remove02Icon = (props) => (
-
+export const Remove01Icon = m(
+ (props) => (
+
+ ),
+ ['remove', 'minus', 'subtract', 'reduce', 'dash', 'retirer', 'soustraire', 'réduire', 'moins'],
);
-Remove02Icon.keywords = ['remove', 'minus', 'subtract', 'reduce', 'dash', 'retirer', 'soustraire', 'réduire', 'moins'];
-Remove02Icon.category = 'Add + Remove';
-export const RemoveCircleIcon = (props) => (
-
+export const Remove02Icon = m(
+ (props) => (
+
+ ),
+ ['remove', 'minus', 'subtract', 'reduce', 'dash', 'retirer', 'soustraire', 'réduire', 'moins'],
);
-RemoveCircleIcon.keywords = ['remove', 'minus', 'subtract', 'circle', 'round', 'retirer', 'soustraire', 'cercle', 'moins'];
-RemoveCircleIcon.category = 'Add + Remove';
-export const RemoveCircleHalfDotIcon = (props) => (
-
+export const RemoveCircleIcon = m(
+ (props) => (
+
+ ),
+ ['remove', 'minus', 'subtract', 'circle', 'round', 'retirer', 'soustraire', 'cercle', 'moins'],
);
-RemoveCircleHalfDotIcon.keywords = ['remove', 'minus', 'subtract', 'circle', 'half', 'dot', 'retirer', 'soustraire', 'cercle', 'moitié', 'point'];
-RemoveCircleHalfDotIcon.category = 'Add + Remove';
-export const RemoveSquareIcon = (props) => (
-
+export const RemoveCircleHalfDotIcon = m(
+ (props) => (
+
+ ),
+ ['remove', 'minus', 'subtract', 'circle', 'half', 'dot', 'retirer', 'soustraire', 'cercle', 'moitié', 'point'],
);
-RemoveSquareIcon.keywords = ['remove', 'minus', 'subtract', 'square', 'retirer', 'soustraire', 'carré', 'moins'];
-RemoveSquareIcon.category = 'Add + Remove';
-export const RestoreBinIcon = (props) => (
-
+export const RemoveSquareIcon = m(
+ (props) => (
+
+ ),
+ ['remove', 'minus', 'subtract', 'square', 'retirer', 'soustraire', 'carré', 'moins'],
);
-RestoreBinIcon.keywords = ['restore', 'bin', 'recover', 'undo', 'trash', 'put back', 'restaurer', 'corbeille', 'récupérer', 'annuler', 'poubelle'];
-RestoreBinIcon.category = 'Add + Remove';
-export const UnavailableIcon = (props) => (
-
+export const RestoreBinIcon = m(
+ (props) => (
+
+ ),
+ ['restore', 'bin', 'recover', 'undo', 'trash', 'put back', 'restaurer', 'corbeille', 'récupérer', 'annuler', 'poubelle'],
);
-UnavailableIcon.keywords = ['unavailable', 'disabled', 'blocked', 'forbidden', 'not available', 'off', 'no', 'indisponible', 'désactivé', 'bloqué', 'interdit', 'non disponible'];
-UnavailableIcon.category = 'Add + Remove';
-export const WasteIcon = (props) => (
-
+export const UnavailableIcon = m(
+ (props) => (
+
+ ),
+ ['unavailable', 'disabled', 'blocked', 'forbidden', 'not available', 'off', 'no', 'indisponible', 'désactivé', 'bloqué', 'interdit', 'non disponible'],
);
-WasteIcon.keywords = ['waste', 'trash', 'bin', 'delete', 'garbage', 'remove', 'poubelle', 'corbeille', 'supprimer', 'déchets'];
-WasteIcon.category = 'Add + Remove';
-export const WasteRestoreIcon = (props) => (
-
+export const WasteIcon = m(
+ (props) => (
+
+ ),
+ ['waste', 'trash', 'bin', 'delete', 'garbage', 'remove', 'poubelle', 'corbeille', 'supprimer', 'déchets'],
+);
+
+export const WasteRestoreIcon = m(
+ (props) => (
+
+ ),
+ ['waste', 'trash', 'restore', 'bin', 'recover', 'undo', 'poubelle', 'restaurer', 'corbeille', 'récupérer', 'annuler'],
);
-WasteRestoreIcon.keywords = ['waste', 'trash', 'restore', 'bin', 'recover', 'undo', 'poubelle', 'restaurer', 'corbeille', 'récupérer', 'annuler'];
-WasteRestoreIcon.category = 'Add + Remove';