diff --git a/2/ecolyo.e6b96a1c5e512c5f9fcd.js b/2/ecolyo.379591bab7d5d3855037.js
similarity index 99%
rename from 2/ecolyo.e6b96a1c5e512c5f9fcd.js
rename to 2/ecolyo.379591bab7d5d3855037.js
index c7fd8a67a44a00582302bc2b6d21b1f4b43a1223..29586939385cddb45af1eeb5c481d87381594ca9 100644
--- a/2/ecolyo.e6b96a1c5e512c5f9fcd.js
+++ b/2/ecolyo.379591bab7d5d3855037.js
@@ -93,43 +93,43 @@ var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__("yXPU"));
 
 var _slicedToArray2 = _interopRequireDefault(__webpack_require__("J4zp"));
 
-var _react = _interopRequireWildcard(__webpack_require__("q1tI"));
-
-var _I18n = __webpack_require__("buk/");
-
-var _Icon = _interopRequireDefault(__webpack_require__("y6ex"));
+var _core = __webpack_require__("TTf+");
 
-var _reactRedux = __webpack_require__("/MKj");
+var _Button = _interopRequireDefault(__webpack_require__("FtsS"));
 
-var _reactRouterDom = __webpack_require__("55Ip");
+var _chevronDown = _interopRequireDefault(__webpack_require__("CYAo"));
 
-var _fluid = __webpack_require__("5Wkc");
+var _profileEdit = _interopRequireDefault(__webpack_require__("vdp4"));
 
-__webpack_require__("u5Ob");
+var _analysis = _interopRequireDefault(__webpack_require__("jSRn"));
 
-var _Button = _interopRequireDefault(__webpack_require__("FtsS"));
+var _noProfilePlaceholder = _interopRequireDefault(__webpack_require__("tM5S"));
 
 var _AnalysisConsumptionRow = _interopRequireDefault(__webpack_require__("lZiS"));
 
-var _StyledSpinner = _interopRequireDefault(__webpack_require__("HTwM"));
-
 var _StyledIcon = _interopRequireDefault(__webpack_require__("I07j"));
 
-var _profileType = _interopRequireDefault(__webpack_require__("7e12"));
+var _Loader = _interopRequireDefault(__webpack_require__("Ra/y"));
 
 var _cozyClient = __webpack_require__("SH7X");
 
-var _profileTypeEntity = _interopRequireDefault(__webpack_require__("aypK"));
+var _I18n = __webpack_require__("buk/");
 
-var _core = __webpack_require__("TTf+");
+var _Icon = _interopRequireDefault(__webpack_require__("y6ex"));
 
-var _noProfilePlaceholder = _interopRequireDefault(__webpack_require__("tM5S"));
+var _fluid = __webpack_require__("5Wkc");
 
-var _profileEdit = _interopRequireDefault(__webpack_require__("vdp4"));
+var _react = _interopRequireWildcard(__webpack_require__("q1tI"));
 
-var _analysis = _interopRequireDefault(__webpack_require__("jSRn"));
+var _reactRedux = __webpack_require__("/MKj");
 
-var _chevronDown = _interopRequireDefault(__webpack_require__("CYAo"));
+var _reactRouterDom = __webpack_require__("55Ip");
+
+var _profileType = _interopRequireDefault(__webpack_require__("7e12"));
+
+var _profileTypeEntity = _interopRequireDefault(__webpack_require__("aypK"));
+
+__webpack_require__("u5Ob");
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
@@ -328,9 +328,8 @@ var AnalysisConsumption = function AnalysisConsumption(_ref) {
     className: "analysis-graph"
   }, !profile.isProfileTypeCompleted ? profileNotCompleted() : isLoading ? /*#__PURE__*/_react.default.createElement("div", {
     className: "loader-container"
-  }, /*#__PURE__*/_react.default.createElement(_StyledSpinner.default, {
-    size: "5em",
-    fluidType: _fluid.FluidType.ELECTRICITY
+  }, /*#__PURE__*/_react.default.createElement(_Loader.default, {
+    color: "elec"
   })) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
     className: "consumption-title text-20-bold"
   }, /*#__PURE__*/_react.default.createElement("div", {
@@ -790,9 +789,9 @@ var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__("yXPU"));
 
 var _slicedToArray2 = _interopRequireDefault(__webpack_require__("J4zp"));
 
-var _react = _interopRequireWildcard(__webpack_require__("q1tI"));
+var _IconButton = _interopRequireDefault(__webpack_require__("o6Jd"));
 
-var _I18n = __webpack_require__("buk/");
+var _graphIcon = _interopRequireDefault(__webpack_require__("bIeq"));
 
 var _leftArrow = _interopRequireDefault(__webpack_require__("bZGv"));
 
@@ -800,30 +799,30 @@ var _rightArrow = _interopRequireDefault(__webpack_require__("fZGW"));
 
 var _StyledIcon = _interopRequireDefault(__webpack_require__("I07j"));
 
-var _IconButton = _interopRequireDefault(__webpack_require__("o6Jd"));
+var _Loader = _interopRequireDefault(__webpack_require__("Ra/y"));
 
-var _Icon = _interopRequireDefault(__webpack_require__("y6ex"));
+var _cozyClient = __webpack_require__("SH7X");
 
-var _graphIcon = _interopRequireDefault(__webpack_require__("bIeq"));
+var _I18n = __webpack_require__("buk/");
 
-var _fluid = __webpack_require__("5Wkc");
+var _Icon = _interopRequireDefault(__webpack_require__("y6ex"));
 
-var _reactRedux = __webpack_require__("/MKj");
+var _fluid = __webpack_require__("5Wkc");
 
-var _picto = __webpack_require__("6DBe");
+var _timeStep = __webpack_require__("cKQ8");
 
-var _cozyClient = __webpack_require__("SH7X");
+var _react = _interopRequireWildcard(__webpack_require__("q1tI"));
 
-var _timeStep = __webpack_require__("cKQ8");
+var _reactRedux = __webpack_require__("/MKj");
 
 var _consumption = _interopRequireDefault(__webpack_require__("AVq/"));
 
-__webpack_require__("Ydja");
-
-var _StyledSpinner = _interopRequireDefault(__webpack_require__("HTwM"));
+var _picto = __webpack_require__("6DBe");
 
 var _utils = __webpack_require__("c+yx");
 
+__webpack_require__("Ydja");
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -854,10 +853,10 @@ var MaxConsumptionCard = function MaxConsumptionCard(_ref) {
   var _useState5 = (0, _react.useState)(false),
       _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
       isLoading = _useState6[0],
-      setisLoading = _useState6[1];
+      setIsLoading = _useState6[1];
 
   var handleChangePrevFluid = (0, _react.useCallback)(function () {
-    setisLoading(true);
+    setIsLoading(true);
 
     if (index === 0) {
       setIndex(fluidTypes.length - 1);
@@ -868,7 +867,7 @@ var MaxConsumptionCard = function MaxConsumptionCard(_ref) {
     }
   }, [fluidTypes, index]);
   var handleChangeNextFluid = (0, _react.useCallback)(function () {
-    setisLoading(true);
+    setIsLoading(true);
 
     if (index === fluidTypes.length - 1) {
       setIndex(0);
@@ -892,7 +891,7 @@ var MaxConsumptionCard = function MaxConsumptionCard(_ref) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                setisLoading(true);
+                setIsLoading(true);
                 timePeriod = {
                   startDate: analysisDate.minus({
                     month: 1
@@ -914,7 +913,7 @@ var MaxConsumptionCard = function MaxConsumptionCard(_ref) {
                   setMaxDayData(null);
                 }
 
-                setisLoading(false);
+                setIsLoading(false);
 
               case 8:
               case "end":
@@ -961,8 +960,7 @@ var MaxConsumptionCard = function MaxConsumptionCard(_ref) {
     size: 24
   }))), /*#__PURE__*/_react.default.createElement("div", {
     className: "data-container"
-  }, isLoading && /*#__PURE__*/_react.default.createElement(_StyledSpinner.default, {
-    size: "3em",
+  }, isLoading && /*#__PURE__*/_react.default.createElement(_Loader.default, {
     fluidType: fluidTypes[index]
   }), !isLoading && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, !maxDayData && /*#__PURE__*/_react.default.createElement("p", {
     className: "text-20-bold no_data"
@@ -1567,7 +1565,7 @@ var _rightArrow = _interopRequireDefault(__webpack_require__("fZGW"));
 
 var _ElecHalfHourChart = _interopRequireDefault(__webpack_require__("qrnv"));
 
-var _StyledSpinner = _interopRequireDefault(__webpack_require__("HTwM"));
+var _Loader = _interopRequireDefault(__webpack_require__("Ra/y"));
 
 var _cozyClient = __webpack_require__("SH7X");
 
@@ -1829,9 +1827,8 @@ var ElecHalfHourMonthlyAnalysis = function ElecHalfHourMonthlyAnalysis(_ref) {
     size: 24
   }))), isLoading && /*#__PURE__*/_react.default.createElement("div", {
     className: "loader-container"
-  }, /*#__PURE__*/_react.default.createElement(_StyledSpinner.default, {
-    size: "5em",
-    fluidType: _fluid.FluidType.ELECTRICITY
+  }, /*#__PURE__*/_react.default.createElement(_Loader.default, {
+    color: "elec"
   })), !isLoading && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, getPowerChart(), enedisAnalysisValues && isDataFullyComplete(monthDataloads) && /*#__PURE__*/_react.default.createElement("div", {
     className: "min-max"
   }, /*#__PURE__*/_react.default.createElement("div", {
@@ -1905,37 +1902,37 @@ var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__("yXPU"));
 
 var _slicedToArray2 = _interopRequireDefault(__webpack_require__("J4zp"));
 
-var _react = _interopRequireWildcard(__webpack_require__("q1tI"));
-
-var _cozyClient = __webpack_require__("SH7X");
+var _Loader = _interopRequireDefault(__webpack_require__("Ra/y"));
 
-var _reactRedux = __webpack_require__("/MKj");
+var _FluidPerformanceIndicator = _interopRequireDefault(__webpack_require__("uqkh"));
 
-__webpack_require__("oXWw");
+var _cozyClient = __webpack_require__("SH7X");
 
 var _fluid = __webpack_require__("5Wkc");
 
 var _timeStep = __webpack_require__("cKQ8");
 
-var _consumption = _interopRequireDefault(__webpack_require__("AVq/"));
+var _react = _interopRequireWildcard(__webpack_require__("q1tI"));
 
-var _performanceIndicator = _interopRequireDefault(__webpack_require__("8gio"));
+var _reactRedux = __webpack_require__("/MKj");
+
+var _consumption = _interopRequireDefault(__webpack_require__("AVq/"));
 
 var _fluidConfig = _interopRequireDefault(__webpack_require__("JIzA"));
 
-var _FluidPerformanceIndicator = _interopRequireDefault(__webpack_require__("uqkh"));
+var _performanceIndicator = _interopRequireDefault(__webpack_require__("8gio"));
 
 var _AnalysisConsumption = _interopRequireDefault(__webpack_require__("6ISt"));
 
-var _StyledSpinner = _interopRequireDefault(__webpack_require__("HTwM"));
-
 var _AnalysisErrorModal = _interopRequireDefault(__webpack_require__("lvg8"));
 
+var _ElecHalfHourMonthlyAnalysis = _interopRequireDefault(__webpack_require__("LTEj"));
+
 var _MaxConsumptionCard = _interopRequireDefault(__webpack_require__("AJTi"));
 
-var _TotalAnalysisChart = _interopRequireDefault(__webpack_require__("8LDu"));
+__webpack_require__("oXWw");
 
-var _ElecHalfHourMonthlyAnalysis = _interopRequireDefault(__webpack_require__("LTEj"));
+var _TotalAnalysisChart = _interopRequireDefault(__webpack_require__("8LDu"));
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
@@ -2069,10 +2066,7 @@ var MonthlyAnalysis = function MonthlyAnalysis(_ref) {
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, !isLoaded && /*#__PURE__*/_react.default.createElement("div", {
     className: "analysis-container-spinner",
     "aria-busy": "true"
-  }, /*#__PURE__*/_react.default.createElement(_StyledSpinner.default, {
-    size: "5em",
-    fluidType: _fluid.FluidType.MULTIFLUID
-  })), isLoaded && /*#__PURE__*/_react.default.createElement("div", {
+  }, /*#__PURE__*/_react.default.createElement(_Loader.default, null)), isLoaded && /*#__PURE__*/_react.default.createElement("div", {
     className: "analysis-root black"
   }, fluidTypes.length >= 1 ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
     className: "analysis-content"
diff --git a/3/ecolyo.fa772de24389b6ace985.js b/3/ecolyo.b6371a2c1946524aaa38.js
similarity index 99%
rename from 3/ecolyo.fa772de24389b6ace985.js
rename to 3/ecolyo.b6371a2c1946524aaa38.js
index 4e6049b6f294973ff9c15268c950b6b77fca6b2c..2aa8b05a8e8c4fe850ddc4420775513012e332bf 100644
--- a/3/ecolyo.fa772de24389b6ace985.js
+++ b/3/ecolyo.b6371a2c1946524aaa38.js
@@ -1372,29 +1372,31 @@ var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__("yXPU"));
 
 var _slicedToArray2 = _interopRequireDefault(__webpack_require__("J4zp"));
 
-var _react = _interopRequireWildcard(__webpack_require__("q1tI"));
+var _fluid = __webpack_require__("5Wkc");
 
-__webpack_require__("xz5R");
+var _timeStep = __webpack_require__("cKQ8");
+
+var _react = _interopRequireWildcard(__webpack_require__("q1tI"));
 
 var _reactRedux = __webpack_require__("/MKj");
 
-var _fluid = __webpack_require__("5Wkc");
+__webpack_require__("xz5R");
 
-var _timeStep = __webpack_require__("cKQ8");
+var _classnames = _interopRequireDefault(__webpack_require__("TSYQ"));
 
-var _StyledSpinner = _interopRequireDefault(__webpack_require__("HTwM"));
+var _ExpiredConsentModal = _interopRequireDefault(__webpack_require__("m9+5"));
 
-var _CozyBar = _interopRequireDefault(__webpack_require__("CJMG"));
+var _Content = _interopRequireDefault(__webpack_require__("VOVi"));
 
-var _Header = _interopRequireDefault(__webpack_require__("frrP"));
+var _CustomPopupModal = _interopRequireDefault(__webpack_require__("YLfl"));
 
-var _Content = _interopRequireDefault(__webpack_require__("VOVi"));
+var _DateNavigator = _interopRequireDefault(__webpack_require__("Hno1"));
 
 var _FluidChart = _interopRequireDefault(__webpack_require__("iT/d"));
 
-var _DateNavigator = _interopRequireDefault(__webpack_require__("Hno1"));
+var _CozyBar = _interopRequireDefault(__webpack_require__("CJMG"));
 
-var _chart = __webpack_require__("U6AS");
+var _Header = _interopRequireDefault(__webpack_require__("frrP"));
 
 var _ConsumptionDetails = _interopRequireDefault(__webpack_require__("Otk3"));
 
@@ -1404,23 +1406,21 @@ var _KonnectorViewerCard = _interopRequireDefault(__webpack_require__("GyzU"));
 
 var _KonnectorViewerList = _interopRequireDefault(__webpack_require__("WoCI"));
 
-var _classnames = _interopRequireDefault(__webpack_require__("TSYQ"));
-
-var _utils = __webpack_require__("c+yx");
-
-var _releaseNotesModal = _interopRequireDefault(__webpack_require__("9J6O"));
-
-var _global = __webpack_require__("c4IZ");
+var _Loader = _interopRequireDefault(__webpack_require__("Ra/y"));
 
 var _PartnersIssueModal = _interopRequireDefault(__webpack_require__("HK68"));
 
+var _cozyClient = __webpack_require__("SH7X");
+
 var _profile = _interopRequireDefault(__webpack_require__("2l2O"));
 
-var _cozyClient = __webpack_require__("SH7X");
+var _chart = __webpack_require__("U6AS");
 
-var _ExpiredConsentModal = _interopRequireDefault(__webpack_require__("m9+5"));
+var _global = __webpack_require__("c4IZ");
 
-var _CustomPopupModal = _interopRequireDefault(__webpack_require__("YLfl"));
+var _utils = __webpack_require__("c+yx");
+
+var _releaseNotesModal = _interopRequireDefault(__webpack_require__("9J6O"));
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
@@ -1613,8 +1613,7 @@ var ConsumptionView = function ConsumptionView(_ref) {
   }), isFluidKonnected ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, loading && /*#__PURE__*/_react.default.createElement("div", {
     className: 'consumptionview-loading',
     "aria-busy": "true"
-  }, /*#__PURE__*/_react.default.createElement(_StyledSpinner.default, {
-    size: "5em",
+  }, /*#__PURE__*/_react.default.createElement(_Loader.default, {
     fluidType: fluidType
   })), /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)('consumptionview-content', (0, _defineProperty2.default)({}, '--hidden', loading))
@@ -3153,31 +3152,31 @@ var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__("yXPU"));
 
 var _slicedToArray2 = _interopRequireDefault(__webpack_require__("J4zp"));
 
-var _react = _interopRequireWildcard(__webpack_require__("q1tI"));
+var _BarChart = _interopRequireDefault(__webpack_require__("CPpy"));
 
-__webpack_require__("C5+q");
+var _ConsumptionVisualizer = _interopRequireDefault(__webpack_require__("V6Y7"));
+
+var _Loader = _interopRequireDefault(__webpack_require__("Ra/y"));
 
 var _cozyClient = __webpack_require__("SH7X");
 
-var _reactRedux = __webpack_require__("/MKj");
+var _fluid = __webpack_require__("5Wkc");
 
-var _chart = __webpack_require__("U6AS");
+var _timeStep = __webpack_require__("cKQ8");
 
 var _luxon = __webpack_require__("ExVU");
 
-var _fluid = __webpack_require__("5Wkc");
+var _react = _interopRequireWildcard(__webpack_require__("q1tI"));
+
+var _reactRedux = __webpack_require__("/MKj");
 
 var _consumption = _interopRequireDefault(__webpack_require__("AVq/"));
 
 var _dateChart = _interopRequireDefault(__webpack_require__("Ty7+"));
 
-var _BarChart = _interopRequireDefault(__webpack_require__("CPpy"));
-
-var _StyledSpinner = _interopRequireDefault(__webpack_require__("HTwM"));
-
-var _timeStep = __webpack_require__("cKQ8");
+var _chart = __webpack_require__("U6AS");
 
-var _ConsumptionVisualizer = _interopRequireDefault(__webpack_require__("V6Y7"));
+__webpack_require__("C5+q");
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
@@ -3298,11 +3297,11 @@ var FluidChartSlide = function FluidChartSlide(_ref) {
   return /*#__PURE__*/_react.default.createElement("div", {
     className: 'fluidchartslide-root',
     "aria-busy": !isDataLoaded
-  }, !isDataLoaded ? /*#__PURE__*/_react.default.createElement(_StyledSpinner.default, {
-    size: "5em",
-    fluidType: fluidType,
+  }, !isDataLoaded ? /*#__PURE__*/_react.default.createElement("div", {
     className: "data-spinner"
-  }) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_ConsumptionVisualizer.default, {
+  }, /*#__PURE__*/_react.default.createElement(_Loader.default, {
+    fluidType: fluidType
+  })) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_ConsumptionVisualizer.default, {
     fluidType: fluidType,
     showCompare: currentTimeStep === _timeStep.TimeStep.YEAR ? false : showCompare,
     setActive: setActive
@@ -3341,31 +3340,31 @@ var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__("yXPU"));
 
 var _slicedToArray2 = _interopRequireDefault(__webpack_require__("J4zp"));
 
-var _react = _interopRequireWildcard(__webpack_require__("q1tI"));
+var _Button = _interopRequireDefault(__webpack_require__("FtsS"));
 
-var _I18n = __webpack_require__("buk/");
+var _StyledIcon = _interopRequireDefault(__webpack_require__("I07j"));
 
-var _cozyClient = __webpack_require__("SH7X");
+var _Loader = _interopRequireDefault(__webpack_require__("Ra/y"));
 
-__webpack_require__("lWzs");
+var _cozyClient = __webpack_require__("SH7X");
 
 var _OAuthWindow = __webpack_require__("TZPm");
 
-var _Button = _interopRequireDefault(__webpack_require__("FtsS"));
-
-var _StyledIcon = _interopRequireDefault(__webpack_require__("I07j"));
+var _I18n = __webpack_require__("buk/");
 
-var _StyledBlackSpinner = _interopRequireDefault(__webpack_require__("97VO"));
+var _usageEvent = __webpack_require__("/fHX");
 
-var _picto = __webpack_require__("6DBe");
+var _react = _interopRequireWildcard(__webpack_require__("q1tI"));
 
 var _reactRedux = __webpack_require__("/MKj");
 
+var _usageEvent2 = _interopRequireDefault(__webpack_require__("dECN"));
+
 var _global = __webpack_require__("c4IZ");
 
-var _usageEvent = __webpack_require__("/fHX");
+var _picto = __webpack_require__("6DBe");
 
-var _usageEvent2 = _interopRequireDefault(__webpack_require__("dECN"));
+__webpack_require__("lWzs");
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
@@ -3460,8 +3459,8 @@ var FormOAuth = function FormOAuth(_ref) {
     className: "authform-button-content"
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "authform-button-content-icon"
-  }, isWaiting ? /*#__PURE__*/_react.default.createElement(_StyledBlackSpinner.default, {
-    size: 48
+  }, isWaiting ? /*#__PURE__*/_react.default.createElement(_Loader.default, {
+    color: "black"
   }) : /*#__PURE__*/_react.default.createElement(_StyledIcon.default, {
     icon: icon,
     size: 80
@@ -5487,7 +5486,7 @@ var result = _node_modules_svg_sprite_loader_runtime_browser_sprite_build_js__WE
 
 exports = module.exports = __webpack_require__("JPst")(false);
 // Module
-exports.push([module.i, ".fluidchartslide-root {\n  min-height: 22rem;\n  overflow-x: hidden;\n  display: flex;\n  flex-direction: column;\n  justify-content: center;\n  align-items: center;\n}\n@media only screen and (max-width : 768px) {\n  .fluidchartslide-root {\n    min-height: 14rem;\n  }\n}\n.fluidchartslide-root .data-spinner {\n  margin-top: 4rem;\n}", ""]);
+exports.push([module.i, ".fluidchartslide-root {\n  min-height: 22rem;\n  overflow-x: hidden;\n  display: flex;\n  flex-direction: column;\n  justify-content: center;\n  align-items: center;\n}\n@media only screen and (max-width : 768px) {\n  .fluidchartslide-root {\n    min-height: 14rem;\n  }\n}\n.fluidchartslide-root .data-spinner {\n  margin-top: 5rem;\n}", ""]);
 
 
 
@@ -5512,24 +5511,18 @@ var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__("yXPU"));
 
 var _slicedToArray2 = _interopRequireDefault(__webpack_require__("J4zp"));
 
-var _useExploration3 = _interopRequireDefault(__webpack_require__("sU2c"));
-
-var _cozyClient = __webpack_require__("SH7X");
-
-var _I18n = __webpack_require__("buk/");
-
-var _react = _interopRequireWildcard(__webpack_require__("q1tI"));
-
-var _reactRedux = __webpack_require__("/MKj");
-
-__webpack_require__("3RoJ");
-
 var _StyledSwitch = _interopRequireDefault(__webpack_require__("Y5EC"));
 
 var _HalfHourNoData = _interopRequireDefault(__webpack_require__("Go7l"));
 
+var _useExploration3 = _interopRequireDefault(__webpack_require__("sU2c"));
+
 var _TimeStepSelector = _interopRequireDefault(__webpack_require__("vgHs"));
 
+var _cozyClient = __webpack_require__("SH7X");
+
+var _I18n = __webpack_require__("buk/");
+
 var _fluid = __webpack_require__("5Wkc");
 
 var _timeStep = __webpack_require__("cKQ8");
@@ -5538,10 +5531,16 @@ var _usageEvent = __webpack_require__("/fHX");
 
 var _userExploration = __webpack_require__("/rev");
 
+var _react = _interopRequireWildcard(__webpack_require__("q1tI"));
+
+var _reactRedux = __webpack_require__("/MKj");
+
 var _consumption = _interopRequireDefault(__webpack_require__("AVq/"));
 
 var _usageEvent2 = _interopRequireDefault(__webpack_require__("dECN"));
 
+__webpack_require__("3RoJ");
+
 var _FluidChartSwipe = _interopRequireDefault(__webpack_require__("cbBy"));
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -6922,9 +6921,7 @@ var _warningWhite = _interopRequireDefault(__webpack_require__("k7GL"));
 
 var _StyledIcon = _interopRequireDefault(__webpack_require__("I07j"));
 
-var _StyledBlackSpinner = _interopRequireDefault(__webpack_require__("97VO"));
-
-var _StyledSpinner = _interopRequireDefault(__webpack_require__("HTwM"));
+var _Loader = _interopRequireDefault(__webpack_require__("Ra/y"));
 
 var _cozyClient = __webpack_require__("SH7X");
 
@@ -7287,8 +7284,7 @@ var ConnectionResult = function ConnectionResult(_ref) {
       root: 'btn-secondary-positive',
       label: 'text-16-normal'
     }
-  }, deleting && /*#__PURE__*/_react.default.createElement(_StyledSpinner.default, {
-    size: "1rem",
+  }, deleting && /*#__PURE__*/_react.default.createElement(_Loader.default, {
     fluidType: fluidType
   }), !deleting && t('konnector_form.button_delete')), /*#__PURE__*/_react.default.createElement(_Button.default, {
     "aria-label": t('konnector_form.accessibility.button_update'),
@@ -7300,8 +7296,8 @@ var ConnectionResult = function ConnectionResult(_ref) {
       root: 'btn-highlight',
       label: 'text-16-bold'
     }
-  }, updating && /*#__PURE__*/_react.default.createElement(_StyledBlackSpinner.default, {
-    size: "1rem"
+  }, updating && /*#__PURE__*/_react.default.createElement(_Loader.default, {
+    color: "black"
   }), !updating && /*#__PURE__*/_react.default.createElement("div", null, konnectorError === 'error_update_oauth' ? t('konnector_form.button_oauth_reload') : t('konnector_form.button_update')))), fluidType === _fluid.FluidType.GAS && /*#__PURE__*/_react.default.createElement(_DeleteGRDFAccountModal.default, {
     open: openGRDFDeletionModal,
     handleCloseClick: toggleGRDFDeletionModal,
diff --git a/4/ecolyo.15aef20539a1c37a144a.js b/4/ecolyo.3dce9fe3dee4e77244fa.js
similarity index 96%
rename from 4/ecolyo.15aef20539a1c37a144a.js
rename to 4/ecolyo.3dce9fe3dee4e77244fa.js
index a875067dd2350fd4b0ee4197f01748fe7c2ac7cb..ba59f071e8d32fb8c5b2864bbf87d5ceb33b1a23 100644
--- a/4/ecolyo.15aef20539a1c37a144a.js
+++ b/4/ecolyo.3dce9fe3dee4e77244fa.js
@@ -23,9 +23,11 @@ var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__("yXPU"));
 
 var _slicedToArray2 = _interopRequireDefault(__webpack_require__("J4zp"));
 
-var _react = _interopRequireWildcard(__webpack_require__("q1tI"));
+var _core = __webpack_require__("TTf+");
 
-var _cozyClient = __webpack_require__("SH7X");
+var _classnames = _interopRequireDefault(__webpack_require__("TSYQ"));
+
+var _Content = _interopRequireDefault(__webpack_require__("VOVi"));
 
 var _EcogestureList = _interopRequireDefault(__webpack_require__("bOyV"));
 
@@ -33,37 +35,33 @@ var _CozyBar = _interopRequireDefault(__webpack_require__("CJMG"));
 
 var _Header = _interopRequireDefault(__webpack_require__("frrP"));
 
-var _Content = _interopRequireDefault(__webpack_require__("VOVi"));
+var _Loader = _interopRequireDefault(__webpack_require__("Ra/y"));
 
-var _core = __webpack_require__("TTf+");
+var _cozyClient = __webpack_require__("SH7X");
 
-__webpack_require__("bSsG");
+var _I18n = __webpack_require__("buk/");
 
-var _classnames = _interopRequireDefault(__webpack_require__("TSYQ"));
+var _ecogesture = __webpack_require__("SpsK");
 
-var _I18n = __webpack_require__("buk/");
+var _react = _interopRequireWildcard(__webpack_require__("q1tI"));
 
 var _reactRedux = __webpack_require__("/MKj");
 
-var _ecogesture = _interopRequireDefault(__webpack_require__("w4u3"));
+var _reactRouterDom = __webpack_require__("55Ip");
 
-var _utils = __webpack_require__("c+yx");
+var _ecogesture2 = _interopRequireDefault(__webpack_require__("w4u3"));
 
-var _StyledSpinner = _interopRequireDefault(__webpack_require__("HTwM"));
+var _profile = __webpack_require__("jPH6");
 
-var _fluid = __webpack_require__("5Wkc");
+var _utils = __webpack_require__("c+yx");
 
 var _EcogestureEmptyList = _interopRequireDefault(__webpack_require__("vfcT"));
 
-var _ecogesture2 = __webpack_require__("SpsK");
-
 var _EcogestureInitModal = _interopRequireDefault(__webpack_require__("i9Rj"));
 
 var _EcogestureReinitModal = _interopRequireDefault(__webpack_require__("3XtY"));
 
-var _profile = __webpack_require__("jPH6");
-
-var _reactRouterDom = __webpack_require__("55Ip");
+__webpack_require__("bSsG");
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
@@ -110,7 +108,7 @@ var EcogestureView = function EcogestureView() {
       haveSeenEcogestureModal = _useSelector.haveSeenEcogestureModal,
       isProfileEcogestureCompleted = _useSelector.isProfileEcogestureCompleted;
 
-  var _useState3 = (0, _react.useState)(tab ? parseInt(tab) : _ecogesture2.EcogestureStatus.OBJECTIVE),
+  var _useState3 = (0, _react.useState)(tab ? parseInt(tab) : _ecogesture.EcogestureStatus.OBJECTIVE),
       _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
       tabValue = _useState4[0],
       setTabValue = _useState4[1];
@@ -203,7 +201,7 @@ var EcogestureView = function EcogestureView() {
           case 0:
             setOpenEcogestureReinitModal(false);
             setIsLoaded(false);
-            ecogestureService = new _ecogesture.default(client);
+            ecogestureService = new _ecogesture2.default(client);
             _context3.next = 5;
             return ecogestureService.reinitAllEcogestures();
 
@@ -242,7 +240,7 @@ var EcogestureView = function EcogestureView() {
     };
   }, []);
   var getLabel = (0, _react.useCallback)(function (_tab) {
-    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, t("ecogesture.title_tab_".concat(_tab)), /*#__PURE__*/_react.default.createElement("br", null), _tab === _ecogesture2.EcogestureStatus.OBJECTIVE && "(".concat(objectiveEcogestureList.length, ")"), _tab === _ecogesture2.EcogestureStatus.DOING && "(".concat(doingEcogestureList.length, ")"), _tab === _ecogesture2.EcogestureStatus.ALL && "(".concat(allEcogestureList.length, ")"));
+    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, t("ecogesture.title_tab_".concat(_tab)), /*#__PURE__*/_react.default.createElement("br", null), _tab === _ecogesture.EcogestureStatus.OBJECTIVE && "(".concat(objectiveEcogestureList.length, ")"), _tab === _ecogesture.EcogestureStatus.DOING && "(".concat(doingEcogestureList.length, ")"), _tab === _ecogesture.EcogestureStatus.ALL && "(".concat(allEcogestureList.length, ")"));
   }, [allEcogestureList.length, doingEcogestureList.length, objectiveEcogestureList.length, t]);
   (0, _react.useEffect)(function () {
     var subscribed = true;
@@ -258,7 +256,7 @@ var EcogestureView = function EcogestureView() {
           while (1) {
             switch (_context4.prev = _context4.next) {
               case 0:
-                ecogestureService = new _ecogesture.default(client);
+                ecogestureService = new _ecogesture2.default(client);
                 _context4.next = 3;
                 return ecogestureService.getAllEcogestures((0, _utils.getSeason)());
 
@@ -311,10 +309,7 @@ var EcogestureView = function EcogestureView() {
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "ecogesture-spinner",
     "aria-busy": "true"
-  }, /*#__PURE__*/_react.default.createElement(_StyledSpinner.default, {
-    size: "5em",
-    fluidType: _fluid.FluidType.MULTIFLUID
-  }))), isLoaded && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_Header.default, {
+  }, /*#__PURE__*/_react.default.createElement(_Loader.default, null))), isLoaded && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_Header.default, {
     setHeaderHeight: defineHeaderHeight,
     desktopTitleKey: 'common.title_ecogestures'
   }, /*#__PURE__*/_react.default.createElement(_core.Tabs, {
@@ -327,19 +322,19 @@ var EcogestureView = function EcogestureView() {
     },
     centered: true
   }, /*#__PURE__*/_react.default.createElement(_core.Tab, (0, _extends2.default)({
-    label: getLabel(_ecogesture2.EcogestureStatus.OBJECTIVE),
-    className: (0, _classnames.default)('single-tab', (0, _defineProperty2.default)({}, 'active', tabValue === _ecogesture2.EcogestureStatus.OBJECTIVE))
-  }, tabProps(_ecogesture2.EcogestureStatus.OBJECTIVE))), /*#__PURE__*/_react.default.createElement(_core.Tab, (0, _extends2.default)({
-    label: getLabel(_ecogesture2.EcogestureStatus.DOING),
-    className: (0, _classnames.default)('single-tab', (0, _defineProperty2.default)({}, 'active', tabValue === _ecogesture2.EcogestureStatus.DOING))
-  }, tabProps(_ecogesture2.EcogestureStatus.DOING))), /*#__PURE__*/_react.default.createElement(_core.Tab, (0, _extends2.default)({
-    label: getLabel(_ecogesture2.EcogestureStatus.ALL),
-    className: (0, _classnames.default)('single-tab', (0, _defineProperty2.default)({}, 'active', tabValue === _ecogesture2.EcogestureStatus.ALL))
-  }, tabProps(_ecogesture2.EcogestureStatus.ALL))))), /*#__PURE__*/_react.default.createElement(_Content.default, {
+    label: getLabel(_ecogesture.EcogestureStatus.OBJECTIVE),
+    className: (0, _classnames.default)('single-tab', (0, _defineProperty2.default)({}, 'active', tabValue === _ecogesture.EcogestureStatus.OBJECTIVE))
+  }, tabProps(_ecogesture.EcogestureStatus.OBJECTIVE))), /*#__PURE__*/_react.default.createElement(_core.Tab, (0, _extends2.default)({
+    label: getLabel(_ecogesture.EcogestureStatus.DOING),
+    className: (0, _classnames.default)('single-tab', (0, _defineProperty2.default)({}, 'active', tabValue === _ecogesture.EcogestureStatus.DOING))
+  }, tabProps(_ecogesture.EcogestureStatus.DOING))), /*#__PURE__*/_react.default.createElement(_core.Tab, (0, _extends2.default)({
+    label: getLabel(_ecogesture.EcogestureStatus.ALL),
+    className: (0, _classnames.default)('single-tab', (0, _defineProperty2.default)({}, 'active', tabValue === _ecogesture.EcogestureStatus.ALL))
+  }, tabProps(_ecogesture.EcogestureStatus.ALL))))), /*#__PURE__*/_react.default.createElement(_Content.default, {
     height: headerHeight
   }, /*#__PURE__*/_react.default.createElement(TabPanel, {
     value: tabValue,
-    index: _ecogesture2.EcogestureStatus.OBJECTIVE
+    index: _ecogesture.EcogestureStatus.OBJECTIVE
   }, isProfileEcogestureCompleted && (totalAvailable === totalViewed && objectiveEcogestureList.length === 0 ? /*#__PURE__*/_react.default.createElement(_EcogestureEmptyList.default, {
     setTab: setTabValue,
     isObjective: true,
@@ -350,7 +345,7 @@ var EcogestureView = function EcogestureView() {
     displaySelection: totalAvailable !== totalViewed,
     selectionTotal: totalAvailable,
     selectionViewed: totalViewed,
-    index: _ecogesture2.EcogestureStatus.OBJECTIVE,
+    index: _ecogesture.EcogestureStatus.OBJECTIVE,
     handleReinitClick: handleReinitClick
   })), !isProfileEcogestureCompleted && /*#__PURE__*/_react.default.createElement(_EcogestureEmptyList.default, {
     setTab: setTabValue,
@@ -359,7 +354,7 @@ var EcogestureView = function EcogestureView() {
     handleReinitClick: handleReinitClick
   })), /*#__PURE__*/_react.default.createElement(TabPanel, {
     value: tabValue,
-    index: _ecogesture2.EcogestureStatus.DOING
+    index: _ecogesture.EcogestureStatus.DOING
   }, isProfileEcogestureCompleted && (totalAvailable === totalViewed && doingEcogestureList.length === 0 ? /*#__PURE__*/_react.default.createElement(_EcogestureEmptyList.default, {
     setTab: setTabValue,
     isObjective: false,
@@ -370,7 +365,7 @@ var EcogestureView = function EcogestureView() {
     displaySelection: totalAvailable !== totalViewed,
     selectionTotal: totalAvailable,
     selectionViewed: totalViewed,
-    index: _ecogesture2.EcogestureStatus.DOING,
+    index: _ecogesture.EcogestureStatus.DOING,
     handleReinitClick: handleReinitClick
   })), !isProfileEcogestureCompleted && /*#__PURE__*/_react.default.createElement(_EcogestureEmptyList.default, {
     setTab: setTabValue,
@@ -379,13 +374,13 @@ var EcogestureView = function EcogestureView() {
     handleReinitClick: handleReinitClick
   })), /*#__PURE__*/_react.default.createElement(TabPanel, {
     value: tabValue,
-    index: _ecogesture2.EcogestureStatus.ALL
+    index: _ecogesture.EcogestureStatus.ALL
   }, allEcogestureList.length && /*#__PURE__*/_react.default.createElement(_EcogestureList.default, {
     list: allEcogestureList,
     displaySelection: false,
     selectionTotal: totalAvailable,
     selectionViewed: totalViewed,
-    index: _ecogesture2.EcogestureStatus.ALL,
+    index: _ecogesture.EcogestureStatus.ALL,
     handleReinitClick: handleReinitClick
   })))), openEcogestureInitModal && /*#__PURE__*/_react.default.createElement(_EcogestureInitModal.default, {
     open: openEcogestureInitModal,
diff --git a/5/ecolyo.5ee21695f66d2a4a5e7d.js b/5/ecolyo.43cb1dd3cc08d92da963.js
similarity index 100%
rename from 5/ecolyo.5ee21695f66d2a4a5e7d.js
rename to 5/ecolyo.43cb1dd3cc08d92da963.js
index 4beacc5a0f0ff9beef75f3589e5a61e032db239d..69c006a6aad9e4edc4fd132bef128904e781eaac 100644
--- a/5/ecolyo.5ee21695f66d2a4a5e7d.js
+++ b/5/ecolyo.43cb1dd3cc08d92da963.js
@@ -74,39 +74,39 @@ exports.default = void 0;
 
 var _defineProperty2 = _interopRequireDefault(__webpack_require__("lSNA"));
 
-var _react = _interopRequireDefault(__webpack_require__("q1tI"));
+var _IconButton = _interopRequireDefault(__webpack_require__("o6Jd"));
 
-__webpack_require__("pBt2");
+var _leftArrow = _interopRequireDefault(__webpack_require__("bZGv"));
 
-var _I18n = __webpack_require__("buk/");
+var _rightArrow = _interopRequireDefault(__webpack_require__("fZGW"));
 
-var _reactRedux = __webpack_require__("/MKj");
+var _classnames = _interopRequireDefault(__webpack_require__("TSYQ"));
 
-var _chart = __webpack_require__("U6AS");
+var _DateNavigatorFormat = _interopRequireDefault(__webpack_require__("ZpZG"));
 
-var _luxon = __webpack_require__("ExVU");
+var _I18n = __webpack_require__("buk/");
 
-var _classnames = _interopRequireDefault(__webpack_require__("TSYQ"));
+var _Icon = _interopRequireDefault(__webpack_require__("y6ex"));
 
-var _dateChart = _interopRequireDefault(__webpack_require__("Ty7+"));
+var _fluid = __webpack_require__("5Wkc");
 
-var _date = __webpack_require__("XrP9");
+var _timeStep = __webpack_require__("cKQ8");
 
-var _DateNavigatorFormat = _interopRequireDefault(__webpack_require__("ZpZG"));
+var _luxon = __webpack_require__("ExVU");
 
-var _leftArrow = _interopRequireDefault(__webpack_require__("bZGv"));
+var _react = _interopRequireDefault(__webpack_require__("q1tI"));
 
-var _rightArrow = _interopRequireDefault(__webpack_require__("fZGW"));
+var _reactRedux = __webpack_require__("/MKj");
 
-var _IconButton = _interopRequireDefault(__webpack_require__("o6Jd"));
+var _dateChart = _interopRequireDefault(__webpack_require__("Ty7+"));
 
-var _Icon = _interopRequireDefault(__webpack_require__("y6ex"));
+var _chart = __webpack_require__("U6AS");
 
-var _timeStep = __webpack_require__("cKQ8");
+var _date = __webpack_require__("XrP9");
 
 var _utils = __webpack_require__("c+yx");
 
-var _fluid = __webpack_require__("5Wkc");
+__webpack_require__("pBt2");
 
 var DateNavigator = function DateNavigator(_ref) {
   var currentAnalysisDate = _ref.currentAnalysisDate,
diff --git a/9/ecolyo.7233ec1e677aa8a1e6f7.js b/9/ecolyo.5abe5f137bb2c2949192.js
similarity index 99%
rename from 9/ecolyo.7233ec1e677aa8a1e6f7.js
rename to 9/ecolyo.5abe5f137bb2c2949192.js
index b5179c43e6798835448a7fab7634881930dd80ce..d17eb16b173c62c32c33b46f8488914d52409042 100644
--- a/9/ecolyo.7233ec1e677aa8a1e6f7.js
+++ b/9/ecolyo.5abe5f137bb2c2949192.js
@@ -21,55 +21,53 @@ var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__("yXPU"));
 
 var _slicedToArray2 = _interopRequireDefault(__webpack_require__("J4zp"));
 
-var _react = _interopRequireWildcard(__webpack_require__("q1tI"));
-
-__webpack_require__("KO7X");
-
-var _classnames = _interopRequireDefault(__webpack_require__("TSYQ"));
+var _IconButton = _interopRequireDefault(__webpack_require__("o6Jd"));
 
-var _I18n = __webpack_require__("buk/");
+var _doingDisabled = _interopRequireDefault(__webpack_require__("O5T3"));
 
-var _reactRedux = __webpack_require__("/MKj");
+var _doingEnabled = _interopRequireDefault(__webpack_require__("eirt"));
 
-var _useExploration3 = _interopRequireDefault(__webpack_require__("sU2c"));
+var _objectiveDisabled = _interopRequireDefault(__webpack_require__("a3OY"));
 
-var _utils = __webpack_require__("c+yx");
+var _objectiveEnabled = _interopRequireDefault(__webpack_require__("XtK8"));
 
-var _ecogesture = _interopRequireDefault(__webpack_require__("w4u3"));
+var _default2 = _interopRequireDefault(__webpack_require__("v9Ot"));
 
-var _IconButton = _interopRequireDefault(__webpack_require__("o6Jd"));
+var _classnames = _interopRequireDefault(__webpack_require__("TSYQ"));
 
-var _Icon = _interopRequireDefault(__webpack_require__("y6ex"));
+var _ErrorPage = _interopRequireDefault(__webpack_require__("u/N1"));
 
 var _StyledIcon = _interopRequireDefault(__webpack_require__("I07j"));
 
-var _EfficientyRating = _interopRequireDefault(__webpack_require__("v88h"));
+var _Content = _interopRequireDefault(__webpack_require__("VOVi"));
 
-var _default2 = _interopRequireDefault(__webpack_require__("v9Ot"));
+var _CozyBar = _interopRequireDefault(__webpack_require__("CJMG"));
 
-var _doingEnabled = _interopRequireDefault(__webpack_require__("eirt"));
+var _Header = _interopRequireDefault(__webpack_require__("frrP"));
 
-var _doingDisabled = _interopRequireDefault(__webpack_require__("O5T3"));
+var _useExploration3 = _interopRequireDefault(__webpack_require__("sU2c"));
 
-var _objectiveEnabled = _interopRequireDefault(__webpack_require__("XtK8"));
+var _Loader = _interopRequireDefault(__webpack_require__("Ra/y"));
 
-var _objectiveDisabled = _interopRequireDefault(__webpack_require__("a3OY"));
+var _cozyClient = __webpack_require__("SH7X");
 
-var _Content = _interopRequireDefault(__webpack_require__("VOVi"));
+var _I18n = __webpack_require__("buk/");
 
-var _CozyBar = _interopRequireDefault(__webpack_require__("CJMG"));
+var _Icon = _interopRequireDefault(__webpack_require__("y6ex"));
 
-var _Header = _interopRequireDefault(__webpack_require__("frrP"));
+var _react = _interopRequireWildcard(__webpack_require__("q1tI"));
 
-var _cozyClient = __webpack_require__("SH7X");
+var _reactRedux = __webpack_require__("/MKj");
 
-var _ErrorPage = _interopRequireDefault(__webpack_require__("u/N1"));
+var _reactRouterDom = __webpack_require__("55Ip");
 
-var _StyledSpinner = _interopRequireDefault(__webpack_require__("HTwM"));
+var _ecogesture = _interopRequireDefault(__webpack_require__("w4u3"));
 
-var _fluid = __webpack_require__("5Wkc");
+var _utils = __webpack_require__("c+yx");
 
-var _reactRouterDom = __webpack_require__("55Ip");
+var _EfficientyRating = _interopRequireDefault(__webpack_require__("v88h"));
+
+__webpack_require__("KO7X");
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
@@ -295,10 +293,7 @@ var SingleEcogesture = function SingleEcogesture(_ref) {
       height: headerHeight
     }, /*#__PURE__*/_react.default.createElement("div", {
       className: "se-loader-container"
-    }, /*#__PURE__*/_react.default.createElement(_StyledSpinner.default, {
-      size: "5em",
-      fluidType: _fluid.FluidType.MULTIFLUID
-    })));
+    }, /*#__PURE__*/_react.default.createElement(_Loader.default, null)));
   }
 
   return ecogesture ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_CozyBar.default, {
diff --git a/app/ecolyo.65f221e2f2a7bd411b8f.js b/app/ecolyo.fab1f8b00d10658a3013.js
similarity index 99%
rename from app/ecolyo.65f221e2f2a7bd411b8f.js
rename to app/ecolyo.fab1f8b00d10658a3013.js
index 2e3734e936a103ba7647a0329954e9660d73b0d1..f8a8d029ec7b1027c9ea30ff65706cc868b111b1 100644
--- a/app/ecolyo.65f221e2f2a7bd411b8f.js
+++ b/app/ecolyo.fab1f8b00d10658a3013.js
@@ -64,7 +64,7 @@
 /******/
 /******/ 	// script path function
 /******/ 	function jsonpScriptSrc(chunkId) {
-/******/ 		return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"2":"e6b96a1c5e512c5f9fcd","3":"fa772de24389b6ace985","4":"15aef20539a1c37a144a","5":"5ee21695f66d2a4a5e7d","6":"6cfb73bb1a865d05ec39","7":"8e0088481e1baf094fa4","8":"f2b0273a73d7cafbc0a4","9":"7233ec1e677aa8a1e6f7","10":"1823bf23fa5cf052fd8e"}[chunkId] + ".js"
+/******/ 		return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"2":"379591bab7d5d3855037","3":"b6371a2c1946524aaa38","4":"3dce9fe3dee4e77244fa","5":"43cb1dd3cc08d92da963","6":"6cfb73bb1a865d05ec39","7":"8e0088481e1baf094fa4","8":"f2b0273a73d7cafbc0a4","9":"5abe5f137bb2c2949192","10":"1823bf23fa5cf052fd8e"}[chunkId] + ".js"
 /******/ 	}
 /******/
 /******/ 	// The require function
@@ -387,37 +387,37 @@ var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__("yXPU"));
 
 var _slicedToArray2 = _interopRequireDefault(__webpack_require__("J4zp"));
 
-var _react = _interopRequireWildcard(__webpack_require__("q1tI"));
-
-__webpack_require__("mFBf");
+var _Button = _interopRequireDefault(__webpack_require__("FtsS"));
 
 var _close = _interopRequireDefault(__webpack_require__("aodS"));
 
 var _StyledIconButton = _interopRequireDefault(__webpack_require__("jZ8W"));
 
-var _Button = _interopRequireDefault(__webpack_require__("FtsS"));
+var _Loader = _interopRequireDefault(__webpack_require__("Ra/y"));
 
 var _QuizExplanationModal = _interopRequireDefault(__webpack_require__("zxtu"));
 
-var _I18n = __webpack_require__("buk/");
-
-var _challenge = _interopRequireDefault(__webpack_require__("kdea"));
+var _cozyClient = __webpack_require__("SH7X");
 
-var _quiz = _interopRequireDefault(__webpack_require__("CUhI"));
+var _I18n = __webpack_require__("buk/");
 
-var _cozyClient = __webpack_require__("SH7X");
+var _usageEvent = __webpack_require__("/fHX");
 
 var _userChallenge = __webpack_require__("dQx6");
 
-var _challenge2 = __webpack_require__("ojwR");
+var _react = _interopRequireWildcard(__webpack_require__("q1tI"));
 
 var _reactRedux = __webpack_require__("/MKj");
 
-var _StyledEcogestureSpinner = _interopRequireDefault(__webpack_require__("fEC/"));
+var _challenge = _interopRequireDefault(__webpack_require__("kdea"));
 
-var _usageEvent = _interopRequireDefault(__webpack_require__("dECN"));
+var _quiz = _interopRequireDefault(__webpack_require__("CUhI"));
 
-var _usageEvent2 = __webpack_require__("/fHX");
+var _usageEvent2 = _interopRequireDefault(__webpack_require__("dECN"));
+
+var _challenge2 = __webpack_require__("ojwR");
+
+__webpack_require__("mFBf");
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
@@ -515,8 +515,8 @@ var QuizCustomQuestionContent = function QuizCustomQuestionContent(_ref) {
             case 3:
               userChallengeUpdated = _context2.sent;
               _context2.next = 6;
-              return _usageEvent.default.addEvent(client, {
-                type: _usageEvent2.UsageEventType.QUIZ_END_EVENT,
+              return _usageEvent2.default.addEvent(client, {
+                type: _usageEvent.UsageEventType.QUIZ_END_EVENT,
                 startDate: userChallenge.quiz.startDate,
                 target: userChallenge.quiz.id,
                 result: userChallenge.quiz.result.toString(),
@@ -554,7 +554,7 @@ var QuizCustomQuestionContent = function QuizCustomQuestionContent(_ref) {
   }, t('quiz.consumption_question')), isLoading ? /*#__PURE__*/_react.default.createElement("div", {
     className: 'question-loading',
     "aria-busy": "true"
-  }, /*#__PURE__*/_react.default.createElement(_StyledEcogestureSpinner.default, null)) : question && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("p", {
+  }, /*#__PURE__*/_react.default.createElement(_Loader.default, null)) : question && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("p", {
     className: "question text-18-bold"
   }, question.questionLabel), question.answers.map(function (answer, index) {
     return /*#__PURE__*/_react.default.createElement("div", {
@@ -3826,6 +3826,32 @@ var result = _node_modules_svg_sprite_loader_runtime_browser_sprite_build_js__WE
 
 /***/ }),
 
+/***/ "4YEw":
+/***/ (function(module, exports, __webpack_require__) {
+
+
+var content = __webpack_require__("5Hid");
+
+if(typeof content === 'string') content = [[module.i, content, '']];
+
+var transform;
+var insertInto;
+
+
+
+var options = {"hmr":true}
+
+options.transform = transform
+options.insertInto = undefined;
+
+var update = __webpack_require__("aET+")(content, options);
+
+if(content.locals) module.exports = content.locals;
+
+if(false) {}
+
+/***/ }),
+
 /***/ "4iQs":
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -4288,6 +4314,17 @@ exports.push([module.i, "/** BLACK **/\n/** RED **/\n/** YELLOW **/\n/** ORANGE
 
 
 
+/***/ }),
+
+/***/ "5Hid":
+/***/ (function(module, exports, __webpack_require__) {
+
+exports = module.exports = __webpack_require__("JPst")(false);
+// Module
+exports.push([module.i, "/** BLACK **/\n/** RED **/\n/** YELLOW **/\n/** ORANGE **/\n/** BLUE **/\n/** GREEN **/\n/** WHITE **/\n/** GREY **/\n/** App colors **/\n/** TABS GRADIENT **/\n/** SCROLLBAR **/\n.loader {\n  height: 50px;\n  margin: auto;\n  display: flex;\n  align-items: flex-end;\n  gap: 8px;\n}\n.loader.gold {\n  color: #b2901b;\n}\n.loader.gaz {\n  color: #45d1b8;\n}\n.loader.elec {\n  color: #d87b39;\n}\n.loader.water {\n  color: #3a98ec;\n}\n.loader.black {\n  color: #242633;\n}\n.loader .bar {\n  width: 10px;\n  border-radius: 5px;\n  background: currentColor;\n  animation: load 0.4s -0.4s linear infinite alternate;\n}\n.loader .bar:nth-child(1) {\n  animation-delay: -0.1s;\n}\n.loader .bar:nth-child(3) {\n  animation-delay: -0.55s;\n}\n@keyframes load {\n  0% {\n    height: 20%;\n  }\n  100% {\n    height: 100%;\n  }\n}", ""]);
+
+
+
 /***/ }),
 
 /***/ "5J5f":
@@ -8110,43 +8147,6 @@ exports.default = PerformanceIndicatorService;
 
 /***/ }),
 
-/***/ "97VO":
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var _interopRequireDefault = __webpack_require__("TqRt");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-var _extends2 = _interopRequireDefault(__webpack_require__("pVnL"));
-
-var _react = _interopRequireDefault(__webpack_require__("q1tI"));
-
-var _styles = __webpack_require__("DfQ9");
-
-var _CircularProgress = _interopRequireDefault(__webpack_require__("tdZp"));
-
-var SpinnerBase = (0, _styles.withStyles)({
-  root: {
-    color: 'var(--black)'
-  }
-})(_CircularProgress.default);
-
-var StyledBlackSpinner = function StyledBlackSpinner(_ref) {
-  var props = (0, _extends2.default)({}, _ref);
-  return /*#__PURE__*/_react.default.createElement(SpinnerBase, props);
-};
-
-var _default = StyledBlackSpinner;
-exports.default = _default;
-
-/***/ }),
-
 /***/ "9Dfj":
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -12844,7 +12844,7 @@ var _classnames = _interopRequireDefault(__webpack_require__("TSYQ"));
 
 var _StyledIcon = _interopRequireDefault(__webpack_require__("I07j"));
 
-var _StyledBlackSpinner = _interopRequireDefault(__webpack_require__("97VO"));
+var _Loader = _interopRequireDefault(__webpack_require__("Ra/y"));
 
 var _cozyClient = __webpack_require__("SH7X");
 
@@ -13190,9 +13190,8 @@ var ChallengeCardOnGoing = function ChallengeCardOnGoing(_ref) {
     onClick: goDuel
   }, isLoading ? /*#__PURE__*/_react.default.createElement("div", {
     className: "spinner-container"
-  }, /*#__PURE__*/_react.default.createElement(_StyledBlackSpinner.default, {
-    className: "duel-spinner",
-    size: 46
+  }, /*#__PURE__*/_react.default.createElement(_Loader.default, {
+    color: "black"
   })) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, t('challenge.card.ongoing.duel'), /*#__PURE__*/_react.default.createElement(_StyledIcon.default, {
     className: "challengeminIcon",
     icon: challengeIcon,
@@ -13418,78 +13417,6 @@ var result = _node_modules_svg_sprite_loader_runtime_browser_sprite_build_js__WE
 
 /***/ }),
 
-/***/ "HTwM":
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var _interopRequireDefault = __webpack_require__("TqRt");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-var _objectWithoutProperties2 = _interopRequireDefault(__webpack_require__("QILm"));
-
-var _react = _interopRequireDefault(__webpack_require__("q1tI"));
-
-var _fluid = __webpack_require__("5Wkc");
-
-var _styles = __webpack_require__("DfQ9");
-
-var _CircularProgress = _interopRequireDefault(__webpack_require__("tdZp"));
-
-var _excluded = ["fluidType"];
-var SpinnerBase = (0, _styles.withStyles)({
-  root: {
-    color: 'var(--multiColor)'
-  }
-})(_CircularProgress.default);
-var SpinnerElec = (0, _styles.withStyles)({
-  root: {
-    color: 'var(--elecColor)'
-  }
-})(_CircularProgress.default);
-var SpinnerWater = (0, _styles.withStyles)({
-  root: {
-    color: 'var(--waterColor)'
-  }
-})(_CircularProgress.default);
-var SpinnerGas = (0, _styles.withStyles)({
-  root: {
-    color: 'var(--gasColor)'
-  }
-})(_CircularProgress.default);
-
-var StyledSpinner = function StyledSpinner(_ref) {
-  var fluidType = _ref.fluidType,
-      props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
-
-  switch (fluidType) {
-    case _fluid.FluidType.ELECTRICITY:
-      return /*#__PURE__*/_react.default.createElement(SpinnerElec, props);
-
-    case _fluid.FluidType.WATER:
-      return /*#__PURE__*/_react.default.createElement(SpinnerWater, props);
-
-    case _fluid.FluidType.GAS:
-      return /*#__PURE__*/_react.default.createElement(SpinnerGas, props);
-
-    case _fluid.FluidType.MULTIFLUID:
-      return /*#__PURE__*/_react.default.createElement(SpinnerBase, props);
-
-    default:
-      return /*#__PURE__*/_react.default.createElement(SpinnerBase, props);
-  }
-};
-
-var _default = StyledSpinner;
-exports.default = _default;
-
-/***/ }),
-
 /***/ "HXM0":
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -14540,37 +14467,35 @@ var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__("yXPU"));
 
 var _slicedToArray2 = _interopRequireDefault(__webpack_require__("J4zp"));
 
-var _react = _interopRequireWildcard(__webpack_require__("q1tI"));
+var _Content = _interopRequireDefault(__webpack_require__("VOVi"));
 
-__webpack_require__("qzRO");
+var _EcogestureSelectionDetail = _interopRequireDefault(__webpack_require__("kckh"));
 
-var _reactRedux = __webpack_require__("/MKj");
+var _EcogestureSelectionEnd = _interopRequireDefault(__webpack_require__("Dqfw"));
 
-var _cozyClient = __webpack_require__("SH7X");
+var _EcogestureSelectionModal = _interopRequireDefault(__webpack_require__("3j34"));
 
-var _I18n = __webpack_require__("buk/");
+var _EcogestureSelectionRestart = _interopRequireDefault(__webpack_require__("keF7"));
 
 var _CozyBar = _interopRequireDefault(__webpack_require__("CJMG"));
 
 var _Header = _interopRequireDefault(__webpack_require__("frrP"));
 
-var _Content = _interopRequireDefault(__webpack_require__("VOVi"));
-
-var _ecogesture = _interopRequireDefault(__webpack_require__("w4u3"));
+var _Loader = _interopRequireDefault(__webpack_require__("Ra/y"));
 
-var _EcogestureSelectionModal = _interopRequireDefault(__webpack_require__("3j34"));
+var _cozyClient = __webpack_require__("SH7X");
 
-var _EcogestureSelectionDetail = _interopRequireDefault(__webpack_require__("kckh"));
+var _I18n = __webpack_require__("buk/");
 
-var _EcogestureSelectionRestart = _interopRequireDefault(__webpack_require__("keF7"));
+var _react = _interopRequireWildcard(__webpack_require__("q1tI"));
 
-var _EcogestureSelectionEnd = _interopRequireDefault(__webpack_require__("Dqfw"));
+var _reactRedux = __webpack_require__("/MKj");
 
-var _StyledSpinner = _interopRequireDefault(__webpack_require__("HTwM"));
+var _reactRouterDom = __webpack_require__("55Ip");
 
-var _fluid = __webpack_require__("5Wkc");
+var _ecogesture = _interopRequireDefault(__webpack_require__("w4u3"));
 
-var _reactRouterDom = __webpack_require__("55Ip");
+__webpack_require__("qzRO");
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
@@ -14758,10 +14683,7 @@ var EcogestureSelection = function EcogestureSelection() {
       height: headerHeight
     }, /*#__PURE__*/_react.default.createElement("div", {
       className: "eg-selection-loader"
-    }, /*#__PURE__*/_react.default.createElement(_StyledSpinner.default, {
-      size: "5em",
-      fluidType: _fluid.FluidType.MULTIFLUID
-    })));
+    }, /*#__PURE__*/_react.default.createElement(_Loader.default, null)));
   }
 
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_CozyBar.default, {
@@ -17412,6 +17334,76 @@ exports.default = QueryRunner;
 
 /***/ }),
 
+/***/ "Ra/y":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var _interopRequireDefault = __webpack_require__("TqRt");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _I18n = __webpack_require__("buk/");
+
+var _fluid = __webpack_require__("5Wkc");
+
+var _react = _interopRequireDefault(__webpack_require__("q1tI"));
+
+__webpack_require__("4YEw");
+
+/**
+ * Loader of Ecolyo, default color is gold
+ * @param color 'gold' | 'gaz' | 'elec' | 'water'
+ */
+var Loader = function Loader(_ref) {
+  var _ref$color = _ref.color,
+      color = _ref$color === void 0 ? 'gold' : _ref$color,
+      fluidType = _ref.fluidType;
+
+  var _useI18n = (0, _I18n.useI18n)(),
+      t = _useI18n.t;
+
+  switch (fluidType) {
+    case _fluid.FluidType.MULTIFLUID:
+      color = 'gold';
+      break;
+
+    case _fluid.FluidType.ELECTRICITY:
+      color = 'elec';
+      break;
+
+    case _fluid.FluidType.GAS:
+      color = 'gaz';
+      break;
+
+    case _fluid.FluidType.WATER:
+      color = 'water';
+      break;
+  }
+
+  return /*#__PURE__*/_react.default.createElement("div", {
+    className: "loader ".concat(color),
+    "aria-busy": "true",
+    "aria-label": t('common.accessibility.loading'),
+    title: t('common.accessibility.loading')
+  }, /*#__PURE__*/_react.default.createElement("div", {
+    className: "bar"
+  }), /*#__PURE__*/_react.default.createElement("div", {
+    className: "bar"
+  }), /*#__PURE__*/_react.default.createElement("div", {
+    className: "bar"
+  }));
+};
+
+var _default = Loader;
+exports.default = _default;
+
+/***/ }),
+
 /***/ "Rdak":
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -23964,36 +23956,34 @@ exports.default = void 0;
 
 var _slicedToArray2 = _interopRequireDefault(__webpack_require__("J4zp"));
 
-var _react = _interopRequireWildcard(__webpack_require__("q1tI"));
+var _Content = _interopRequireDefault(__webpack_require__("VOVi"));
+
+var _EcogestureFormEquipment = _interopRequireDefault(__webpack_require__("06WC"));
+
+var _EcogestureFormSingleChoice = _interopRequireDefault(__webpack_require__("45jH"));
+
+var _EcogestureLaunchFormModal = _interopRequireDefault(__webpack_require__("Sft7"));
 
 var _CozyBar = _interopRequireDefault(__webpack_require__("CJMG"));
 
 var _Header = _interopRequireDefault(__webpack_require__("frrP"));
 
-var _Content = _interopRequireDefault(__webpack_require__("VOVi"));
+var _Loader = _interopRequireDefault(__webpack_require__("Ra/y"));
 
-var _reactRedux = __webpack_require__("/MKj");
+var _ProfileTypeView = _interopRequireDefault(__webpack_require__("nKTC"));
 
 var _ecogestureForm = __webpack_require__("kcOp");
 
-var _EcogestureFormSingleChoice = _interopRequireDefault(__webpack_require__("45jH"));
+var _react = _interopRequireWildcard(__webpack_require__("q1tI"));
 
-var _EcogestureLaunchFormModal = _interopRequireDefault(__webpack_require__("Sft7"));
+var _reactRedux = __webpack_require__("/MKj");
 
-var _EcogestureFormEquipment = _interopRequireDefault(__webpack_require__("06WC"));
+var _reactRouterDom = __webpack_require__("55Ip");
 
 var _profileEcogestureForm = _interopRequireDefault(__webpack_require__("QCFg"));
 
-var _StyledSpinner = _interopRequireDefault(__webpack_require__("HTwM"));
-
-var _fluid = __webpack_require__("5Wkc");
-
 __webpack_require__("iWE3");
 
-var _reactRouterDom = __webpack_require__("55Ip");
-
-var _ProfileTypeView = _interopRequireDefault(__webpack_require__("nKTC"));
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -24090,10 +24080,7 @@ var EcogestureFormView = function EcogestureFormView() {
       height: headerHeight
     }, /*#__PURE__*/_react.default.createElement("div", {
       className: "se-loader-container"
-    }, /*#__PURE__*/_react.default.createElement(_StyledSpinner.default, {
-      size: "5em",
-      fluidType: _fluid.FluidType.MULTIFLUID
-    })));
+    }, /*#__PURE__*/_react.default.createElement(_Loader.default, null)));
   }
 
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_CozyBar.default, {
@@ -25277,43 +25264,6 @@ exports.push([module.i, "/** BLACK **/\n/** RED **/\n/** YELLOW **/\n/** ORANGE
 
 
 
-/***/ }),
-
-/***/ "fEC/":
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var _interopRequireDefault = __webpack_require__("TqRt");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-var _extends2 = _interopRequireDefault(__webpack_require__("pVnL"));
-
-var _react = _interopRequireDefault(__webpack_require__("q1tI"));
-
-var _styles = __webpack_require__("DfQ9");
-
-var _CircularProgress = _interopRequireDefault(__webpack_require__("tdZp"));
-
-var SpinnerBase = (0, _styles.withStyles)({
-  root: {
-    color: 'var(--blue)'
-  }
-})(_CircularProgress.default);
-
-var StyledEcogestureSpinner = function StyledEcogestureSpinner(_ref) {
-  var props = (0, _extends2.default)({}, _ref);
-  return /*#__PURE__*/_react.default.createElement(SpinnerBase, props);
-};
-
-var _default = StyledEcogestureSpinner;
-exports.default = _default;
-
 /***/ }),
 
 /***/ "fGnb":
diff --git a/index.html b/index.html
index 91f5994ad99104c901011d0fae2e5e71afa199d1..c8b42df1ecb89b98aa5a7f80fb238060e26a33fa 100644
--- a/index.html
+++ b/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html lang="{{.Locale}}"><head><meta charset="utf-8"><title>Ecolyo</title><link rel="icon" type="image/png" href="/favicon-32x32.png" sizes="32x32"><link rel="icon" type="image/png" href="/favicon-16x16.png" sizes="16x16"><!-- PWA Manifest --><link rel="manifest" href="/manifest.json" crossorigin="use-credentials"><link rel="mask-icon" href="/safari-pinned-tab.svg" color="#297EF2"><meta name="viewport" content="width=device-width,height=device-height,initial-scale=1,user-scalable=0,viewport-fit=cover"><!-- PWA Chrome --><link rel="icon" sizes="192x192" href="/android-chrome-192x192.png"><link rel="icon" sizes="512x512" href="/android-chrome-512x512.png"><!-- PWA iOS --><link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png"><link rel="apple-touch-startup-image" href="/apple-touch-icon.png"><meta name="apple-mobile-web-app-title" content="Ecolyo"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-status-bar-style" content="black"><!-- PWA Colors --><meta name="theme-color" content="#343641"><meta name="background-color" content="#121212"><!-- PWA iOS title --><meta name="apple-mobile-web-app-title" content="Ecolyo">{{.ThemeCSS}} {{.CozyBar}}<script src="//{{.Domain}}/assets/js/piwik.js"></script></head><body><div role="application" class="application" data-cozy="{{.CozyData}}"><script src="vendors/ecolyo.0d9221201ffbd1127b31.js"></script><script src="app/ecolyo.65f221e2f2a7bd411b8f.js"></script></div></body></html>
\ No newline at end of file
+<!DOCTYPE html><html lang="{{.Locale}}"><head><meta charset="utf-8"><title>Ecolyo</title><link rel="icon" type="image/png" href="/favicon-32x32.png" sizes="32x32"><link rel="icon" type="image/png" href="/favicon-16x16.png" sizes="16x16"><!-- PWA Manifest --><link rel="manifest" href="/manifest.json" crossorigin="use-credentials"><link rel="mask-icon" href="/safari-pinned-tab.svg" color="#297EF2"><meta name="viewport" content="width=device-width,height=device-height,initial-scale=1,user-scalable=0,viewport-fit=cover"><!-- PWA Chrome --><link rel="icon" sizes="192x192" href="/android-chrome-192x192.png"><link rel="icon" sizes="512x512" href="/android-chrome-512x512.png"><!-- PWA iOS --><link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png"><link rel="apple-touch-startup-image" href="/apple-touch-icon.png"><meta name="apple-mobile-web-app-title" content="Ecolyo"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-status-bar-style" content="black"><!-- PWA Colors --><meta name="theme-color" content="#343641"><meta name="background-color" content="#121212"><!-- PWA iOS title --><meta name="apple-mobile-web-app-title" content="Ecolyo">{{.ThemeCSS}} {{.CozyBar}}<script src="//{{.Domain}}/assets/js/piwik.js"></script></head><body><div role="application" class="application" data-cozy="{{.CozyData}}"><script src="vendors/ecolyo.0d9221201ffbd1127b31.js"></script><script src="app/ecolyo.fab1f8b00d10658a3013.js"></script></div></body></html>
\ No newline at end of file