diff --git a/assets/css/lengow-layout.css b/assets/css/lengow-layout.css
index 96873f21..acef3dde 100755
--- a/assets/css/lengow-layout.css
+++ b/assets/css/lengow-layout.css
@@ -562,13 +562,13 @@ body.page-sidebar-closed .lengow-nav-bottom {
 /*                     ACCORDION                 */
 /*************************************************/
 
-#marketplaceAccordion .accordion-header {
+.marketplace-accordion .accordion-header {
   background-color: #f7f7f7;
   padding: 10px 15px;
   cursor: pointer;
 }
 
-#marketplaceAccordion .accordion-button {
+.marketplace-accordion .accordion-button {
   background-color: transparent;
   border: none;
   font-size: 16px;
@@ -579,36 +579,69 @@ body.page-sidebar-closed .lengow-nav-bottom {
   cursor: pointer;
 }
 
-#marketplaceAccordion .accordion-button:focus {
+.marketplace-accordion .accordion-button:focus {
   outline: none;
 }
 
-#marketplaceAccordion .accordion-button[aria-expanded="true"] {
+.marketplace-accordion .accordion-button[aria-expanded="true"] {
   color: #00aeef;
 }
 
-#marketplaceAccordion .accordion-button[aria-expanded="true"] .dashicons {
+.marketplace-accordion .accordion-button[aria-expanded="true"] .dashicons {
   transform: rotate(0.5turn);
   transition: all 0.2s ease;
 }
 
-#marketplaceAccordion .accordion-button[aria-expanded="false"] .dashicons {
+.marketplace-accordion .accordion-button[aria-expanded="false"] .dashicons {
   transform: rotate(0turn);
   transition: all 0.2s ease;
 }
 
-#marketplaceAccordion  .accordion-collapse {
+.marketplace-accordion  .accordion-collapse {
   display: none;
 }
 
-#marketplaceAccordion .accordion-body {
+.marketplace-accordion .accordion-body {
   padding: 15px;
 }
 
-#marketplaceAccordion .accordion-body h3 {
+.marketplace-accordion .accordion-body h3 {
   padding-top: 30px;
 }
 
-#marketplaceAccordion .accordion-collapse.show {
+.marketplace-accordion .accordion-collapse.show {
   display: block;
 }
+
+.tooltip-trigger {
+  display: inline-block;
+  margin-left: 5px;
+  cursor: pointer;
+  position: relative;
+  font-size: 30px;
+  color: #2e6592;
+  margin-top: -5px;
+}
+
+.tooltip-trigger::after {
+  content: attr(data-tooltip);
+  position: absolute;
+  left: 50%;
+  bottom: 100%;
+  transform: translateX(-50%);
+  background-color: #cdf1ff;
+  color: #2e6592;
+  padding: 5px 5px 10px;
+  border-radius: 3px;
+  opacity: 0;
+  visibility: hidden;
+  transition: opacity 0.2s;
+  white-space: normal;
+  font-size: 15px;
+  width: 600px;
+}
+
+.tooltip-trigger:hover::after {
+  opacity: 1;
+  visibility: visible;
+}
diff --git a/includes/admin/views/order-settings/html-admin-carrier-settings.php b/includes/admin/views/order-settings/html-admin-carrier-settings.php
index 0c6a2ea5..3a6e2f73 100755
--- a/includes/admin/views/order-settings/html-admin-carrier-settings.php
+++ b/includes/admin/views/order-settings/html-admin-carrier-settings.php
@@ -83,7 +83,10 @@ function lgw_print_carrier_options( array $carriers, ?string $selected = null, b
                 </div>
             </div>
 			<div class="lgw-box">
-				<h2><?php echo esc_html( $locale->t( 'carrier_setting.screen.title' ) ); ?></h2>
+				<h2>
+                    <?php echo esc_html( $locale->t( 'carrier_setting.screen.title' ) ); ?>
+                    <span class="tooltip-trigger dashicons dashicons-editor-help" data-tooltip="<?php echo esc_attr( $locale->t( 'carrier_setting.screen.tooltip' ) ); ?>"></span>
+                </h2>
 				<p><?php echo esc_html( $locale->t( 'carrier_setting.screen.description' ) ); ?></p>
                 <span class="legend blue-frame" style="display:block;">
                     <?php echo esc_html( $locale->t( 'carrier_setting.screen.shipping_method_mapping_help' ) ); ?>
@@ -95,7 +98,7 @@ function lgw_print_carrier_options( array $carriers, ?string $selected = null, b
                 </span>
 				<br/>
 				<div class="form-group lengow_import_shipping_methods">
-					<div id="marketplaceAccordion">
+					<div class="marketplace-accordion">
 						<?php foreach ( $marketplaces as $marketplace_code => $marketplace ) : ?>
 							<div class="accordion-item">
 								<h2 class="accordion-header" id="heading<?php echo esc_attr( $marketplace_code ); ?>">
@@ -109,7 +112,7 @@ function lgw_print_carrier_options( array $carriers, ?string $selected = null, b
                                         <?php /* DEFAULT WOOCOMMERCE SHIPPING METHOD */ ?>
 										<div class="form-group">
 											<label>
-												<?php echo esc_html( sprintf( $keys[ Lengow_Configuration::IMPORT_SHIPPING_METHODS ][ Lengow_Configuration::PARAM_LABEL ], $marketplace->name ) ); ?>
+												<?php echo esc_html( $keys[ Lengow_Configuration::IMPORT_SHIPPING_METHODS ][ Lengow_Configuration::PARAM_LABEL ] ); ?>
 											</label>
 											<select class="js-select lengow_select" name="<?php echo Lengow_Configuration::IMPORT_SHIPPING_METHODS; ?>[<?php echo esc_attr( $marketplace_code ); ?>][__default]">
 												<?php
@@ -122,26 +125,9 @@ function lgw_print_carrier_options( array $carriers, ?string $selected = null, b
 											</select>
 										</div>
                                         <?php endif; ?>
-                                        <?php if (!empty((array)$marketplace->orders->carriers) && count((array)$marketplace->orders->carriers) !== 1 && count($shipping_methods) !== 1) : ?>
-                                            <?php // DEFAULT MARKETPLACE CARRIER ?>
-                                            <div class="form-group">
-                                                <label>
-                                                    <?php echo esc_html( sprintf( $keys[ Lengow_Configuration::SHIPPING_METHOD_CARRIERS ][ Lengow_Configuration::PARAM_LABEL ], $marketplace->name ) ); ?>
-                                                </label>
-                                                <select class="js-select lengow_select" name="<?php echo Lengow_Configuration::SHIPPING_METHOD_CARRIERS; ?>[<?php echo esc_attr( $marketplace_code ); ?>][__default]">
-                                                    <?php
-                                                    lgw_print_carrier_options(
-	                                                    (array)$marketplace->orders->carriers,
-                                                        $shipping_method_carriers[ $marketplace_code ]['__default'] ?? null,
-                                                        true
-                                                    );
-                                                    ?>
-                                                </select>
-                                            </div>
-                                        <?php endif;?>
                                         <?php /* WOOCOMMERCE SHIPPING METHOD BY MARKETPLACE */ ?>
                                         <?php if (count((array)$marketplace->orders->shipping_methods) > 0) : ?>
-                                            <h3><?php echo esc_html( sprintf( $locale->t( 'lengow_settings.lengow_import_shipping_methods_title' ), $marketplace->name ) ); ?></h3>
+                                            <h3><?php echo esc_html( $locale->t( 'lengow_settings.lengow_import_shipping_methods_title' ) ); ?></h3>
 	                                        <?php foreach ( $marketplace->orders->shipping_methods as $shipping_code => $shipping_method ) : ?>
                                                 <div class="form-group">
                                                     <label>
@@ -159,26 +145,92 @@ function lgw_print_carrier_options( array $carriers, ?string $selected = null, b
                                                 </div>
                                             <?php endforeach; ?>
                                         <?php endif; ?>
-                                        <?php /* MARKETPLACE CARRIER BY WOOCOMMERCE SHIPPING METHOD */ ?>
-                                        <?php if (count((array)$marketplace->orders->carriers) > 1) : ?>
-                                            <h3><?php echo esc_html( sprintf( $locale->t( 'lengow_settings.lengow_shipping_method_carriers_title' ), $marketplace->name ) ); ?></h3>
-	                                        <?php foreach ( $shipping_methods as $shipping_code => $shipping_method ) : ?>
+                                        <div class="lengow_main_setting_block_content">
+                                            <div class="pull-left">
+                                                <button type="submit" class="lgw-btn lgw-btn-progression lengow_submit_main_setting">
+                                                    <div class="btn-inner">
+                                                        <div class="btn-step default">
+															<?php echo esc_html( $locale->t( 'global_setting.screen.button_save' ) ); ?>
+                                                        </div>
+                                                        <div class="btn-step loading">
+															<?php echo esc_html( $locale->t( 'global_setting.screen.setting_saving' ) ); ?>
+                                                        </div>
+                                                        <div class="btn-step done" data-success="Saved!" data-error="Error">
+															<?php echo esc_html( $locale->t( 'global_setting.screen.setting_saved' ) ); ?>
+                                                        </div>
+                                                    </div>
+                                                </button>
+                                            </div>
+                                            <div class="clear"></div>
+                                        </div>
+                                    </div>
+								</div>
+							</div>
+						<?php endforeach; ?>
+					</div>
+				</div>
+            </div>
+            <?php
+            $carrier_marketplaces = array_filter( (array) $marketplaces, function ( $marketplace ) {
+	            return count( (array) $marketplace->orders->carriers ) > 0;
+            } );
+            if (count($carrier_marketplaces)) :
+            ?>
+            <div class="lgw-box">
+                <h2>
+                    <?php echo esc_html( $locale->t( 'carrier_setting.screen.carrier_title' ) ); ?>
+                    <span class="tooltip-trigger dashicons dashicons-editor-help" data-tooltip="<?php echo esc_attr( $locale->t( 'carrier_setting.screen.carrier_tooltip' ) ); ?>"></span>
+                </h2>
+                <p><?php echo esc_html( $locale->t( 'carrier_setting.screen.carrier_description' ) ); ?></p>
+                <br/>
+                <div class="form-group lengow_import_shipping_methods">
+                    <div class="marketplace-accordion">
+						<?php foreach ( $carrier_marketplaces as $marketplace_code => $marketplace ) : ?>
+                            <div class="accordion-item">
+                                <h2 class="accordion-header" id="carrier_heading<?php echo esc_attr( $marketplace_code ); ?>">
+                                    <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#carrier_collapse<?php echo esc_attr( $marketplace_code ); ?>" aria-expanded="false" aria-controls="collapse<?php echo esc_attr( $marketplace_code ); ?>">
+                                        <span class="dashicons dashicons-arrow-down-alt2"></span> <?php echo esc_html( $marketplace->name ); ?>
+                                    </button>
+                                </h2>
+                                <div id="carrier_collapse<?php echo esc_attr( $marketplace_code ); ?>" class="accordion-collapse collapse" aria-labelledby="heading<?php echo esc_attr( $marketplace_code ); ?>" data-bs-parent="#marketplaceAccordion">
+                                    <div class="accordion-body">
+										<?php if (!empty((array)$marketplace->orders->carriers) && count((array)$marketplace->orders->carriers) !== 1 && count($shipping_methods) !== 1) : ?>
+											<?php // DEFAULT MARKETPLACE CARRIER ?>
+                                            <div class="form-group">
+                                                <label>
+													<?php echo esc_html( $keys[ Lengow_Configuration::SHIPPING_METHOD_CARRIERS ][ Lengow_Configuration::PARAM_LABEL ] ); ?>
+                                                </label>
+                                                <select class="js-select lengow_select" name="<?php echo Lengow_Configuration::SHIPPING_METHOD_CARRIERS; ?>[<?php echo esc_attr( $marketplace_code ); ?>][__default]">
+													<?php
+													lgw_print_carrier_options(
+														(array)$marketplace->orders->carriers,
+														$shipping_method_carriers[ $marketplace_code ]['__default'] ?? null,
+														true
+													);
+													?>
+                                                </select>
+                                            </div>
+										<?php endif;?>
+										<?php /* MARKETPLACE CARRIER BY WOOCOMMERCE SHIPPING METHOD */ ?>
+										<?php if (count((array)$marketplace->orders->carriers) > 1) : ?>
+                                            <h3><?php echo esc_html( $locale->t( 'lengow_settings.lengow_shipping_method_carriers_title' ) ); ?></h3>
+											<?php foreach ( $shipping_methods as $shipping_code => $shipping_method ) : ?>
                                                 <div class="form-group">
                                                     <label>
-                                                        <?php echo esc_html( $shipping_method ); ?>
+														<?php echo esc_html( $shipping_method ); ?>
                                                     </label>
                                                     <select class="js-select lengow_select" name="<?php echo Lengow_Configuration::SHIPPING_METHOD_CARRIERS; ?>[<?php echo esc_attr( $marketplace_code ); ?>][<?php echo esc_attr( $shipping_code ); ?>]">
-                                                        <?php
-                                                        lgw_print_carrier_options(
-                                                            (array)$marketplace->orders->carriers,
-                                                            $shipping_method_carriers[ $marketplace_code ][ $shipping_code ] ?? null,
-                                                            true
-                                                        );
-                                                        ?>
+														<?php
+														lgw_print_carrier_options(
+															(array)$marketplace->orders->carriers,
+															$shipping_method_carriers[ $marketplace_code ][ $shipping_code ] ?? null,
+															true
+														);
+														?>
                                                     </select>
                                                 </div>
-                                            <?php endforeach; ?>
-                                        <?php endif; ?>
+											<?php endforeach; ?>
+										<?php endif; ?>
                                         <div class="lengow_main_setting_block_content">
                                             <div class="pull-left">
                                                 <button type="submit" class="lgw-btn lgw-btn-progression lengow_submit_main_setting">
@@ -198,12 +250,13 @@ function lgw_print_carrier_options( array $carriers, ?string $selected = null, b
                                             <div class="clear"></div>
                                         </div>
                                     </div>
-								</div>
-							</div>
+                                </div>
+                            </div>
 						<?php endforeach; ?>
-					</div>
-				</div>
+                    </div>
+                </div>
 			</div>
+            <?php endif; ?>
 		</form>
 	</div>
 </div>
diff --git a/translations/en_GB.csv b/translations/en_GB.csv
index 43816ec0..142c7b0f 100755
--- a/translations/en_GB.csv
+++ b/translations/en_GB.csv
@@ -216,14 +216,18 @@ order_setting.screen.anonymize_email|Anonymize customer's emails addresses
 order_setting.screen.type_anonymize_email_label|Choose the type of anonymization
 order_setting.screen.type_anonymize_email_encrypted|Encrypted, example: 1ec4a32af2ebee7db7ffa687e0271e39@lengow.com
 order_setting.screen.type_anonymize_email_not_encrypted|Plaintext, example:123456789-amazon_fr@lengow.com
-carrier_setting.screen.default_shipping_method_title|Manage shipping methods
-carrier_setting.screen.default_shipping_method_description|Select a default shipping method to apply to your orders
-carrier_setting.screen.shipping_method_mapping_help|The choice of the shipping method is made as follows:
-carrier_setting.screen.shipping_method_mapping_help_1|If a method is defined for the marketplace shipping method, it will be used.
-carrier_setting.screen.shipping_method_mapping_help_2|If a method is defined for the default marketplace shipping method, it will be used.
-carrier_setting.screen.shipping_method_mapping_help_3|Otherwise, the default shipping method will be used.
-carrier_setting.screen.title|Manage shipping methods by marketplace
-carrier_setting.screen.description|Choose the different shipping methods to assign to each of your orders here. You can do this for the different marketplaces activated in your account.
+carrier_setting.screen.default_shipping_method_title|Default shipping method definition
+carrier_setting.screen.default_shipping_method_description|Select a default shipping method to apply to all your orders, regardless of the marketplace.
+carrier_setting.screen.shipping_method_mapping_help|When an order is imported, the shipping method is applied in the following order:
+carrier_setting.screen.shipping_method_mapping_help_1|Shipping methods defined by marketplace. If a match is defined, it is used as a priority.
+carrier_setting.screen.shipping_method_mapping_help_2|Otherwise, the default shipping method of the marketplace is applied.
+carrier_setting.screen.shipping_method_mapping_help_3|If no specific configuration exists, the default method for all orders is used.
+carrier_setting.screen.title|Mapping of Delivery Methods by Marketplaces
+carrier_setting.screen.tooltip|This step ensures the automatic assignment of the correct shipping method for each order imported into WooCommerce.
+carrier_setting.screen.description|Map the delivery methods of the marketplaces to your own WooCommerce delivery methods.
+carrier_setting.screen.carrier_title|Mapping of Carriers by Marketplaces
+carrier_setting.screen.carrier_tooltip|When you ship an order in WooCommerce, the carrier must match the format expected by the marketplace to avoid any rejection.
+carrier_setting.screen.carrier_description|Map your WooCommerce shipping methods to the carriers expected by the marketplaces
 global_setting.screen.notification_alert_title|Notifications & alerts
 global_setting.screen.security_title|Security
 global_setting.screen.shop_title|Store management
@@ -360,10 +364,10 @@ lengow_settings.lengow_debug_enabled_title|Activate Debug Mode
 lengow_settings.lengow_import_in_progress_title|Import in progress
 lengow_settings.lengow_last_import_manual_title|Last manual import
 lengow_settings.lengow_last_import_cron_title|Last Cron import
-lengow_settings.lengow_import_shipping_methods_default_title|Default WooCommerce shipping method for %s
-lengow_settings.lengow_shipping_method_carriers_default_title|Default carrier for %s
-lengow_settings.lengow_import_shipping_methods_title|Map the %s shipping methods with your WooCommerce shipping methods
-lengow_settings.lengow_shipping_method_carriers_title|Map your WooCommerce shipping methods with %s carriers
+lengow_settings.lengow_import_shipping_methods_default_title|Default mapping of the shipping method
+lengow_settings.lengow_shipping_method_carriers_default_title|Default mapping of the carrier
+lengow_settings.lengow_import_shipping_methods_title|Advanced mapping of shipping methods
+lengow_settings.lengow_shipping_method_carriers_title|Advanced mapping of carriers
 lengow_log.error.rest_time_to_import|Please wait %{rest_time} seconds before re-importing orders
 lengow_log.error.nb_order_imported|%{nb_order} order(s) imported
 lengow_log.error.nb_order_updated|%{nb_order} order(s) updated
diff --git a/translations/fr_FR.csv b/translations/fr_FR.csv
index 31437134..eb232317 100755
--- a/translations/fr_FR.csv
+++ b/translations/fr_FR.csv
@@ -216,14 +216,18 @@ order_setting.screen.anonymize_email|Anonymiser les adresses e-mails des clients
 order_setting.screen.type_anonymize_email_label|Type d'anonymisation des e-mails
 order_setting.screen.type_anonymize_email_encrypted|Chiffré, exemple: 1ec4a32af2ebee7db7ffa687e0271e39@lengow.com
 order_setting.screen.type_anonymize_email_not_encrypted|En clair, exemple:123456789-amazon_fr@lengow.com
-carrier_setting.screen.default_shipping_method_title|Gérez les méthodes de livraison
-carrier_setting.screen.default_shipping_method_description|Sélectionnez une méthode de livraison par défaut à appliquer à vos commandes
-carrier_setting.screen.shipping_method_mapping_help|Le choix de la méthode de livraison est choisie comme suit :
-carrier_setting.screen.shipping_method_mapping_help_1|Si une méthode est définie pour la méthode de livraison du marketplace, elle sera utilisée.
-carrier_setting.screen.shipping_method_mapping_help_2|Si une méthode est définie pour la méthode de livraison par défaut du marketplace, elle sera utilisée.
-carrier_setting.screen.shipping_method_mapping_help_3|Sinon, la méthode de livraison définie par défaut sera utilisée.
-carrier_setting.screen.title|Gérez les méthodes de livraison par marketplace
-carrier_setting.screen.description|Choisissez ici les différentes méthodes de livraison à attribuer à chacune de vos commandes. Vous pouvez le faire pour les différentes marketplaces activées dans votre compte.
+carrier_setting.screen.default_shipping_method_title|Définition de la méthode de livraison par défaut
+carrier_setting.screen.default_shipping_method_description|Sélectionnez une méthode de livraison par défaut à appliquer à toutes vos commandes, quel que soit la marketplace
+carrier_setting.screen.shipping_method_mapping_help|Lorsqu’une commande est importée, la méthode de livraison est appliquée selon cet ordre :
+carrier_setting.screen.shipping_method_mapping_help_1|Méthodes de livraison définie par marketplace. Si une correspondance est définie, elle est utilisée en priorité.
+carrier_setting.screen.shipping_method_mapping_help_2|Sinon, la méthode de livraison par défaut de la marketplace est appliquée.
+carrier_setting.screen.shipping_method_mapping_help_3|Si aucune configuration spécifique n’existe, la méthode par défaut pour toutes les commandes est utilisée.
+carrier_setting.screen.title|Mapping des Méthodes de Livraison par Marketplaces
+carrier_setting.screen.tooltip|Cette étape garantit l’attribution automatique de la bonne méthode de livraison pour chaque commande importée dans WooCommerce.
+carrier_setting.screen.description|Associez les méthodes de livraison des marketplaces à vos propres méthodes de livraison WooCommerce
+carrier_setting.screen.carrier_title|Mapping des Transporteurs par Marketplaces
+carrier_setting.screen.carrier_tooltip|Lorsque vous expédiez une commande dans WooCommerce, le transporteur doit correspondre au format attendu par la marketplace pour éviter tout rejet.
+carrier_setting.screen.carrier_description|Associez vos méthodes de livraison WooCommerce aux transporteurs attendus par les marketplaces
 global_setting.screen.notification_alert_title|Notifications & alertes
 global_setting.screen.security_title|Sécurité
 global_setting.screen.shop_title|Gestion de la boutique
@@ -360,10 +364,10 @@ lengow_settings.lengow_debug_enabled_title|Activer le Debug Mode
 lengow_settings.lengow_import_in_progress_title|Import en cours
 lengow_settings.lengow_last_import_manual_title|Dernier import manuel
 lengow_settings.lengow_last_import_cron_title|Dernier import CRON
-lengow_settings.lengow_import_shipping_methods_default_title|Méthode de livraison WooCommerce par défaut pour %s
-lengow_settings.lengow_shipping_method_carriers_default_title|Transporteur par défaut pour %s
-lengow_settings.lengow_import_shipping_methods_title|Mappez les méthodes de livraisons %s avec vos méthodes de livraison WooCommerce
-lengow_settings.lengow_shipping_method_carriers_title|Mappez vos méthodes de livraisons WooCommerce avec les transporteur %s
+lengow_settings.lengow_import_shipping_methods_default_title|Mapping par défaut de la méthode de livraison
+lengow_settings.lengow_shipping_method_carriers_default_title|Mapping par défaut du transporteur
+lengow_settings.lengow_import_shipping_methods_title|Mapping avancé des méthodes de livraison
+lengow_settings.lengow_shipping_method_carriers_title|Mapping avancé des transporteurs
 lengow_log.error.rest_time_to_import|Attendez %{rest_time}  secondes avant d'importer de nouveau vos commandes
 lengow_log.error.nb_order_imported|%{nb_order} commande(s) importée(s)
 lengow_log.error.nb_order_updated|%{nb_order} commande(s) mise(s) à jour
diff --git a/translations/yml/en_GB.yml b/translations/yml/en_GB.yml
index 2fcc621b..950667cb 100755
--- a/translations/yml/en_GB.yml
+++ b/translations/yml/en_GB.yml
@@ -239,14 +239,18 @@ en:
       type_anonymize_email_not_encrypted: "Plaintext, example:123456789-amazon_fr@lengow.com"
   carrier_setting:
     screen:
-      default_shipping_method_title: "Manage shipping methods"
-      default_shipping_method_description: "Select a default shipping method to apply to your orders"
-      shipping_method_mapping_help: "The choice of the shipping method is made as follows:"
-      shipping_method_mapping_help_1: "If a method is defined for the marketplace shipping method, it will be used."
-      shipping_method_mapping_help_2: "If a method is defined for the default marketplace shipping method, it will be used."
-      shipping_method_mapping_help_3: "Otherwise, the default shipping method will be used."
-      title: "Manage shipping methods by marketplace"
-      description: "Choose the different shipping methods to assign to each of your orders here. You can do this for the different marketplaces activated in your account."
+      default_shipping_method_title: "Default shipping method definition"
+      default_shipping_method_description: "Select a default shipping method to apply to all your orders, regardless of the marketplace."
+      shipping_method_mapping_help: "When an order is imported, the shipping method is applied in the following order:"
+      shipping_method_mapping_help_1: "Shipping methods defined by marketplace. If a match is defined, it is used as a priority."
+      shipping_method_mapping_help_2: "Otherwise, the default shipping method of the marketplace is applied."
+      shipping_method_mapping_help_3: "If no specific configuration exists, the default method for all orders is used."
+      title: "Mapping of Delivery Methods by Marketplaces"
+      tooltip: "This step ensures the automatic assignment of the correct shipping method for each order imported into WooCommerce."
+      description: "Map the delivery methods of the marketplaces to your own WooCommerce delivery methods."
+      carrier_title: "Mapping of Carriers by Marketplaces"
+      carrier_tooltip: "When you ship an order in WooCommerce, the carrier must match the format expected by the marketplace to avoid any rejection."
+      carrier_description: "Map your WooCommerce shipping methods to the carriers expected by the marketplaces"
   global_setting:
     screen:
       notification_alert_title: "Notifications & alerts"
@@ -392,10 +396,10 @@ en:
     lengow_import_in_progress_title: "Import in progress"
     lengow_last_import_manual_title: "Last manual import"
     lengow_last_import_cron_title: "Last Cron import"
-    lengow_import_shipping_methods_default_title: "Default WooCommerce shipping method for %s"
-    lengow_shipping_method_carriers_default_title: "Default carrier for %s"
-    lengow_import_shipping_methods_title: "Map the %s shipping methods with your WooCommerce shipping methods"
-    lengow_shipping_method_carriers_title: "Map your WooCommerce shipping methods with %s carriers"
+    lengow_import_shipping_methods_default_title: "Default mapping of the shipping method"
+    lengow_shipping_method_carriers_default_title: "Default mapping of the carrier"
+    lengow_import_shipping_methods_title: "Advanced mapping of shipping methods"
+    lengow_shipping_method_carriers_title: "Advanced mapping of carriers"
   lengow_log:
     error:
       rest_time_to_import: "Please wait %{rest_time} seconds before re-importing orders"
diff --git a/translations/yml/fr_FR.yml b/translations/yml/fr_FR.yml
index e887b42c..83686c53 100755
--- a/translations/yml/fr_FR.yml
+++ b/translations/yml/fr_FR.yml
@@ -239,14 +239,18 @@ fr:
       type_anonymize_email_not_encrypted: "En clair, exemple:123456789-amazon_fr@lengow.com"
   carrier_setting:
     screen:
-      default_shipping_method_title: "Gérez les méthodes de livraison"
-      default_shipping_method_description: "Sélectionnez une méthode de livraison par défaut à appliquer à vos commandes"
-      shipping_method_mapping_help: "Le choix de la méthode de livraison est choisie comme suit :"
-      shipping_method_mapping_help_1: "Si une méthode est définie pour la méthode de livraison du marketplace, elle sera utilisée."
-      shipping_method_mapping_help_2: "Si une méthode est définie pour la méthode de livraison par défaut du marketplace, elle sera utilisée."
-      shipping_method_mapping_help_3: "Sinon, la méthode de livraison définie par défaut sera utilisée."
-      title: "Gérez les méthodes de livraison par marketplace"
-      description: "Choisissez ici les différentes méthodes de livraison à attribuer à chacune de vos commandes. Vous pouvez le faire pour les différentes marketplaces activées dans votre compte."
+      default_shipping_method_title: "Définition de la méthode de livraison par défaut"
+      default_shipping_method_description: "Sélectionnez une méthode de livraison par défaut à appliquer à toutes vos commandes, quel que soit la marketplace"
+      shipping_method_mapping_help: "Lorsqu’une commande est importée, la méthode de livraison est appliquée selon cet ordre :"
+      shipping_method_mapping_help_1: "Méthodes de livraison définie par marketplace. Si une correspondance est définie, elle est utilisée en priorité."
+      shipping_method_mapping_help_2: "Sinon, la méthode de livraison par défaut de la marketplace est appliquée."
+      shipping_method_mapping_help_3: "Si aucune configuration spécifique n’existe, la méthode par défaut pour toutes les commandes est utilisée."
+      title: "Mapping des Méthodes de Livraison par Marketplaces"
+      tooltip: "Cette étape garantit l’attribution automatique de la bonne méthode de livraison pour chaque commande importée dans WooCommerce."
+      description: "Associez les méthodes de livraison des marketplaces à vos propres méthodes de livraison WooCommerce"
+      carrier_title: "Mapping des Transporteurs par Marketplaces"
+      carrier_tooltip: "Lorsque vous expédiez une commande dans WooCommerce, le transporteur doit correspondre au format attendu par la marketplace pour éviter tout rejet."
+      carrier_description: "Associez vos méthodes de livraison WooCommerce aux transporteurs attendus par les marketplaces"
   global_setting:
     screen:
       notification_alert_title: "Notifications & alertes"
@@ -392,10 +396,10 @@ fr:
     lengow_import_in_progress_title: "Import en cours"
     lengow_last_import_manual_title: "Dernier import manuel"
     lengow_last_import_cron_title: "Dernier import CRON"
-    lengow_import_shipping_methods_default_title: "Méthode de livraison WooCommerce par défaut pour %s"
-    lengow_shipping_method_carriers_default_title: "Transporteur par défaut pour %s"
-    lengow_import_shipping_methods_title: "Mappez les méthodes de livraisons %s avec vos méthodes de livraison WooCommerce"
-    lengow_shipping_method_carriers_title: "Mappez vos méthodes de livraisons WooCommerce avec les transporteur %s"
+    lengow_import_shipping_methods_default_title: "Mapping par défaut de la méthode de livraison"
+    lengow_shipping_method_carriers_default_title: "Mapping par défaut du transporteur"
+    lengow_import_shipping_methods_title: "Mapping avancé des méthodes de livraison"
+    lengow_shipping_method_carriers_title: "Mapping avancé des transporteurs"
   lengow_log:
     error:
       rest_time_to_import: "Attendez %{rest_time}  secondes avant d'importer de nouveau vos commandes"