diff --git a/app/src/main/java/com/orange/ouds/app/ui/components/alert/AlertMessageDemoScreen.kt b/app/src/main/java/com/orange/ouds/app/ui/components/alert/AlertMessageDemoScreen.kt
index f12cb247cd..859ac84409 100644
--- a/app/src/main/java/com/orange/ouds/app/ui/components/alert/AlertMessageDemoScreen.kt
+++ b/app/src/main/java/com/orange/ouds/app/ui/components/alert/AlertMessageDemoScreen.kt
@@ -56,7 +56,7 @@ fun AlertMessageDemoScreen() {
         bottomSheetContent = { AlertMessageDemoBottomSheetContent(state = state) },
         codeSnippet = { alertMessageDemoCodeSnippet(state = state, themeDrawableResources = themeDrawableResources) },
         demoContent = { AlertMessageDemoContent(state = state) },
-        version = OudsVersion.Component.Alert
+        version = OudsVersion.Component.AlertMessage
     )
 }
 
diff --git a/app/src/main/java/com/orange/ouds/app/ui/components/alert/InlineAlertDemoScreen.kt b/app/src/main/java/com/orange/ouds/app/ui/components/alert/InlineAlertDemoScreen.kt
index 71eaf3f685..99dfbcc4db 100644
--- a/app/src/main/java/com/orange/ouds/app/ui/components/alert/InlineAlertDemoScreen.kt
+++ b/app/src/main/java/com/orange/ouds/app/ui/components/alert/InlineAlertDemoScreen.kt
@@ -51,7 +51,7 @@ fun InlineAlertDemoScreen() {
         bottomSheetContent = { InlineAlertDemoBottomSheetContent(state = state) },
         codeSnippet = { inlineAlertDemoCodeSnippet(state = state, themeDrawableResources = themeDrawableResources) },
         demoContent = { InlineAlertDemoContent(state = state) },
-        version = OudsVersion.Component.Alert
+        version = OudsVersion.Component.InlineAlert
     )
 }
 
diff --git a/app/src/main/java/com/orange/ouds/app/ui/components/chip/FilterChipDemoScreen.kt b/app/src/main/java/com/orange/ouds/app/ui/components/chip/FilterChipDemoScreen.kt
index fb2b2e1033..a65ab922fa 100644
--- a/app/src/main/java/com/orange/ouds/app/ui/components/chip/FilterChipDemoScreen.kt
+++ b/app/src/main/java/com/orange/ouds/app/ui/components/chip/FilterChipDemoScreen.kt
@@ -30,7 +30,7 @@ fun FilterChipDemoScreen() {
         bottomSheetContent = { ChipDemoBottomSheetContent(state = state) },
         codeSnippet = { filterChipDemoCodeSnippet(state = state, themeDrawableResources = themeDrawableResources) },
         demoContent = { FilterChipDemoContent(state = state) },
-        version = OudsVersion.Component.Chip
+        version = OudsVersion.Component.FilterChip
     )
 }
 
diff --git a/app/src/main/java/com/orange/ouds/app/ui/components/chip/SuggestionChipDemoScreen.kt b/app/src/main/java/com/orange/ouds/app/ui/components/chip/SuggestionChipDemoScreen.kt
index b7327d1844..1774132adf 100644
--- a/app/src/main/java/com/orange/ouds/app/ui/components/chip/SuggestionChipDemoScreen.kt
+++ b/app/src/main/java/com/orange/ouds/app/ui/components/chip/SuggestionChipDemoScreen.kt
@@ -30,7 +30,7 @@ fun SuggestionChipDemoScreen() {
         bottomSheetContent = { ChipDemoBottomSheetContent(state = state) },
         codeSnippet = { suggestionChipDemoCodeSnippet(state = state, themeDrawableResources = themeDrawableResources) },
         demoContent = { SuggestionChipDemoContent(state = state) },
-        version = OudsVersion.Component.Chip
+        version = OudsVersion.Component.SuggestionChip
     )
 }
 
diff --git a/app/src/main/java/com/orange/ouds/app/ui/components/navigationbar/NavigationBarDemoScreen.kt b/app/src/main/java/com/orange/ouds/app/ui/components/navigationbar/NavigationBarDemoScreen.kt
index 8c6b95a119..54904a4cfc 100644
--- a/app/src/main/java/com/orange/ouds/app/ui/components/navigationbar/NavigationBarDemoScreen.kt
+++ b/app/src/main/java/com/orange/ouds/app/ui/components/navigationbar/NavigationBarDemoScreen.kt
@@ -59,7 +59,7 @@ fun NavigationBarDemoScreen() {
         },
         demoContent = { NavigationBarDemoContent(state = state) },
         demoContentPaddingValues = PaddingValues(horizontal = OudsTheme.spaces.fixed.none),
-        version = OudsVersion.Component.Bar
+        version = OudsVersion.Component.NavigationBar
     )
 }
 
diff --git a/app/src/main/java/com/orange/ouds/app/ui/components/topappbar/TopAppBarDemoScreen.kt b/app/src/main/java/com/orange/ouds/app/ui/components/topappbar/TopAppBarDemoScreen.kt
index 356a537109..f507e46102 100644
--- a/app/src/main/java/com/orange/ouds/app/ui/components/topappbar/TopAppBarDemoScreen.kt
+++ b/app/src/main/java/com/orange/ouds/app/ui/components/topappbar/TopAppBarDemoScreen.kt
@@ -58,7 +58,7 @@ fun TopAppBarDemoScreen() {
         codeSnippet = { topAppBarDemoCodeSnippet(state = state, themeDrawableResources = themeDrawableResources) },
         demoContent = { TopAppBarDemoContent(state = state) },
         demoContentPaddingValues = PaddingValues(horizontal = OudsTheme.spaces.fixed.none),
-        version = OudsVersion.Component.Bar
+        version = OudsVersion.Component.NavigationBar // TODO Update to AppBar version when available
     )
 }
 
diff --git a/buildSrc/src/main/kotlin/com/orange/ouds/gradle/Component.kt b/buildSrc/src/main/kotlin/com/orange/ouds/gradle/Component.kt
index b6fe78840b..7810b2683d 100644
--- a/buildSrc/src/main/kotlin/com/orange/ouds/gradle/Component.kt
+++ b/buildSrc/src/main/kotlin/com/orange/ouds/gradle/Component.kt
@@ -16,18 +16,25 @@ import com.orange.ouds.theme.OudsVersion
 import org.gradle.api.Project
 
 enum class Component {
-    Alert,
+    AlertMessage,
     Badge,
-    Bar,
+    BadgeCount,
+    BadgeIcon,
+    BottomSheet,
     BulletList,
     Button,
     Checkbox,
-    Chip,
     Divider,
+    Fab,
+    FilterChip,
+    InlineAlert,
+    InputTag,
     Link,
+    NavigationBar,
     PasswordInput,
     PinCodeInput,
     RadioButton,
+    SuggestionChip,
     Switch,
     Tag,
     TextArea,
@@ -36,18 +43,25 @@ enum class Component {
     val version: String
         get() = with(OudsVersion.Component) {
             when (this@Component) {
-                Component.Alert -> Alert
+                Component.AlertMessage -> AlertMessage
                 Component.Badge -> Badge
-                Component.Bar -> Bar
+                Component.BadgeCount -> BadgeCount
+                Component.BadgeIcon -> BadgeIcon
+                Component.BottomSheet -> BottomSheet
                 Component.BulletList -> BulletList
                 Component.Button -> Button
                 Component.Checkbox -> Checkbox
-                Component.Chip -> Chip
                 Component.Divider -> Divider
+                Component.Fab -> Fab
+                Component.FilterChip -> FilterChip
+                Component.InlineAlert -> InlineAlert
+                Component.InputTag -> InputTag
                 Component.Link -> Link
+                Component.NavigationBar -> NavigationBar
                 Component.PasswordInput -> PasswordInput
                 Component.PinCodeInput -> PinCodeInput
                 Component.RadioButton -> RadioButton
+                Component.SuggestionChip -> SuggestionChip
                 Component.Switch -> Switch
                 Component.Tag -> Tag
                 Component.TextArea -> TextArea
@@ -55,22 +69,38 @@ enum class Component {
             }
         }
 
+    val designName: String
+        get() {
+            // Convert enum name to design name (e.g., "BadgeIcon" -> "Badge Icon")
+            return this.name
+                .replace(Regex("([a-z])([A-Z])"), "$1 $2")
+                .replace("Pin", "PIN")
+                .replace("Fab", "FAB")
+        }
+
     fun getSourceFilePaths(project: Project): List<String> {
         val filenames = when (this) {
-            Alert -> listOf("OudsAlertMessage", "OudsInlineAlert")
+            AlertMessage -> listOf("OudsAlertMessage")
             Badge -> listOf("OudsBadge")
-            Bar -> listOf("OudsNavigationBar", "OudsTopAppBar")
+            BadgeCount -> listOf("OudsBadge")
+            BadgeIcon -> listOf("OudsBadge")
+            BottomSheet -> listOf("OudsBottomSheetScaffold", "OudsModalBottomSheet")
             BulletList -> listOf("OudsBulletList")
             Button -> listOf("OudsButton")
             Checkbox -> listOf("OudsCheckbox", "OudsCheckboxItem")
-            Chip -> listOf("OudsFilterChip", "OudsSuggestionChip")
             Divider -> listOf("OudsDivider")
+            Fab -> listOf("OudsFloatingActionButton")
+            FilterChip -> listOf("OudsFilterChip")
+            InlineAlert -> listOf("OudsInlineAlert")
+            InputTag -> listOf("OudsInputTag")
             Link -> listOf("OudsLink")
+            NavigationBar -> listOf("OudsNavigationBar") // TODO Waiting for a specific version number for TopAppBar (in Maxime's TODO)
             PasswordInput -> listOf("OudsPasswordInput")
             PinCodeInput -> listOf("OudsPinCodeInput")
             RadioButton -> listOf("OudsRadioButton", "OudsRadioButtonItem")
+            SuggestionChip -> listOf("OudsSuggestionChip")
             Switch -> listOf("OudsSwitch", "OudsSwitchItem")
-            Tag -> listOf("OudsTag", "OudsInputTag")
+            Tag -> listOf("OudsTag")
             TextArea -> listOf("OudsTextArea")
             TextInput -> listOf("OudsTextInput")
         }
diff --git a/buildSrc/src/main/kotlin/documentation.gradle.kts b/buildSrc/src/main/kotlin/documentation.gradle.kts
index 8e633a1d21..4c2993cc3d 100644
--- a/buildSrc/src/main/kotlin/documentation.gradle.kts
+++ b/buildSrc/src/main/kotlin/documentation.gradle.kts
@@ -26,6 +26,8 @@ private val moduleDocumentationDirectories = listOf(
     "theme-wireframe"
 )
 
+private val draftVersion = "Draft"
+
 project.extra["moduleDocumentationDirectories"] = moduleDocumentationDirectories
 
 tasks.register<DefaultTask>("prepareDocumentation") {
@@ -64,22 +66,28 @@ tasks.register<DefaultTask>("prepareDocumentation") {
 
 tasks.register<DefaultTask>("checkDocumentation") {
     doLast {
-        val componentVersionRegex = "Design version: (.*)$".toRegex()
+        val componentsByFile = mutableMapOf<String, MutableList<Component>>()
         Component.entries.forEach { component ->
-            component.getSourceFilePaths(project).forEach { sourceFilePath ->
-                val versionByLineIndex = File(sourceFilePath).readLines()
-                    .mapIndexedNotNull { index, line ->
-                        componentVersionRegex.find(line)
-                            ?.groupValues
-                            ?.getOrNull(1)
-                            ?.let { version ->
-                                index to version
-                            }
-                    }
-                versionByLineIndex.forEach { (lineIndex, version) ->
-                    if (version != component.version) {
-                        throw GradleException("Component version at line ${lineIndex + 1} in $sourceFilePath is not up to date. Please launch updateDocumentation Gradle task.")
-                    }
+            component.getSourceFilePaths(project).forEach { filePath ->
+                componentsByFile.getOrPut(filePath) { mutableListOf() }.add(component)
+            }
+        }
+
+        componentsByFile.forEach { (filePath, components) ->
+            val content = File(filePath).readText()
+            val componentByDesignName = components.associateBy { it.designName }
+
+            val pattern = "> Design name: (.+?)\\s*\\n \\*\\n \\* > Design version: ([^\n]+)".toRegex()
+            val matches = pattern.findAll(content).toList()
+            matches.forEach { match ->
+                val designName = match.groupValues[1]
+                val version = match.groupValues[2]
+                val component = componentByDesignName[designName]
+                    ?: throw GradleException("Unknown design name '$designName' in $filePath. Expected one of: ${components.joinToString { it.designName }}.")
+
+                val componentVersion = if (component.version == "0.0.0") draftVersion else component.version
+                if (version != componentVersion) {
+                    throw GradleException("Design version for '$designName' in $filePath is '$version' but expected '${componentVersion}'. Please launch updateDocumentation Gradle task.")
                 }
             }
         }
@@ -88,13 +96,22 @@ tasks.register<DefaultTask>("checkDocumentation") {
 
 tasks.register<DefaultTask>("updateDocumentation") {
     doLast {
-        val componentVersionRegex = "(Design version: ).*".toRegex()
+        val componentsByFile = mutableMapOf<String, MutableList<Component>>()
         Component.entries.forEach { component ->
-            component.getSourceFilePaths(project).forEach { sourceFilePath ->
-                File(sourceFilePath).replace(componentVersionRegex) { matchResult ->
-                    "${matchResult.groupValues[1]}${component.version}"
-                }
+            component.getSourceFilePaths(project).forEach { filePath ->
+                componentsByFile.getOrPut(filePath) { mutableListOf() }.add(component)
             }
         }
+
+        componentsByFile.forEach { (filePath, components) ->
+            var content = File(filePath).readText()
+            components.forEach { component ->
+                val componentVersion = if (component.version == "0.0.0") draftVersion else component.version
+                val pattern = "(> Design name: ${component.designName}\\s*\\n \\*\\n \\* > Design version: )([^\n]+)".toRegex()
+                content = content.replace(pattern, "$1$componentVersion")
+            }
+
+            File(filePath).writeText(content)
+        }
     }
 }
diff --git a/core/src/main/java/com/orange/ouds/core/component/OudsAlertMessage.kt b/core/src/main/java/com/orange/ouds/core/component/OudsAlertMessage.kt
index bcdf80c6e0..c78ac18c95 100644
--- a/core/src/main/java/com/orange/ouds/core/component/OudsAlertMessage.kt
+++ b/core/src/main/java/com/orange/ouds/core/component/OudsAlertMessage.kt
@@ -69,6 +69,8 @@ import com.orange.ouds.theme.OudsThemeContract
  *
  * > Design guidelines: [unified-design-system.orange.com](https://r.orange.fr/r/S-ouds-doc-alert-message)
  *
+ * > Design name: Alert Message
+ *
  * > Design version: 1.1.0
  *
  * @param label Label displayed in the alert message. Main message that should be short, clear, and readable at a glance.
@@ -145,14 +147,14 @@ fun OudsAlertMessage(
             ) {
                 Column(verticalArrangement = Arrangement.spacedBy(spaceRowGap.value)) {
                     Text(
-                        modifier = Modifier.widthIn(max = OudsTheme.sizes.maxWidth.type.label.large),
+                        modifier = Modifier.widthIn(max = OudsTheme.sizes.maxWidth.label.large),
                         text = label,
                         color = status.contentColor,
                         style = OudsTheme.typography.label.moderate.large
                     )
                     description?.let {
                         Text(
-                            modifier = Modifier.widthIn(max = OudsTheme.sizes.maxWidth.type.label.medium),
+                            modifier = Modifier.widthIn(max = OudsTheme.sizes.maxWidth.label.medium),
                             text = description,
                             color = status.contentColor,
                             style = OudsTheme.typography.label.default.medium
@@ -387,7 +389,7 @@ private fun OudsAlertMessageBulletListItem(label: String, color: Color) {
             modifier = Modifier
                 .fillMaxHeight()
                 .wrapContentHeight() // Allows to center the text vertically when its height is smaller than the row height
-                .widthIn(max = OudsTheme.sizes.maxWidth.type.label.medium),
+                .widthIn(max = OudsTheme.sizes.maxWidth.label.medium),
             text = label,
             style = OudsTheme.typography.label.default.medium,
             color = color
diff --git a/core/src/main/java/com/orange/ouds/core/component/OudsBadge.kt b/core/src/main/java/com/orange/ouds/core/component/OudsBadge.kt
index 0f72ad0e36..07ea5e13f4 100644
--- a/core/src/main/java/com/orange/ouds/core/component/OudsBadge.kt
+++ b/core/src/main/java/com/orange/ouds/core/component/OudsBadge.kt
@@ -81,6 +81,8 @@ import kotlin.enums.enumEntries
  *
  * > Design guidelines: [unified-design-system.orange.com](https://r.orange.fr/r/S-ouds-doc-badge)
  *
+ * > Design name: Badge
+ *
  * > Design version: 1.2.0
  *
  * @param modifier The [Modifier] to be applied to this badge.
@@ -123,6 +125,8 @@ fun OudsBadge(
  *
  * > Design guidelines: [unified-design-system.orange.com](https://r.orange.fr/r/S-ouds-doc-badge-count)
  *
+ * > Design name: Badge Count
+ *
  * > Design version: 1.2.0
  *
  * @param count The number displayed in the badge. Minimum and maximum values are 0 and 99 respectively.
@@ -171,7 +175,9 @@ fun OudsBadge(
  *
  * > Design guidelines: [unified-design-system.orange.com](https://r.orange.fr/r/S-ouds-doc-badge-icon)
  *
- * > Design version: 1.2.0
+ * > Design name: Badge Icon
+ *
+ * > Design version: 1.3.0
  *
  * @param modifier The [Modifier] to be applied to this badge.
  * @param enabled Controls the enabled appearance of the badge.
@@ -325,7 +331,7 @@ private fun contentPadding(size: OudsBadgeSize, count: Int?, icon: OudsBadgeIcon
         when {
             count != null && size == OudsBadgeSize.Medium -> PaddingValues(horizontal = spacePaddingInlineMedium.value * scale)
             count != null && size == OudsBadgeSize.Large -> PaddingValues(horizontal = spacePaddingInlineLarge.value * scale)
-            icon != null && size in OudsBadgeSize.iconEntries -> PaddingValues(all = spaceInset.dp * scale)
+            icon != null && size in OudsBadgeSize.iconEntries -> PaddingValues(all = spaceInsetMediumLarge.dp * scale)
             else -> PaddingValues(all = 0.dp)
         }
     }
diff --git a/core/src/main/java/com/orange/ouds/core/component/OudsBottomSheetScaffold.kt b/core/src/main/java/com/orange/ouds/core/component/OudsBottomSheetScaffold.kt
index 514837ddf6..ca5db743be 100644
--- a/core/src/main/java/com/orange/ouds/core/component/OudsBottomSheetScaffold.kt
+++ b/core/src/main/java/com/orange/ouds/core/component/OudsBottomSheetScaffold.kt
@@ -52,6 +52,10 @@ import com.orange.ouds.theme.OudsThemeContract
  *
  * For a bottom sheet that appears in front of app content and requires user action to be dismissed (a modal behavior), consider using [OudsModalBottomSheet].
  *
+ * > Design name: Bottom Sheet
+ *
+ * > Design version: Draft
+ *
  * @param sheetContent The content of the bottom sheet.
  * @param modifier The [Modifier] to be applied to the entire scaffold.
  * @param scaffoldState The state of the bottom sheet scaffold, which controls its behavior. See [rememberBottomSheetScaffoldState].
@@ -86,7 +90,7 @@ fun OudsBottomSheetScaffold(
         modifier = modifier,
         scaffoldState = scaffoldState,
         sheetPeekHeight = sheetPeekHeight,
-        sheetContainerColor = OudsTheme.colorScheme.overlay.modal,
+        sheetContainerColor = OudsTheme.colorScheme.overlay.modalSheet,
         sheetContentColor = OudsTheme.colorScheme.content.default,
         sheetShadowElevation = OudsTheme.elevations.emphasized,
         sheetDragHandle = if (sheetDragHandle) {
diff --git a/core/src/main/java/com/orange/ouds/core/component/OudsBulletList.kt b/core/src/main/java/com/orange/ouds/core/component/OudsBulletList.kt
index 7e17a26a36..a748ef5487 100644
--- a/core/src/main/java/com/orange/ouds/core/component/OudsBulletList.kt
+++ b/core/src/main/java/com/orange/ouds/core/component/OudsBulletList.kt
@@ -88,7 +88,9 @@ private const val MaxLevelCount = 3
  *
  * > Design guidelines: [unified-design-system.orange.com](https://r.orange.fr/r/S-ouds-doc-bullet-list)
  *
- * > Design version: 1.0.0
+ * > Design name: Bullet List
+ *
+ * > Design version: 1.1.0
  *
  * @param modifier [Modifier] applied to the list.
  * @param type The visual type of the list (e.g., ordered, unordered, bare). See [OudsBulletListType].
@@ -244,8 +246,8 @@ private fun OudsBulletListItem(
                 parentNodes = parentNodes
             )
             val textMaxWidth = when (currentTextStyle.fontSize) {
-                OudsBulletListFontSize.BodyLarge -> OudsTheme.sizes.maxWidth.type.body.large
-                OudsBulletListFontSize.BodyMedium -> OudsTheme.sizes.maxWidth.type.body.medium
+                OudsBulletListFontSize.BodyLarge -> OudsTheme.sizes.maxWidth.body.large
+                OudsBulletListFontSize.BodyMedium -> OudsTheme.sizes.maxWidth.body.medium
             }
             Text(
                 modifier = Modifier
diff --git a/core/src/main/java/com/orange/ouds/core/component/OudsButton.kt b/core/src/main/java/com/orange/ouds/core/component/OudsButton.kt
index a2e678c69d..8dd5aeee5c 100644
--- a/core/src/main/java/com/orange/ouds/core/component/OudsButton.kt
+++ b/core/src/main/java/com/orange/ouds/core/component/OudsButton.kt
@@ -95,6 +95,8 @@ import com.orange.ouds.theme.tokens.components.OudsButtonMonoTokens
  *
  * > Design guidelines: [unified-design-system.orange.com](https://r.orange.fr/r/S-ouds-doc-button)
  *
+ * > Design name: Button
+ *
  * > Design version: 3.2.0
  *
  * @param label Label displayed in the button describing the button action. Use action verbs or phrases to tell the user what will happen next.
@@ -150,6 +152,8 @@ fun OudsButton(
  *
  * > Design guidelines: [unified-design-system.orange.com](https://r.orange.fr/r/S-ouds-doc-button)
  *
+ * > Design name: Button
+ *
  * > Design version: 3.2.0
  *
  * @param icon Icon displayed in the button. Use an icon to add additional affordance where the icon has a clear and well-established meaning.
@@ -206,6 +210,8 @@ fun OudsButton(
  *
  * > Design guidelines: [unified-design-system.orange.com](https://r.orange.fr/r/S-ouds-doc-button)
  *
+ * > Design name: Button
+ *
  * > Design version: 3.2.0
  *
  * @param icon Icon displayed in the button. Use an icon to add additional affordance where the icon has a clear and well-established meaning.
diff --git a/core/src/main/java/com/orange/ouds/core/component/OudsCheckbox.kt b/core/src/main/java/com/orange/ouds/core/component/OudsCheckbox.kt
index d9d5a7938f..33bf8c19df 100644
--- a/core/src/main/java/com/orange/ouds/core/component/OudsCheckbox.kt
+++ b/core/src/main/java/com/orange/ouds/core/component/OudsCheckbox.kt
@@ -22,7 +22,7 @@ import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.heightIn
-import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.sizeIn
 import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.selection.triStateToggleable
 import androidx.compose.foundation.shape.RoundedCornerShape
@@ -70,6 +70,8 @@ import com.orange.ouds.theme.OudsThemeContract
  *
  * > Design guidelines: [unified-design-system.orange.com](https://r.orange.fr/r/S-ouds-doc-checkbox)
  *
+ * > Design name: Checkbox
+ *
  * > Design version: 2.4.0
  *
  * @see [OudsTriStateCheckbox] If you require support for an indeterminate state.
@@ -124,6 +126,8 @@ fun OudsCheckbox(
  *
  * > Design guidelines: [unified-design-system.orange.com](https://r.orange.fr/r/S-ouds-doc-checkbox)
  *
+ * > Design name: Checkbox
+ *
  * > Design version: 2.4.0
  *
  * @see [OudsCheckbox] If you need a simple component that represents [Boolean] state.
@@ -218,13 +222,14 @@ internal fun OudsCheckboxIndicator(
     value: ToggleableState,
     error: Boolean
 ) {
+    val controlItemTokens = OudsTheme.componentsTokens.controlItem
     val checkboxTokens = OudsTheme.componentsTokens.checkbox
     val selected = value != ToggleableState.Off
     val shape = RoundedCornerShape(checkboxTokens.borderRadius.value)
 
     Box(
         modifier = Modifier
-            .size(checkboxTokens.sizeIndicator.value)
+            .sizeIn(minWidth = controlItemTokens.sizeAssetSmall.value, minHeight = controlItemTokens.sizeAssetMedium.value)
             .clip(shape)
             .indicatorBorder(state = state, selected = selected, error = error, shape = shape)
     ) {
@@ -315,7 +320,12 @@ private fun backgroundColor(state: OudsControlState): Color {
 }
 
 @Preview(name = "Light", widthDp = OudsPreviewableComponent.Checkbox.PreviewWidthDp, device = OudsPreviewDevice)
-@Preview(name = "Dark", uiMode = UI_MODE_NIGHT_YES or UI_MODE_TYPE_NORMAL, widthDp = OudsPreviewableComponent.Checkbox.PreviewWidthDp, device = OudsPreviewDevice)
+@Preview(
+    name = "Dark",
+    uiMode = UI_MODE_NIGHT_YES or UI_MODE_TYPE_NORMAL,
+    widthDp = OudsPreviewableComponent.Checkbox.PreviewWidthDp,
+    device = OudsPreviewDevice
+)
 @Composable
 @Suppress("PreviewShouldNotBeCalledRecursively")
 private fun PreviewOudsCheckbox(@PreviewParameter(OudsCheckboxPreviewParameterProvider::class) parameter: OudsCheckboxPreviewParameter) {
@@ -323,7 +333,12 @@ private fun PreviewOudsCheckbox(@PreviewParameter(OudsCheckboxPreviewParameterPr
 }
 
 @Preview(name = "Light", widthDp = OudsPreviewableComponent.Checkbox.PreviewWidthDp, device = OudsPreviewDevice)
-@Preview(name = "Dark", uiMode = UI_MODE_NIGHT_YES or UI_MODE_TYPE_NORMAL, widthDp = OudsPreviewableComponent.Checkbox.PreviewWidthDp, device = OudsPreviewDevice)
+@Preview(
+    name = "Dark",
+    uiMode = UI_MODE_NIGHT_YES or UI_MODE_TYPE_NORMAL,
+    widthDp = OudsPreviewableComponent.Checkbox.PreviewWidthDp,
+    device = OudsPreviewDevice
+)
 @Composable
 internal fun PreviewOudsCheckboxHighContrastModeEnabled(@PreviewParameter(OudsCheckboxHighContrastModePreviewParameterProvider::class) parameter: ToggleableState) {
     PreviewOudsCheckbox(
diff --git a/core/src/main/java/com/orange/ouds/core/component/OudsCheckboxItem.kt b/core/src/main/java/com/orange/ouds/core/component/OudsCheckboxItem.kt
index 2eaf2993c6..f394247d26 100644
--- a/core/src/main/java/com/orange/ouds/core/component/OudsCheckboxItem.kt
+++ b/core/src/main/java/com/orange/ouds/core/component/OudsCheckboxItem.kt
@@ -53,6 +53,8 @@ import com.orange.ouds.theme.OudsThemeContract
  *
  * > Design guidelines: [unified-design-system.orange.com](https://r.orange.fr/r/S-ouds-doc-checkbox)
  *
+ * > Design name: Checkbox
+ *
  * > Design version: 2.4.0
  *
  * @see [OudsTriStateCheckboxItem] If you need an indeterminate state for the item's checkbox.
diff --git a/core/src/main/java/com/orange/ouds/core/component/OudsColoredBox.kt b/core/src/main/java/com/orange/ouds/core/component/OudsColoredBox.kt
index 2d6083b1cd..9f9aef2e1d 100644
--- a/core/src/main/java/com/orange/ouds/core/component/OudsColoredBox.kt
+++ b/core/src/main/java/com/orange/ouds/core/component/OudsColoredBox.kt
@@ -134,9 +134,9 @@ enum class OudsColoredBoxColor {
 
         fun fromKeyToken(keyToken: OudsColorKeyToken.Overlay): OudsColoredBoxColor {
             return when (keyToken) {
-                OudsColorKeyToken.Overlay.Drag -> error("OudsColoredBox does not support this color.")
+                OudsColorKeyToken.Overlay.Backdrop, OudsColorKeyToken.Overlay.Drag -> error("OudsColoredBox does not support this color.")
                 OudsColorKeyToken.Overlay.Dropdown -> OverlayDropdown
-                OudsColorKeyToken.Overlay.Modal -> OverlayModal
+                OudsColorKeyToken.Overlay.ModalSheet -> OverlayModal
                 OudsColorKeyToken.Overlay.Tooltip -> OverlayTooltip
             }
         }
@@ -178,7 +178,7 @@ enum class OudsColoredBoxColor {
                 BrandSecondary -> OudsColorKeyToken.Surface.Brand.Secondary
                 BrandTertiary -> OudsColorKeyToken.Surface.Brand.Tertiary
                 OverlayDropdown -> OudsColorKeyToken.Overlay.Dropdown
-                OverlayModal -> OudsColorKeyToken.Overlay.Modal
+                OverlayModal -> OudsColorKeyToken.Overlay.ModalSheet
                 OverlayTooltip -> OudsColorKeyToken.Overlay.Tooltip
                 StatusAccentEmphasized -> OudsColorKeyToken.Surface.Status.Accent.Emphasized
                 StatusAccentMuted -> OudsColorKeyToken.Surface.Status.Accent.Muted
diff --git a/core/src/main/java/com/orange/ouds/core/component/OudsControlItem.kt b/core/src/main/java/com/orange/ouds/core/component/OudsControlItem.kt
index f3877757ba..5e842ba1f6 100644
--- a/core/src/main/java/com/orange/ouds/core/component/OudsControlItem.kt
+++ b/core/src/main/java/com/orange/ouds/core/component/OudsControlItem.kt
@@ -126,7 +126,7 @@ internal fun OudsControlItem(
             Box(
                 modifier = Modifier
                     .height(IntrinsicSize.Min)
-                    .heightIn(min = controlItemTokens.sizeMinHeight.dp)
+                    .heightIn(min = controlItemTokens.sizeMinHeightDefault.dp)
                     .widthIn(min = controlItemTokens.sizeMinWidth.dp, max = if (constrainedMaxWidth) controlItemTokens.sizeMaxWidth.dp else Dp.Unspecified)
                     .background(color = backgroundColor, shape = shape)
                     .then(contentModifier)
@@ -223,7 +223,7 @@ class OudsControlItemIcon private constructor(
 
     @Composable
     override fun Content(modifier: Modifier) {
-        super.Content(modifier.size(OudsTheme.componentsTokens.controlItem.sizeIcon.value))
+        super.Content(modifier.size(OudsTheme.componentsTokens.controlItem.sizeAssetSmall.value))
     }
 }
 
@@ -260,7 +260,7 @@ private fun ErrorMessageText(text: String, edgeToEdge: Boolean) {
             modifier = Modifier
                 .fillMaxWidth()
                 .padding(horizontal = contentHorizontalPadding(edgeToEdge = edgeToEdge))
-                .padding(top = spacePaddingBlockTopErrorText.value)
+                .padding(top = spacePaddingBlockTopHelperText.value)
                 .clearAndSetSemantics {
                     error(text)
                 },
diff --git a/core/src/main/java/com/orange/ouds/core/component/OudsDivider.kt b/core/src/main/java/com/orange/ouds/core/component/OudsDivider.kt
index 966664fcb5..1ef9f11e17 100644
--- a/core/src/main/java/com/orange/ouds/core/component/OudsDivider.kt
+++ b/core/src/main/java/com/orange/ouds/core/component/OudsDivider.kt
@@ -42,6 +42,8 @@ import com.orange.ouds.theme.OudsThemeContract
  *
  * > Design guidelines: [unified-design-system.orange.com](https://r.orange.fr/r/S-ouds-doc-divider)
  *
+ * > Design name: Divider
+ *
  * > Design version: 1.0.0
  *
  * @param modifier [Modifier] applied to the divider.
@@ -68,6 +70,8 @@ fun OudsHorizontalDivider(
  *
  * > Design guidelines: [unified-design-system.orange.com](https://r.orange.fr/r/S-ouds-doc-divider)
  *
+ * > Design name: Divider
+ *
  * > Design version: 1.0.0
  *
  * @param modifier [Modifier] applied to the divider.
diff --git a/core/src/main/java/com/orange/ouds/core/component/OudsFilterChip.kt b/core/src/main/java/com/orange/ouds/core/component/OudsFilterChip.kt
index 76a0efe3f1..04b849ac2f 100644
--- a/core/src/main/java/com/orange/ouds/core/component/OudsFilterChip.kt
+++ b/core/src/main/java/com/orange/ouds/core/component/OudsFilterChip.kt
@@ -132,7 +132,9 @@ fun OudsFilterChip(
  *
  * > Design guidelines: [unified-design-system.orange.com](https://r.orange.fr/r/S-ouds-doc-filter-chip)
  *
- * > Design version: 1.3.0
+ * > Design name: Filter Chip
+ *
+ * > Design version: 1.4.0
  *
  * @param selected Whether this chip is selected or not.
  * @param onClick Called when this chip is clicked.
diff --git a/core/src/main/java/com/orange/ouds/core/component/OudsFloatingActionButton.kt b/core/src/main/java/com/orange/ouds/core/component/OudsFloatingActionButton.kt
index 0166d2c289..66e8816df2 100644
--- a/core/src/main/java/com/orange/ouds/core/component/OudsFloatingActionButton.kt
+++ b/core/src/main/java/com/orange/ouds/core/component/OudsFloatingActionButton.kt
@@ -73,6 +73,10 @@ import kotlin.enums.enumEntries
  * FAB typically contains an icon, for a FAB with text and an icon, see
  * [OudsExtendedFloatingActionButton].
  *
+ * > Design name: FAB
+ *
+ * > Design version: Draft
+ *
  * @param icon Icon for this FAB.
  * @param onClick Called when this FAB is clicked.
  * @param modifier The [Modifier] to be applied to this FAB.
diff --git a/core/src/main/java/com/orange/ouds/core/component/OudsInlineAlert.kt b/core/src/main/java/com/orange/ouds/core/component/OudsInlineAlert.kt
index b1aa1529da..0d8064cc95 100644
--- a/core/src/main/java/com/orange/ouds/core/component/OudsInlineAlert.kt
+++ b/core/src/main/java/com/orange/ouds/core/component/OudsInlineAlert.kt
@@ -44,7 +44,9 @@ import com.orange.ouds.theme.OudsThemeContract
  *
  * > Design guidelines: [unified-design-system.orange.com](https://r.orange.fr/r/S-ouds-doc-inline-alert)
  *
- * > Design version: 1.1.0
+ * > Design name: Inline Alert
+ *
+ * > Design version: 1.0.0
  *
  * @param label Label displayed in the inline alert. Main message that should be short, clear, and readable at a glance.
  * @param modifier [Modifier] applied to the inline alert.
@@ -83,7 +85,7 @@ fun OudsInlineAlert(
                 )
             )
             Text(
-                modifier = Modifier.widthIn(max = OudsTheme.sizes.maxWidth.type.label.large),
+                modifier = Modifier.widthIn(max = OudsTheme.sizes.maxWidth.label.large),
                 text = label,
                 color = status.textColor,
                 style = OudsTheme.typography.label.moderate.large
diff --git a/core/src/main/java/com/orange/ouds/core/component/OudsInputTag.kt b/core/src/main/java/com/orange/ouds/core/component/OudsInputTag.kt
index 6cff3e5980..f91957e9de 100644
--- a/core/src/main/java/com/orange/ouds/core/component/OudsInputTag.kt
+++ b/core/src/main/java/com/orange/ouds/core/component/OudsInputTag.kt
@@ -63,7 +63,9 @@ import com.orange.ouds.theme.OudsThemeContract
  *
  * > Design guidelines: [unified-design-system.orange.com](https://r.orange.fr/r/S-ouds-doc-input-tag)
  *
- * > Design version: 1.4.0
+ * > Design name: Input Tag
+ *
+ * > Design version: 1.2.0
  *
  * @param label The text label displayed inside the input tag.
  * @param onClick Called when the input tag is clicked.
diff --git a/core/src/main/java/com/orange/ouds/core/component/OudsLink.kt b/core/src/main/java/com/orange/ouds/core/component/OudsLink.kt
index 522443d61d..dff1396504 100644
--- a/core/src/main/java/com/orange/ouds/core/component/OudsLink.kt
+++ b/core/src/main/java/com/orange/ouds/core/component/OudsLink.kt
@@ -70,6 +70,8 @@ import com.orange.ouds.theme.tokens.components.OudsLinkMonoTokens
  *
  * > Design guidelines: [unified-design-system.orange.com](https://r.orange.fr/r/S-ouds-doc-link)
  *
+ * > Design name: Link
+ *
  * > Design version: 2.2.0
  *
  * @param label Label describing what is being linked to.
@@ -109,6 +111,8 @@ fun OudsLink(
  *
  * > Design guidelines: [unified-design-system.orange.com](https://r.orange.fr/r/S-ouds-doc-link)
  *
+ * > Design name: Link
+ *
  * > Design version: 2.2.0
  *
  * @param label Label describing what is being linked to.
@@ -152,6 +156,8 @@ fun OudsLink(
  *
  * > Design guidelines: [unified-design-system.orange.com](https://r.orange.fr/r/S-ouds-doc-link)
  *
+ * > Design name: Link
+ *
  * > Design version: 2.2.0
  *
  * @param label Label describing what is being linked to.
diff --git a/core/src/main/java/com/orange/ouds/core/component/OudsModalBottomSheet.kt b/core/src/main/java/com/orange/ouds/core/component/OudsModalBottomSheet.kt
index 3581f2293b..93fad5d7ca 100644
--- a/core/src/main/java/com/orange/ouds/core/component/OudsModalBottomSheet.kt
+++ b/core/src/main/java/com/orange/ouds/core/component/OudsModalBottomSheet.kt
@@ -47,6 +47,10 @@ import com.orange.ouds.theme.OudsThemeContract
  *
  * For a bottom sheet that co-exists with the main screen content, use [OudsBottomSheetScaffold].
  *
+ * > Design name: Bottom Sheet
+ *
+ * > Design version: Draft
+ *
  * @param onDismissRequest Callback executed when the user clicks outside the bottom sheet, after sheet animates to [Hidden].
  * @param modifier Optional [Modifier] for the modal bottom sheet.
  * @param sheetState The state of the bottom sheet, which controls its visibility and allows for programmatic control. See [rememberModalBottomSheetState].
@@ -77,9 +81,9 @@ fun OudsModalBottomSheet(
         modifier = modifier,
         sheetState = sheetState,
         sheetGesturesEnabled = sheetGesturesEnabled,
-        containerColor = OudsTheme.colorScheme.overlay.modal,
+        containerColor = OudsTheme.colorScheme.overlay.modalSheet,
         contentColor = OudsTheme.colorScheme.content.default,
-        scrimColor = OudsTheme.colorScheme.always.black.copy(alpha = 0.64f),
+        scrimColor = OudsTheme.colorScheme.overlay.backdrop,
         dragHandle = if (dragHandle) {
             { OudsBottomSheetDefaults.DragHandle() }
         } else {
diff --git a/core/src/main/java/com/orange/ouds/core/component/OudsNavigationBar.kt b/core/src/main/java/com/orange/ouds/core/component/OudsNavigationBar.kt
index f0dd7eaa8f..0d21f58707 100644
--- a/core/src/main/java/com/orange/ouds/core/component/OudsNavigationBar.kt
+++ b/core/src/main/java/com/orange/ouds/core/component/OudsNavigationBar.kt
@@ -115,6 +115,8 @@ val OudsNavigationBarHeight = 80.dp
  *
  * > Design guidelines: [unified-design-system.orange.com](https://r.orange.fr/r/S-ouds-doc-android-navigation-bar)
  *
+ * > Design name: Navigation Bar
+ *
  * > Design version: 1.0.0
  *
  * @param items List of [OudsNavigationBarItem] to display in the navigation bar.
@@ -186,6 +188,8 @@ fun OudsNavigationBar(
  *
  * > Design guidelines: [unified-design-system.orange.com](https://r.orange.fr/r/S-ouds-doc-android-navigation-bar)
  *
+ * > Design name: Navigation Bar
+ *
  * > Design version: 1.0.0
  *
  * @param selected Whether this item is selected or not.
@@ -279,25 +283,25 @@ data class OudsNavigationBarItem(
 private fun Modifier.indicator(state: OudsNavigationBarItemState, selected: Boolean, iconPosition: NavigationItemIconPosition): Modifier {
     with(OudsTheme.componentsTokens.bar) {
         val indicatorColor = topIndicatorColor(state = state)
-        val indicatorBottomCornersRadius = borderRadiusActiveIndicatorCustomTop.value
-        val opacityActiveIndicatorCustomValue = opacityActiveIndicatorCustom.value
+        val indicatorBottomCornersRadius = borderRadiusCurrentIndicatorCustomTop.value
+        val opacityCurrentIndicatorCustomValue = opacityCurrentIndicatorCustom.value
 
         val indicatorWidthScale by animateFloatAsState(
             targetValue = if (selected || state == OudsNavigationBarItemState.Hovered) 1.0f else 0.0f,
             animationSpec = tween(200)
         )
 
-        return if (indicatorWidthScale == 0f || opacityActiveIndicatorCustomValue == 0f) {
+        return if (indicatorWidthScale == 0f || opacityCurrentIndicatorCustomValue == 0f) {
             this@indicator
         } else {
             drawWithContent {
-                val indicatorAlphaColor = indicatorColor.copy(alpha = indicatorColor.alpha * opacityActiveIndicatorCustomValue)
-                val indicatorHeight = sizeHeightActiveIndicatorCustom.dp.toPx()
+                val indicatorAlphaColor = indicatorColor.copy(alpha = indicatorColor.alpha * opacityCurrentIndicatorCustomValue)
+                val indicatorHeight = sizeHeightCurrentIndicatorCustom.dp.toPx()
                 val indicatorFullWidth: Float
                 val indicatorCenterX: Float
                 when (iconPosition) {
                     NavigationItemIconPosition.Top -> {
-                        indicatorFullWidth = sizeWidthActiveIndicatorCustomTop.dp.toPx()
+                        indicatorFullWidth = sizeWidthCurrentIndicatorCustomTop.dp.toPx()
                         indicatorCenterX = size.width / 2
                     }
                     else -> {
@@ -366,10 +370,10 @@ private fun contentColor(state: OudsNavigationBarItemState, selected: Boolean):
 private fun materialIndicatorColor(state: OudsNavigationBarItemState, selected: Boolean): Color {
     return with(OudsTheme.componentsTokens.bar) {
         when (state) {
-            OudsNavigationBarItemState.Enabled -> if (selected) colorActiveIndicatorAndroidSelectedEnabled.value else OudsTheme.colorScheme.opacity.transparent
-            OudsNavigationBarItemState.Hovered -> if (selected) colorActiveIndicatorAndroidSelectedHover.value else colorActiveIndicatorAndroidUnselectedHover.value
-            OudsNavigationBarItemState.Pressed -> if (selected) colorActiveIndicatorAndroidSelectedPressed.value else colorActiveIndicatorAndroidUnselectedPressed.value
-            OudsNavigationBarItemState.Focused -> if (selected) colorActiveIndicatorAndroidSelectedFocus.value else colorActiveIndicatorAndroidUnselectedFocus.value
+            OudsNavigationBarItemState.Enabled -> if (selected) colorCurrentIndicatorAndroidSelectedEnabled.value else OudsTheme.colorScheme.opacity.transparent
+            OudsNavigationBarItemState.Hovered -> if (selected) colorCurrentIndicatorAndroidSelectedHover.value else colorCurrentIndicatorAndroidUnselectedHover.value
+            OudsNavigationBarItemState.Pressed -> if (selected) colorCurrentIndicatorAndroidSelectedPressed.value else colorCurrentIndicatorAndroidUnselectedPressed.value
+            OudsNavigationBarItemState.Focused -> if (selected) colorCurrentIndicatorAndroidSelectedFocus.value else colorCurrentIndicatorAndroidUnselectedFocus.value
         }
     }
 }
@@ -378,10 +382,10 @@ private fun materialIndicatorColor(state: OudsNavigationBarItemState, selected:
 private fun topIndicatorColor(state: OudsNavigationBarItemState): Color {
     return with(OudsTheme.componentsTokens.bar) {
         when (state) {
-            OudsNavigationBarItemState.Enabled -> colorActiveIndicatorCustomSelectedEnabled.value
-            OudsNavigationBarItemState.Hovered -> colorActiveIndicatorCustomSelectedHover.value
-            OudsNavigationBarItemState.Pressed -> colorActiveIndicatorCustomSelectedPressed.value
-            OudsNavigationBarItemState.Focused -> colorActiveIndicatorCustomSelectedFocus.value
+            OudsNavigationBarItemState.Enabled -> colorCurrentIndicatorCustomSelectedEnabled.value
+            OudsNavigationBarItemState.Hovered -> colorCurrentIndicatorCustomSelectedHover.value
+            OudsNavigationBarItemState.Pressed -> colorCurrentIndicatorCustomSelectedPressed.value
+            OudsNavigationBarItemState.Focused -> colorCurrentIndicatorCustomSelectedFocus.value
         }
     }
 }
diff --git a/core/src/main/java/com/orange/ouds/core/component/OudsPasswordInput.kt b/core/src/main/java/com/orange/ouds/core/component/OudsPasswordInput.kt
index 31bc3330cb..1b4b403619 100644
--- a/core/src/main/java/com/orange/ouds/core/component/OudsPasswordInput.kt
+++ b/core/src/main/java/com/orange/ouds/core/component/OudsPasswordInput.kt
@@ -59,7 +59,9 @@ import com.orange.ouds.theme.OudsThemeSettings
  *
  * > Design guidelines: [unified-design-system.orange.com](https://r.orange.fr/r/S-ouds-doc-password-input)
  *
- * > Design version: 1.2.0
+ * > Design name: Password Input
+ *
+ * > Design version: 1.3.0
  *
  * @param state The editable text state of the password input, including the text itself, position of the cursor or selection and the text obfuscation mode.
  * @param modifier [Modifier] applied to the password input.
diff --git a/core/src/main/java/com/orange/ouds/core/component/OudsPinCodeInput.kt b/core/src/main/java/com/orange/ouds/core/component/OudsPinCodeInput.kt
index 35a15e6fe2..a5329e89ef 100644
--- a/core/src/main/java/com/orange/ouds/core/component/OudsPinCodeInput.kt
+++ b/core/src/main/java/com/orange/ouds/core/component/OudsPinCodeInput.kt
@@ -91,7 +91,9 @@ import kotlinx.coroutines.launch
  *
  * > Design guidelines: [unified-design-system.orange.com](https://r.orange.fr/r/S-ouds-doc-pin-code-input)
  *
- * > Design version: 1.2.0
+ * > Design name: PIN Code Input
+ *
+ * > Design version: 1.3.0
  *
  * @param value The current PIN code value as a string of digits. The value is automatically truncated to the specified [length].
  * @param onValueChange Callback invoked when the PIN code value changes. The updated PIN code value comes as a parameter of the callback.
diff --git a/core/src/main/java/com/orange/ouds/core/component/OudsRadioButton.kt b/core/src/main/java/com/orange/ouds/core/component/OudsRadioButton.kt
index d3a8432bfd..d6f8684439 100644
--- a/core/src/main/java/com/orange/ouds/core/component/OudsRadioButton.kt
+++ b/core/src/main/java/com/orange/ouds/core/component/OudsRadioButton.kt
@@ -68,6 +68,8 @@ import com.orange.ouds.theme.OudsThemeContract
  *
  * > Design guidelines: [unified-design-system.orange.com](https://r.orange.fr/r/S-ouds-doc-radio-button)
  *
+ * > Design name: Radio Button
+ *
  * > Design version: 1.4.0
  *
  * @see [OudsRadioButtonItem] If you want to use a radio button with an associated label and other optional elements.
@@ -159,7 +161,7 @@ internal fun OudsRadioButtonIndicator(state: OudsControlState, selected: Boolean
 
     Box(
         modifier = Modifier
-            .size(radioButtonTokens.sizeIndicator.value)
+            .size(OudsTheme.componentsTokens.controlItem.sizeControlIndicator.value)
             .clip(shape)
             .indicatorBorder(state = state, selected = selected, error = error, shape = shape)
     ) {
diff --git a/core/src/main/java/com/orange/ouds/core/component/OudsRadioButtonItem.kt b/core/src/main/java/com/orange/ouds/core/component/OudsRadioButtonItem.kt
index 15dc7c7023..29fb489d1a 100644
--- a/core/src/main/java/com/orange/ouds/core/component/OudsRadioButtonItem.kt
+++ b/core/src/main/java/com/orange/ouds/core/component/OudsRadioButtonItem.kt
@@ -56,6 +56,8 @@ import com.orange.ouds.theme.OudsThemeContract
  *
  * > Design guidelines: [unified-design-system.orange.com](https://r.orange.fr/r/S-ouds-doc-radio-button)
  *
+ * > Design name: Radio Button
+ *
  * > Design version: 1.4.0
  *
  * @see [OudsRadioButton] If you want to use a standalone radio button.
diff --git a/core/src/main/java/com/orange/ouds/core/component/OudsSuggestionChip.kt b/core/src/main/java/com/orange/ouds/core/component/OudsSuggestionChip.kt
index c5b53bed8b..33b2d58c98 100644
--- a/core/src/main/java/com/orange/ouds/core/component/OudsSuggestionChip.kt
+++ b/core/src/main/java/com/orange/ouds/core/component/OudsSuggestionChip.kt
@@ -38,7 +38,9 @@ import com.orange.ouds.theme.OudsThemeContract
  *
  * > Design guidelines: [unified-design-system.orange.com](https://r.orange.fr/r/S-ouds-doc-suggestion-chip)
  *
- * > Design version: 1.3.0
+ * > Design name: Suggestion Chip
+ *
+ * > Design version: 1.4.0
  *
  * @param onClick Called when this chip is clicked.
  * @param label Text label displayed in the chip.
@@ -82,7 +84,9 @@ fun OudsSuggestionChip(
  *
  * > Design guidelines: [unified-design-system.orange.com](https://r.orange.fr/r/S-ouds-doc-suggestion-chip)
  *
- * > Design version: 1.3.0
+ * > Design name: Suggestion Chip
+ *
+ * > Design version: 1.4.0
  *
  * @param onClick Called when this chip is clicked.
  * @param icon Icon displayed in the chip. Use an icon to add additional affordance where the icon has a clear and well-established meaning.
@@ -126,7 +130,9 @@ fun OudsSuggestionChip(
  *
  * > Design guidelines: [unified-design-system.orange.com](https://r.orange.fr/r/S-ouds-doc-suggestion-chip)
  *
- * > Design version: 1.3.0
+ * > Design name: Suggestion Chip
+ *
+ * > Design version: 1.4.0
  *
  * @param onClick Called when this chip is clicked.
  * @param label Text label displayed in the chip.
diff --git a/core/src/main/java/com/orange/ouds/core/component/OudsSwitch.kt b/core/src/main/java/com/orange/ouds/core/component/OudsSwitch.kt
index 0206175cb1..e074cf3450 100644
--- a/core/src/main/java/com/orange/ouds/core/component/OudsSwitch.kt
+++ b/core/src/main/java/com/orange/ouds/core/component/OudsSwitch.kt
@@ -68,6 +68,8 @@ import com.orange.ouds.theme.OudsThemeContract
  *
  * > Design guidelines: [unified-design-system.orange.com](https://r.orange.fr/r/S-ouds-doc-switch)
  *
+ * > Design name: Switch
+ *
  * > Design version: 1.5.0
  *
  * @see [OudsSwitchItem] If you want to use a switch with an associated label and other optional elements.
diff --git a/core/src/main/java/com/orange/ouds/core/component/OudsSwitchItem.kt b/core/src/main/java/com/orange/ouds/core/component/OudsSwitchItem.kt
index 806ed6259d..2599246954 100644
--- a/core/src/main/java/com/orange/ouds/core/component/OudsSwitchItem.kt
+++ b/core/src/main/java/com/orange/ouds/core/component/OudsSwitchItem.kt
@@ -52,6 +52,8 @@ import com.orange.ouds.theme.OudsThemeContract
  *
  * > Design guidelines: [unified-design-system.orange.com](https://r.orange.fr/r/S-ouds-doc-switch)
  *
+ * > Design name: Switch
+ *
  * > Design version: 1.5.0
  *
  * @see [OudsSwitch] If you want to use a standalone switch.
diff --git a/core/src/main/java/com/orange/ouds/core/component/OudsTag.kt b/core/src/main/java/com/orange/ouds/core/component/OudsTag.kt
index 92f4715044..71d2111330 100644
--- a/core/src/main/java/com/orange/ouds/core/component/OudsTag.kt
+++ b/core/src/main/java/com/orange/ouds/core/component/OudsTag.kt
@@ -82,7 +82,9 @@ import kotlin.enums.enumEntries
  *
  * > Design guidelines: [unified-design-system.orange.com](https://r.orange.fr/r/S-ouds-doc-tag)
  *
- * > Design version: 1.4.0
+ * > Design name: Tag
+ *
+ * > Design version: 1.5.0
  *
  * @param label The label displayed in the tag.
  * @param modifier [Modifier] applied to the tag.
diff --git a/core/src/main/java/com/orange/ouds/core/component/OudsTextArea.kt b/core/src/main/java/com/orange/ouds/core/component/OudsTextArea.kt
index 10a6faa81d..b5094cae44 100644
--- a/core/src/main/java/com/orange/ouds/core/component/OudsTextArea.kt
+++ b/core/src/main/java/com/orange/ouds/core/component/OudsTextArea.kt
@@ -97,7 +97,9 @@ import com.orange.ouds.theme.OudsThemeSettings
  *
  * > Design guidelines: [unified-design-system.orange.com](https://r.orange.fr/r/S-ouds-doc-text-area)
  *
- * > Design version: 1.1.0
+ * > Design name: Text Area
+ *
+ * > Design version: 1.2.0
  *
  * @param textFieldState The editable text state of the text area, including both the text itself and position of the cursor or selection.
  * @param modifier [Modifier] applied to the text area.
@@ -225,7 +227,9 @@ fun OudsTextArea(
  *
  * > Design guidelines: [unified-design-system.orange.com](https://r.orange.fr/r/S-ouds-doc-text-area)
  *
- * > Design version: 1.1.0
+ * > Design name: Text Area
+ *
+ * > Design version: 1.2.0
  *
  * @param value Input text to be shown in the text area.
  * @param onValueChange Callback that is triggered when the input service updates the text. An updated text comes as a parameter of the callback.
@@ -344,7 +348,9 @@ fun OudsTextArea(
  *
  * > Design guidelines: [unified-design-system.orange.com](https://r.orange.fr/r/S-ouds-doc-text-area)
  *
- * > Design version: 1.1.0
+ * > Design name: Text Area
+ *
+ * > Design version: 1.2.0
  *
  * @param value The [androidx.compose.ui.text.input.TextFieldValue] to be shown in the text area.
  * @param onValueChange Called when the input service updates the values in [TextFieldValue].
diff --git a/core/src/main/java/com/orange/ouds/core/component/OudsTextInput.kt b/core/src/main/java/com/orange/ouds/core/component/OudsTextInput.kt
index e76739d7b2..66405c1035 100644
--- a/core/src/main/java/com/orange/ouds/core/component/OudsTextInput.kt
+++ b/core/src/main/java/com/orange/ouds/core/component/OudsTextInput.kt
@@ -110,7 +110,9 @@ import com.orange.ouds.theme.OudsThemeSettings
  *
  * > Design guidelines: [unified-design-system.orange.com](https://r.orange.fr/r/S-ouds-doc-text-input)
  *
- * > Design version: 1.3.0
+ * > Design name: Text Input
+ *
+ * > Design version: 1.4.0
  *
  * @param textFieldState The editable text state of the text input, including both the text itself and position of the cursor or selection.
  * @param modifier [Modifier] applied to the text input.
@@ -245,7 +247,9 @@ fun OudsTextInput(
  *
  * > Design guidelines: [unified-design-system.orange.com](https://r.orange.fr/r/S-ouds-doc-text-input)
  *
- * > Design version: 1.3.0
+ * > Design name: Text Input
+ *
+ * > Design version: 1.4.0
  *
  * @param value Input text to be shown in the text field.
  * @param onValueChange Callback that is triggered when the input service updates the text. An updated text comes as a parameter of the callback.
@@ -374,7 +378,9 @@ fun OudsTextInput(
  *
  * > Design guidelines: [unified-design-system.orange.com](https://r.orange.fr/r/S-ouds-doc-text-input)
  *
- * > Design version: 1.3.0
+ * > Design name: Text Input
+ *
+ * > Design version: 1.4.0
  *
  * @param value The [androidx.compose.ui.text.input.TextFieldValue] to be shown in the text input.
  * @param onValueChange Called when the input service updates the values in [TextFieldValue].
diff --git a/core/src/main/java/com/orange/ouds/core/component/OudsTopAppBar.kt b/core/src/main/java/com/orange/ouds/core/component/OudsTopAppBar.kt
index b111142261..2d8eac31ed 100644
--- a/core/src/main/java/com/orange/ouds/core/component/OudsTopAppBar.kt
+++ b/core/src/main/java/com/orange/ouds/core/component/OudsTopAppBar.kt
@@ -81,6 +81,8 @@ import com.orange.ouds.theme.OudsThemeContract
  *
  * > Design guidelines: [unified-design-system.orange.com](https://r.orange.fr/r/S-ouds-doc-android-app-bar)
  *
+ * > Design name: App Bar
+ *
  * > Design version: 1.0.0
  *
  * @param title The title to be displayed in the top app bar.
@@ -152,6 +154,8 @@ fun OudsTopAppBar(
  *
  * > Design guidelines: [unified-design-system.orange.com](https://r.orange.fr/r/S-ouds-doc-android-app-bar)
  *
+ * > Design name: App Bar
+ *
  * > Design version: 1.0.0
  *
  * @param title The title to be displayed in the top app bar.
@@ -224,6 +228,8 @@ fun OudsCenterAlignedTopAppBar(
  *
  * > Design guidelines: [unified-design-system.orange.com](https://r.orange.fr/r/S-ouds-doc-android-app-bar)
  *
+ * > Design name: App Bar
+ *
  * > Design version: 1.0.0
  *
  * @param title The title to be displayed in the top app bar. This title will be used in the app
@@ -307,6 +313,8 @@ fun OudsMediumTopAppBar(
  *
  * > Design guidelines: [unified-design-system.orange.com](https://r.orange.fr/r/S-ouds-doc-android-app-bar)
  *
+ * > Design name: App Bar
+ *
  * > Design version: 1.0.0
  *
  * @param title The title to be displayed in the top app bar. This title will be used in the app
diff --git a/core/src/main/java/com/orange/ouds/core/theme/OudsColorScheme.kt b/core/src/main/java/com/orange/ouds/core/theme/OudsColorScheme.kt
index 0c95a6c656..81e73533fb 100644
--- a/core/src/main/java/com/orange/ouds/core/theme/OudsColorScheme.kt
+++ b/core/src/main/java/com/orange/ouds/core/theme/OudsColorScheme.kt
@@ -393,10 +393,19 @@ data class OudsColorScheme internal constructor(
         data class Status internal constructor(
             val accent: Color,
             val info: Color,
+            val inverse: Inverse,
             val negative: Color,
             val positive: Color,
             val warning: Color
-        )
+        ) {
+            @ConsistentCopyVisibility
+            data class Inverse internal constructor(
+                val info: Color,
+                val negative: Color,
+                val positive: Color,
+                val warning: Color
+            )
+        }
     }
 
     /**
@@ -416,16 +425,21 @@ data class OudsColorScheme internal constructor(
     /**
      * Colors used for overlay elements like modals or tooltips.
      *
+     * @property backdrop Scrim color used behind dialogs or modals.
      * @property dropdown Background color for dropdowns.
      * @property drag Background color for dragged items.
-     * @property modal Background color for modal dialogs (scrim).
+     * @property modal Background color for modal dialogs.
+     * @property modalSheet Background color for sheets.
      * @property tooltip Background color for tooltips.
      */
     @ConsistentCopyVisibility
     data class Overlay internal constructor(
+        val backdrop: Color,
         val dropdown: Color,
         val drag: Color,
+        @Deprecated("Token renamed to 'modalSheet'", replaceWith = ReplaceWith("modalSheet"))
         val modal: Color,
+        val modalSheet: Color,
         val tooltip: Color
     )
 
@@ -595,7 +609,10 @@ data class OudsColorScheme internal constructor(
 
         data class Secondary(
             val high: Color,
+            @Deprecated("Will be replaced by 'higherHigh' and 'higherLow' tokens")
             val higher: Color,
+            val higherHigh: Color,
+            val higherLow: Color,
             val highest: Color,
             val low: Color,
             val lower: Color,
@@ -928,6 +945,12 @@ internal val OudsColorSemanticTokens.lightColorScheme: OudsColorScheme
                 status = OudsColorScheme.Content.Status(
                     accent = contentStatusAccentLight,
                     info = contentStatusInfoLight,
+                    inverse = OudsColorScheme.Content.Status.Inverse(
+                        info = contentStatusInverseInfoLight,
+                        negative = contentStatusInverseNegativeLight,
+                        positive = contentStatusInversePositiveLight,
+                        warning = contentStatusInverseWarningLight,
+                    ),
                     negative = contentStatusNegativeLight,
                     positive = contentStatusPositiveLight,
                     warning = contentStatusWarningLight,
@@ -943,9 +966,11 @@ internal val OudsColorSemanticTokens.lightColorScheme: OudsColorScheme
         },
         overlay = with(overlayColorTokens) {
             OudsColorScheme.Overlay(
+                backdrop = overlayBackdropLight,
                 dropdown = overlayDropdownLight,
                 drag = overlayDragLight,
-                modal = overlayModalLight,
+                modal = overlayModalSheetLight,
+                modalSheet = overlayModalSheetLight,
                 tooltip = overlayTooltipLight
             )
         },
@@ -1157,6 +1182,12 @@ internal val OudsColorSemanticTokens.darkColorScheme: OudsColorScheme
                 status = OudsColorScheme.Content.Status(
                     accent = contentStatusAccentDark,
                     info = contentStatusInfoDark,
+                    inverse = OudsColorScheme.Content.Status.Inverse(
+                        info = contentStatusInverseInfoDark,
+                        negative = contentStatusInverseNegativeDark,
+                        positive = contentStatusInversePositiveDark,
+                        warning = contentStatusInverseWarningDark,
+                    ),
                     negative = contentStatusNegativeDark,
                     positive = contentStatusPositiveDark,
                     warning = contentStatusWarningDark,
@@ -1172,9 +1203,11 @@ internal val OudsColorSemanticTokens.darkColorScheme: OudsColorScheme
         },
         overlay = with(overlayColorTokens) {
             OudsColorScheme.Overlay(
+                backdrop = overlayBackdropDark,
                 dropdown = overlayDropdownDark,
                 drag = overlayDragDark,
-                modal = overlayModalDark,
+                modal = overlayModalSheetDark,
+                modalSheet = overlayModalSheetDark,
                 tooltip = overlayTooltipDark,
             )
         },
@@ -1408,7 +1441,9 @@ private val OudsColorSemanticTokens.repositoryColorScheme: OudsColorScheme.Repos
             ),
             secondary = OudsColorScheme.Repository.Secondary(
                 high = repositorySecondaryHigh,
-                higher = repositorySecondaryHigher,
+                higher = repositorySecondaryHigherHigh, // DEPRECATED
+                higherHigh = repositorySecondaryHigherHigh,
+                higherLow = repositorySecondaryHigherLow,
                 highest = repositorySecondaryHighest,
                 low = repositorySecondaryLow,
                 lower = repositorySecondaryLower,
@@ -1550,6 +1585,10 @@ private fun OudsColorScheme.fromToken(token: OudsColorKeyToken.Content): Color {
             OudsColorKeyToken.Content.OnStatus.Accent.Muted -> onStatus.accent.muted
             OudsColorKeyToken.Content.Status.Accent -> status.accent
             OudsColorKeyToken.Content.Status.Info -> status.info
+            OudsColorKeyToken.Content.Status.Inverse.Info -> status.inverse.info
+            OudsColorKeyToken.Content.Status.Inverse.Negative -> status.inverse.negative
+            OudsColorKeyToken.Content.Status.Inverse.Positive -> status.inverse.positive
+            OudsColorKeyToken.Content.Status.Inverse.Warning -> status.inverse.warning
             OudsColorKeyToken.Content.Status.Negative -> status.negative
             OudsColorKeyToken.Content.Status.Positive -> status.positive
             OudsColorKeyToken.Content.Status.Warning -> status.warning
@@ -1650,7 +1689,8 @@ private fun OudsColorScheme.fromToken(token: OudsColorKeyToken.Repository): Colo
             OudsColorKeyToken.Repository.Primary.Lowest -> primary.lowest
             OudsColorKeyToken.Repository.Primary.Medium -> primary.medium
             OudsColorKeyToken.Repository.Secondary.High -> secondary.high
-            OudsColorKeyToken.Repository.Secondary.Higher -> secondary.higher
+            OudsColorKeyToken.Repository.Secondary.HigherHigh -> secondary.higherHigh
+            OudsColorKeyToken.Repository.Secondary.HigherLow -> secondary.higherLow
             OudsColorKeyToken.Repository.Secondary.Highest -> secondary.highest
             OudsColorKeyToken.Repository.Secondary.Low -> secondary.low
             OudsColorKeyToken.Repository.Secondary.Lower -> secondary.lower
@@ -1715,9 +1755,10 @@ private fun OudsColorScheme.fromToken(token: OudsColorKeyToken.Opacity): Color {
 private fun OudsColorScheme.fromToken(token: OudsColorKeyToken.Overlay): Color {
     return with(overlay) {
         when (token) {
+            OudsColorKeyToken.Overlay.Backdrop -> backdrop
             OudsColorKeyToken.Overlay.Drag -> drag
             OudsColorKeyToken.Overlay.Dropdown -> dropdown
-            OudsColorKeyToken.Overlay.Modal -> modal
+            OudsColorKeyToken.Overlay.ModalSheet -> modalSheet
             OudsColorKeyToken.Overlay.Tooltip -> tooltip
         }
     }
diff --git a/core/src/main/java/com/orange/ouds/core/theme/OudsSizes.kt b/core/src/main/java/com/orange/ouds/core/theme/OudsSizes.kt
index a8cd9f2c45..8566faaa0e 100644
--- a/core/src/main/java/com/orange/ouds/core/theme/OudsSizes.kt
+++ b/core/src/main/java/com/orange/ouds/core/theme/OudsSizes.kt
@@ -223,12 +223,14 @@ data class OudsSizes internal constructor(
             /**
              * Icon sizes for extra large label.
              *
+             * @property sizeExtraSmall Extra small icon size for use with an extra large label.
              * @property sizeSmall Small icon size for use with an extra large label.
              * @property sizeMedium Medium icon size for use with an extra large label.
              * @property sizeLarge Large icon size for use with an extra large label.
              */
             @ConsistentCopyVisibility
             data class ExtraLarge internal constructor(
+                val sizeExtraSmall: Dp,
                 val sizeSmall: Dp,
                 val sizeMedium: Dp,
                 val sizeLarge: Dp,
@@ -297,12 +299,82 @@ data class OudsSizes internal constructor(
     /**
      * Maximum width constraints used to control line length and layout density.
      *
+     * @property body Max widths for body text contexts.
+     * @property display Max widths for display text contexts.
+     * @property heading Max widths for heading text contexts.
+     * @property label Max widths for label text contexts.
      * @property type Contains max width values grouped by typography type.
      */
+    @Suppress("DEPRECATION")
     @ConsistentCopyVisibility
     data class MaxWidth internal constructor(
+        val body: Body,
+        val display: Display,
+        val heading: Heading,
+        val label: Label,
+        @Deprecated("This token level will be removed in the next major version. Please use 'body', 'display', 'heading' or 'label' directly in the token hierarchy.")
         val type: Type
     ) {
+        /**
+         * Max widths for body text contexts.
+         *
+         * @property small Max width constraint for small body text.
+         * @property medium Max width constraint for medium body text.
+         * @property large Max width constraint for large body text.
+         */
+        @ConsistentCopyVisibility
+        data class Body internal constructor(
+            val small: Dp,
+            val medium: Dp,
+            val large: Dp
+        )
+
+        /**
+         * Max widths for display text contexts.
+         *
+         * @property small Max width constraint for small display text.
+         * @property medium Max width constraint for medium display text.
+         * @property large Max width constraint for large display text.
+         */
+        @ConsistentCopyVisibility
+        data class Display internal constructor(
+            val small: Dp,
+            val medium: Dp,
+            val large: Dp
+        )
+
+        /**
+         * Max widths for heading text contexts.
+         *
+         * @property small Max width constraint for small heading text.
+         * @property medium Max width constraint for medium heading text.
+         * @property large Max width constraint for large heading text.
+         * @property extraLarge Max width constraint for extra large heading text.
+         */
+        @ConsistentCopyVisibility
+        data class Heading internal constructor(
+            val small: Dp,
+            val medium: Dp,
+            val large: Dp,
+            val extraLarge: Dp
+        )
+
+        /**
+         * Max widths for label text contexts.
+         *
+         * @property small Max width constraint for small label text.
+         * @property medium Max width constraint for medium label text.
+         * @property large Max width constraint for large label text.
+         * @property extraLarge Max width constraint for extra large label text.
+         */
+        @ConsistentCopyVisibility
+        data class Label internal constructor(
+            val small: Dp,
+            val medium: Dp,
+            val large: Dp,
+            val extraLarge: Dp
+        )
+
         /**
          * Max width values grouped by typography type.
          *
@@ -312,6 +384,7 @@ data class OudsSizes internal constructor(
          * @property label Max widths for label text contexts.
          */
         @ConsistentCopyVisibility
+        @Deprecated("This token level will be removed in the next major version.")
         data class Type internal constructor(
             val body: Body,
             val display: Display,
@@ -381,6 +454,7 @@ data class OudsSizes internal constructor(
     }
 }
 
+@Suppress("DEPRECATION")
 internal fun OudsSizeSemanticTokens.getSizes(windowWidthSizeClass: WindowWidthSizeClass) = with(windowWidthSizeClass) {
     OudsSizes(
         icon = OudsSizes.Icon(
@@ -438,6 +512,7 @@ internal fun OudsSizeSemanticTokens.getSizes(windowWidthSizeClass: WindowWidthSi
                     sizeExtraLarge = iconWithLabelLargeSizeXlarge.dp,
                 ),
                 extraLarge = OudsSizes.Icon.WithLabel.ExtraLarge(
+                    sizeExtraSmall = iconWithLabelXlargeSizeXsmall.dp,
                     sizeSmall = iconWithLabelXlargeSizeSmall.dp,
                     sizeMedium = iconWithLabelXlargeSizeMedium.dp,
                     sizeLarge = iconWithLabelXlargeSizeLarge.dp,
@@ -462,28 +537,50 @@ internal fun OudsSizeSemanticTokens.getSizes(windowWidthSizeClass: WindowWidthSi
             ),
         ),
         maxWidth = OudsSizes.MaxWidth(
+            body = OudsSizes.MaxWidth.Body(
+                small = getTokenValue(maxWidthBodySmallMobile, maxWidthBodySmallTablet).dp,
+                medium = getTokenValue(maxWidthBodyMediumMobile, maxWidthBodyMediumTablet).dp,
+                large = getTokenValue(maxWidthBodyLargeMobile, maxWidthBodyLargeTablet).dp,
+            ),
+            display = OudsSizes.MaxWidth.Display(
+                small = getTokenValue(maxWidthDisplaySmallMobile, maxWidthDisplaySmallTablet).dp,
+                medium = getTokenValue(maxWidthDisplayMediumMobile, maxWidthDisplayMediumTablet).dp,
+                large = getTokenValue(maxWidthDisplayLargeMobile, maxWidthDisplayLargeTablet).dp,
+            ),
+            heading = OudsSizes.MaxWidth.Heading(
+                small = getTokenValue(maxWidthHeadingSmallMobile, maxWidthHeadingSmallTablet).dp,
+                medium = getTokenValue(maxWidthHeadingMediumMobile, maxWidthHeadingMediumTablet).dp,
+                large = getTokenValue(maxWidthHeadingLargeMobile, maxWidthHeadingLargeTablet).dp,
+                extraLarge = getTokenValue(maxWidthHeadingXlargeMobile, maxWidthHeadingXlargeTablet).dp,
+            ),
+            label = OudsSizes.MaxWidth.Label(
+                small = getTokenValue(maxWidthLabelSmallMobile, maxWidthLabelSmallTablet).dp,
+                medium = getTokenValue(maxWidthLabelMediumMobile, maxWidthLabelMediumTablet).dp,
+                large = getTokenValue(maxWidthLabelLargeMobile, maxWidthLabelLargeTablet).dp,
+                extraLarge = getTokenValue(maxWidthLabelXlargeMobile, maxWidthLabelXlargeTablet).dp,
+            ),
             type = OudsSizes.MaxWidth.Type(
                 body = OudsSizes.MaxWidth.Type.Body(
-                    small = getTokenValue(maxWidthTypeBodySmallMobile, maxWidthTypeBodySmallTablet).dp,
-                    medium = getTokenValue(maxWidthTypeBodyMediumMobile, maxWidthTypeBodyMediumTablet).dp,
-                    large = getTokenValue(maxWidthTypeBodyLargeMobile, maxWidthTypeBodyLargeTablet).dp,
+                    small = getTokenValue(maxWidthBodySmallMobile, maxWidthBodySmallTablet).dp,
+                    medium = getTokenValue(maxWidthBodyMediumMobile, maxWidthBodyMediumTablet).dp,
+                    large = getTokenValue(maxWidthBodyLargeMobile, maxWidthBodyLargeTablet).dp,
                 ),
                 display = OudsSizes.MaxWidth.Type.Display(
-                    small = getTokenValue(maxWidthTypeDisplaySmallMobile, maxWidthTypeDisplaySmallTablet).dp,
-                    medium = getTokenValue(maxWidthTypeDisplayMediumMobile, maxWidthTypeDisplayMediumTablet).dp,
-                    large = getTokenValue(maxWidthTypeDisplayLargeMobile, maxWidthTypeDisplayLargeTablet).dp,
+                    small = getTokenValue(maxWidthDisplaySmallMobile, maxWidthDisplaySmallTablet).dp,
+                    medium = getTokenValue(maxWidthDisplayMediumMobile, maxWidthDisplayMediumTablet).dp,
+                    large = getTokenValue(maxWidthDisplayLargeMobile, maxWidthDisplayLargeTablet).dp,
                 ),
                 heading = OudsSizes.MaxWidth.Type.Heading(
-                    small = getTokenValue(maxWidthTypeHeadingSmallMobile, maxWidthTypeHeadingSmallTablet).dp,
-                    medium = getTokenValue(maxWidthTypeHeadingMediumMobile, maxWidthTypeHeadingMediumTablet).dp,
-                    large = getTokenValue(maxWidthTypeHeadingLargeMobile, maxWidthTypeHeadingLargeTablet).dp,
-                    extraLarge = getTokenValue(maxWidthTypeHeadingXlargeMobile, maxWidthTypeHeadingXlargeTablet).dp,
+                    small = getTokenValue(maxWidthHeadingSmallMobile, maxWidthHeadingSmallTablet).dp,
+                    medium = getTokenValue(maxWidthHeadingMediumMobile, maxWidthHeadingMediumTablet).dp,
+                    large = getTokenValue(maxWidthHeadingLargeMobile, maxWidthHeadingLargeTablet).dp,
+                    extraLarge = getTokenValue(maxWidthHeadingXlargeMobile, maxWidthHeadingXlargeTablet).dp,
                 ),
                 label = OudsSizes.MaxWidth.Type.Label(
-                    small = getTokenValue(maxWidthTypeLabelSmallMobile, maxWidthTypeLabelSmallTablet).dp,
-                    medium = getTokenValue(maxWidthTypeLabelMediumMobile, maxWidthTypeLabelMediumTablet).dp,
-                    large = getTokenValue(maxWidthTypeLabelLargeMobile, maxWidthTypeLabelLargeTablet).dp,
-                    extraLarge = getTokenValue(maxWidthTypeLabelXlargeMobile, maxWidthTypeLabelXlargeTablet).dp,
+                    small = getTokenValue(maxWidthLabelSmallMobile, maxWidthLabelSmallTablet).dp,
+                    medium = getTokenValue(maxWidthLabelMediumMobile, maxWidthLabelMediumTablet).dp,
+                    large = getTokenValue(maxWidthLabelLargeMobile, maxWidthLabelLargeTablet).dp,
+                    extraLarge = getTokenValue(maxWidthLabelXlargeMobile, maxWidthLabelXlargeTablet).dp,
                 )
             )
         ),
@@ -549,6 +646,7 @@ private fun OudsSizes.fromToken(token: OudsSizeKeyToken.Icon.WithBody): Dp {
 private fun OudsSizes.fromToken(token: OudsSizeKeyToken.Icon.WithLabel): Dp {
     return with(icon.withLabel) {
         when (token) {
+            OudsSizeKeyToken.Icon.WithLabel.ExtraLarge.SizeExtraSmall -> extraLarge.sizeExtraSmall
             OudsSizeKeyToken.Icon.WithLabel.ExtraLarge.SizeSmall -> extraLarge.sizeSmall
             OudsSizeKeyToken.Icon.WithLabel.ExtraLarge.SizeMedium -> extraLarge.sizeMedium
             OudsSizeKeyToken.Icon.WithLabel.ExtraLarge.SizeLarge -> extraLarge.sizeLarge
@@ -571,22 +669,22 @@ private fun OudsSizes.fromToken(token: OudsSizeKeyToken.Icon.WithLabel): Dp {
 
 @Stable
 private fun OudsSizes.fromToken(token: OudsSizeKeyToken.MaxWidth): Dp {
-    return with(maxWidth.type) {
+    return with(maxWidth) {
         when (token) {
-            OudsSizeKeyToken.MaxWidth.Type.Body.Small -> body.small
-            OudsSizeKeyToken.MaxWidth.Type.Body.Medium -> body.medium
-            OudsSizeKeyToken.MaxWidth.Type.Body.Large -> body.large
-            OudsSizeKeyToken.MaxWidth.Type.Display.Small -> display.small
-            OudsSizeKeyToken.MaxWidth.Type.Display.Medium -> display.medium
-            OudsSizeKeyToken.MaxWidth.Type.Display.Large -> display.large
-            OudsSizeKeyToken.MaxWidth.Type.Heading.Small -> heading.small
-            OudsSizeKeyToken.MaxWidth.Type.Heading.Medium -> heading.medium
-            OudsSizeKeyToken.MaxWidth.Type.Heading.Large -> heading.large
-            OudsSizeKeyToken.MaxWidth.Type.Heading.ExtraLarge -> heading.extraLarge
-            OudsSizeKeyToken.MaxWidth.Type.Label.ExtraLarge -> label.extraLarge
-            OudsSizeKeyToken.MaxWidth.Type.Label.Large -> label.large
-            OudsSizeKeyToken.MaxWidth.Type.Label.Medium -> label.medium
-            OudsSizeKeyToken.MaxWidth.Type.Label.Small -> label.small
+            OudsSizeKeyToken.MaxWidth.Body.Small -> body.small
+            OudsSizeKeyToken.MaxWidth.Body.Medium -> body.medium
+            OudsSizeKeyToken.MaxWidth.Body.Large -> body.large
+            OudsSizeKeyToken.MaxWidth.Display.Small -> display.small
+            OudsSizeKeyToken.MaxWidth.Display.Medium -> display.medium
+            OudsSizeKeyToken.MaxWidth.Display.Large -> display.large
+            OudsSizeKeyToken.MaxWidth.Heading.Small -> heading.small
+            OudsSizeKeyToken.MaxWidth.Heading.Medium -> heading.medium
+            OudsSizeKeyToken.MaxWidth.Heading.Large -> heading.large
+            OudsSizeKeyToken.MaxWidth.Heading.ExtraLarge -> heading.extraLarge
+            OudsSizeKeyToken.MaxWidth.Label.ExtraLarge -> label.extraLarge
+            OudsSizeKeyToken.MaxWidth.Label.Large -> label.large
+            OudsSizeKeyToken.MaxWidth.Label.Medium -> label.medium
+            OudsSizeKeyToken.MaxWidth.Label.Small -> label.small
         }
     }
 }
diff --git a/global-raw-tokens/src/main/java/com/orange/ouds/tokens/raw/OudsBorderRawTokens.kt b/global-raw-tokens/src/main/java/com/orange/ouds/tokens/raw/OudsBorderRawTokens.kt
index d3a287473f..84d544e57e 100644
--- a/global-raw-tokens/src/main/java/com/orange/ouds/tokens/raw/OudsBorderRawTokens.kt
+++ b/global-raw-tokens/src/main/java/com/orange/ouds/tokens/raw/OudsBorderRawTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// OUDS core tokens version 1.9.0
+// OUDS core tokens version 1.10.0
 // Generated by Tokenator
 
 package com.orange.ouds.tokens.raw
diff --git a/global-raw-tokens/src/main/java/com/orange/ouds/tokens/raw/OudsColorRawTokens.kt b/global-raw-tokens/src/main/java/com/orange/ouds/tokens/raw/OudsColorRawTokens.kt
index fb6ac4672c..e83f907620 100644
--- a/global-raw-tokens/src/main/java/com/orange/ouds/tokens/raw/OudsColorRawTokens.kt
+++ b/global-raw-tokens/src/main/java/com/orange/ouds/tokens/raw/OudsColorRawTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// OUDS core tokens version 1.9.0
+// OUDS core tokens version 1.10.0
 // Generated by Tokenator
 
 package com.orange.ouds.tokens.raw
@@ -111,8 +111,7 @@ object OudsColorRawTokens {
   val ColorOpacityBlack960 = Color(0xf5000000)
   val ColorOpacityDodgerBlue80 = Color(0x1426b2ff)
   val ColorOpacityDodgerBlue520 = Color(0x8500598a)
-  val ColorOpacityGrayDark800800 = Color(0xcc1f1f1f)
-  val ColorOpacityGrayLight80800 = Color(0xccf4f4f4)
+  val ColorOpacityGrayDark880800 = Color(0xcc141414)
   val ColorOpacityMalachite120 = Color(0x1f3de35a)
   val ColorOpacityMalachite640 = Color(0xa30e621d)
   val ColorOpacityScarlet80 = Color(0x14db0002)
diff --git a/global-raw-tokens/src/main/java/com/orange/ouds/tokens/raw/OudsDimensionRawTokens.kt b/global-raw-tokens/src/main/java/com/orange/ouds/tokens/raw/OudsDimensionRawTokens.kt
index 8e76baf76d..64d4b367ce 100644
--- a/global-raw-tokens/src/main/java/com/orange/ouds/tokens/raw/OudsDimensionRawTokens.kt
+++ b/global-raw-tokens/src/main/java/com/orange/ouds/tokens/raw/OudsDimensionRawTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// OUDS core tokens version 1.9.0
+// OUDS core tokens version 1.10.0
 // Generated by Tokenator
 
 package com.orange.ouds.tokens.raw
diff --git a/global-raw-tokens/src/main/java/com/orange/ouds/tokens/raw/OudsEffectRawTokens.kt b/global-raw-tokens/src/main/java/com/orange/ouds/tokens/raw/OudsEffectRawTokens.kt
index 9d1d92e871..c35f91b9a2 100644
--- a/global-raw-tokens/src/main/java/com/orange/ouds/tokens/raw/OudsEffectRawTokens.kt
+++ b/global-raw-tokens/src/main/java/com/orange/ouds/tokens/raw/OudsEffectRawTokens.kt
@@ -10,12 +10,12 @@
 // Software description: Android library of reusable graphical components
 //
 
-// OUDS core tokens version 1.9.0
+// OUDS core tokens version 1.10.0
 // Generated by Tokenator
 
 package com.orange.ouds.tokens.raw
 
 object OudsEffectRawTokens {
-  const val EffectBlur160 = 16
   const val EffectBlur320 = 32
+  const val EffectBlur480 = 48
 }
diff --git a/global-raw-tokens/src/main/java/com/orange/ouds/tokens/raw/OudsFontRawTokens.kt b/global-raw-tokens/src/main/java/com/orange/ouds/tokens/raw/OudsFontRawTokens.kt
index 6ff809977b..aeef474ca9 100644
--- a/global-raw-tokens/src/main/java/com/orange/ouds/tokens/raw/OudsFontRawTokens.kt
+++ b/global-raw-tokens/src/main/java/com/orange/ouds/tokens/raw/OudsFontRawTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// OUDS core tokens version 1.9.0
+// OUDS core tokens version 1.10.0
 // Generated by Tokenator
 
 package com.orange.ouds.tokens.raw
diff --git a/global-raw-tokens/src/main/java/com/orange/ouds/tokens/raw/OudsGridRawTokens.kt b/global-raw-tokens/src/main/java/com/orange/ouds/tokens/raw/OudsGridRawTokens.kt
index 0adbdd4c45..9ef3938e0e 100644
--- a/global-raw-tokens/src/main/java/com/orange/ouds/tokens/raw/OudsGridRawTokens.kt
+++ b/global-raw-tokens/src/main/java/com/orange/ouds/tokens/raw/OudsGridRawTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// OUDS core tokens version 1.9.0
+// OUDS core tokens version 1.10.0
 // Generated by Tokenator
 
 package com.orange.ouds.tokens.raw
diff --git a/global-raw-tokens/src/main/java/com/orange/ouds/tokens/raw/OudsOpacityRawTokens.kt b/global-raw-tokens/src/main/java/com/orange/ouds/tokens/raw/OudsOpacityRawTokens.kt
index d36915e2cd..8fe072f578 100644
--- a/global-raw-tokens/src/main/java/com/orange/ouds/tokens/raw/OudsOpacityRawTokens.kt
+++ b/global-raw-tokens/src/main/java/com/orange/ouds/tokens/raw/OudsOpacityRawTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// OUDS core tokens version 1.9.0
+// OUDS core tokens version 1.10.0
 // Generated by Tokenator
 
 package com.orange.ouds.tokens.raw
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/OudsVersion.kt b/theme-contract/src/main/java/com/orange/ouds/theme/OudsVersion.kt
index 8bdcc0b3e8..c27cd8af11 100644
--- a/theme-contract/src/main/java/com/orange/ouds/theme/OudsVersion.kt
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/OudsVersion.kt
@@ -16,34 +16,42 @@ package com.orange.ouds.theme
 
 object OudsVersion {
     object Component {
-        const val Alert = "1.1.0"
+        const val AlertMessage = "1.1.0"
         const val Badge = "1.2.0"
-        const val Bar = "1.0.0"
-        const val BulletList = "1.0.0"
+        const val BadgeCount = "1.2.0"
+        const val BadgeIcon = "1.3.0"
+        const val BottomSheet = "0.0.0" // '0.0.0' corresponds to a component that does not yet have a design (draft).
+        const val BulletList = "1.1.0"
         const val Button = "3.2.0"
         const val Checkbox = "2.4.0"
-        const val Chip = "1.3.0"
         const val Divider = "1.0.0"
+        const val Fab = "0.0.0" // '0.0.0' corresponds to a component that does not yet have a design (draft).
+        const val FilterChip = "1.4.0"
+        const val InlineAlert = "1.0.0"
+        const val InputTag = "1.2.0"
         const val Link = "2.2.0"
-        const val PasswordInput = "1.2.0"
-        const val PinCodeInput = "1.2.0"
+        const val NavigationBar = "1.0.0"
+        const val NavigationButton = "3.2.1"
+        const val PasswordInput = "1.3.0"
+        const val PinCodeInput = "1.3.0"
         const val RadioButton = "1.4.0"
+        const val SuggestionChip = "1.4.0"
         const val Switch = "1.5.0"
-        const val Tag = "1.4.0"
-        const val TextArea = "1.1.0"
-        const val TextInput = "1.3.0"
+        const val Tag = "1.5.0"
+        const val TextArea = "1.2.0"
+        const val TextInput = "1.4.0"
     }
 
     object Tokens {
-        const val OudsCore = "1.9.0"
+        const val OudsCore = "1.10.0"
         const val AndroidCore = "1.0.0"
         const val AndroidSystem = "1.2.0"
         const val OrangeCore = "1.2.0"
-        const val OrangeBrand = "2.3.0"
-        const val OrangeCompactBrand = "2.3.0"
-        const val SoshCore = "1.2.0"
-        const val SoshBrand = "2.3.0"
-        const val WireframeCore = "1.3.0"
-        const val WireframeBrand = "2.3.0"
+        const val OrangeBrand = "2.4.0"
+        const val OrangeCompactBrand = "2.4.0"
+        const val SoshCore = "1.3.0"
+        const val SoshBrand = "2.4.0"
+        const val WireframeCore = "1.4.0"
+        const val WireframeBrand = "2.4.0"
     }
 }
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/OudsBorderKeyToken.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/OudsBorderKeyToken.kt
index 61fe8c2155..aed4e6dd41 100644
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/OudsBorderKeyToken.kt
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/OudsBorderKeyToken.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.tokens
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/OudsColorKeyToken.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/OudsColorKeyToken.kt
index 7e96a02223..72c04a8177 100644
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/OudsColorKeyToken.kt
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/OudsColorKeyToken.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.tokens
@@ -134,6 +134,12 @@ sealed interface OudsColorKeyToken : OudsKeyToken {
         sealed interface Status : Content {
             data object Accent : Status
             data object Info : Status
+            sealed interface Inverse : Status {
+                data object Info : Inverse
+                data object Negative : Inverse
+                data object Positive : Inverse
+                data object Warning : Inverse
+            }
             data object Negative : Status
             data object Positive : Status
             data object Warning : Status
@@ -145,9 +151,10 @@ sealed interface OudsColorKeyToken : OudsKeyToken {
         data object Transparent : Opacity
     }
     sealed interface Overlay : OudsColorKeyToken {
+        data object Backdrop : Overlay
         data object Drag : Overlay
         data object Dropdown : Overlay
-        data object Modal : Overlay
+        data object ModalSheet : Overlay
         data object Tooltip : Overlay
     }
     sealed interface Repository : OudsColorKeyToken {
@@ -275,7 +282,8 @@ sealed interface OudsColorKeyToken : OudsKeyToken {
         }
         sealed interface Secondary : Repository {
             data object High : Secondary
-            data object Higher : Secondary
+            data object HigherHigh : Secondary
+            data object HigherLow : Secondary
             data object Highest : Secondary
             data object Low : Secondary
             data object Lower : Secondary
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/OudsEffectKeyToken.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/OudsEffectKeyToken.kt
index 42ee4d6560..e90759fc1b 100644
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/OudsEffectKeyToken.kt
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/OudsEffectKeyToken.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.tokens
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/OudsGridKeyToken.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/OudsGridKeyToken.kt
index 2c7b888939..7d51167b34 100644
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/OudsGridKeyToken.kt
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/OudsGridKeyToken.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.tokens
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/OudsOpacityKeyToken.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/OudsOpacityKeyToken.kt
index a55d21d4af..4f640326ea 100644
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/OudsOpacityKeyToken.kt
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/OudsOpacityKeyToken.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.tokens
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/OudsSizeKeyToken.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/OudsSizeKeyToken.kt
index 6a8578bfc0..dd72216eb0 100644
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/OudsSizeKeyToken.kt
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/OudsSizeKeyToken.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.tokens
@@ -75,6 +75,7 @@ sealed interface OudsSizeKeyToken : OudsKeyToken {
         }
         sealed interface WithLabel : Icon {
             sealed interface ExtraLarge : WithLabel {
+                data object SizeExtraSmall : ExtraLarge
                 data object SizeLarge : ExtraLarge
                 data object SizeMedium : ExtraLarge
                 data object SizeSmall : ExtraLarge
@@ -101,29 +102,27 @@ sealed interface OudsSizeKeyToken : OudsKeyToken {
         }
     }
     sealed interface MaxWidth : OudsSizeKeyToken {
-        sealed interface Type : MaxWidth {
-            sealed interface Body : Type {
-                data object Large : Body
-                data object Medium : Body
-                data object Small : Body
-            }
-            sealed interface Display : Type {
-                data object Large : Display
-                data object Medium : Display
-                data object Small : Display
-            }
-            sealed interface Heading : Type {
-                data object ExtraLarge : Heading
-                data object Large : Heading
-                data object Medium : Heading
-                data object Small : Heading
-            }
-            sealed interface Label : Type {
-                data object ExtraLarge : Label
-                data object Large : Label
-                data object Medium : Label
-                data object Small : Label
-            }
+        sealed interface Body : MaxWidth {
+            data object Large : Body
+            data object Medium : Body
+            data object Small : Body
+        }
+        sealed interface Display : MaxWidth {
+            data object Large : Display
+            data object Medium : Display
+            data object Small : Display
+        }
+        sealed interface Heading : MaxWidth {
+            data object ExtraLarge : Heading
+            data object Large : Heading
+            data object Medium : Heading
+            data object Small : Heading
+        }
+        sealed interface Label : MaxWidth {
+            data object ExtraLarge : Label
+            data object Large : Label
+            data object Medium : Label
+            data object Small : Label
         }
     }
     data object MinInteractiveArea : OudsSizeKeyToken
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/OudsSpaceKeyToken.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/OudsSpaceKeyToken.kt
index 7d4b454aee..9d713ca285 100644
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/OudsSpaceKeyToken.kt
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/OudsSpaceKeyToken.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.tokens
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsAlertTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsAlertTokens.kt
index a754a204b3..3b93805fdd 100644
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsAlertTokens.kt
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsAlertTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.tokens.components
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsBadgeTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsBadgeTokens.kt
index 5e4b74c754..aaddd66681 100644
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsBadgeTokens.kt
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsBadgeTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.tokens.components
@@ -25,7 +25,9 @@ interface OudsBadgeTokens {
     val sizeMedium: Float
     val sizeSmall: Float
     val sizeXsmall: Float
-    val spaceInset: Float
+    val spaceInsetMediumLarge: Float
+    val spaceInsetSmall: Float
+    val spaceInsetXsmall: Float
     val spacePaddingInlineLarge: OudsSpaceKeyToken.PaddingInline
     val spacePaddingInlineMedium: OudsSpaceKeyToken.PaddingInline
 }
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsBarTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsBarTokens.kt
index f42be51bc1..b0a1a640ac 100644
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsBarTokens.kt
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsBarTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.tokens.components
@@ -23,21 +23,8 @@ import com.orange.ouds.theme.tokens.OudsOpacityKeyToken
 /** @suppress */
 @InternalOudsApi
 interface OudsBarTokens {
-    val borderRadiusActiveIndicatorCustomBottom: OudsBorderKeyToken.Radius
-    val borderRadiusActiveIndicatorCustomTop: OudsBorderKeyToken.Radius
-    val colorActiveIndicatorAndroidSelectedDisabled: OudsColorKeyToken
-    val colorActiveIndicatorAndroidSelectedEnabled: OudsColorKeyToken
-    val colorActiveIndicatorAndroidSelectedFocus: OudsColorKeyToken
-    val colorActiveIndicatorAndroidSelectedHover: OudsColorKeyToken
-    val colorActiveIndicatorAndroidSelectedPressed: OudsColorKeyToken
-    val colorActiveIndicatorAndroidUnselectedDisabled: OudsColorKeyToken
-    val colorActiveIndicatorAndroidUnselectedFocus: OudsColorKeyToken
-    val colorActiveIndicatorAndroidUnselectedHover: OudsColorKeyToken
-    val colorActiveIndicatorAndroidUnselectedPressed: OudsColorKeyToken
-    val colorActiveIndicatorCustomSelectedEnabled: OudsColorKeyToken
-    val colorActiveIndicatorCustomSelectedFocus: OudsColorKeyToken
-    val colorActiveIndicatorCustomSelectedHover: OudsColorKeyToken
-    val colorActiveIndicatorCustomSelectedPressed: OudsColorKeyToken
+    val borderRadiusCurrentIndicatorCustomBottom: OudsBorderKeyToken.Radius
+    val borderRadiusCurrentIndicatorCustomTop: OudsBorderKeyToken.Radius
     val colorBgOpaque: OudsColorKeyToken
     val colorBgTranslucent: OudsLightDarkColor
     val colorBorderBadge: OudsColorKeyToken
@@ -46,13 +33,27 @@ interface OudsBarTokens {
     val colorContentSelectedFocus: OudsColorKeyToken
     val colorContentSelectedHover: OudsColorKeyToken
     val colorContentSelectedPressed: OudsColorKeyToken
-    val colorContentUnselectedEnabled: OudsLightDarkColor
+    val colorContentUnselectedEnabled: OudsColorKeyToken
     val colorContentUnselectedFocus: OudsColorKeyToken
     val colorContentUnselectedHover: OudsColorKeyToken
     val colorContentUnselectedPressed: OudsColorKeyToken
+    val colorCurrentIndicatorAndroidSelectedDisabled: OudsColorKeyToken
+    val colorCurrentIndicatorAndroidSelectedEnabled: OudsColorKeyToken
+    val colorCurrentIndicatorAndroidSelectedFocus: OudsColorKeyToken
+    val colorCurrentIndicatorAndroidSelectedHover: OudsColorKeyToken
+    val colorCurrentIndicatorAndroidSelectedPressed: OudsColorKeyToken
+    val colorCurrentIndicatorAndroidUnselectedDisabled: OudsColorKeyToken
+    val colorCurrentIndicatorAndroidUnselectedFocus: OudsColorKeyToken
+    val colorCurrentIndicatorAndroidUnselectedHover: OudsColorKeyToken
+    val colorCurrentIndicatorAndroidUnselectedPressed: OudsColorKeyToken
+    val colorCurrentIndicatorCustomSelectedEnabled: OudsColorKeyToken
+    val colorCurrentIndicatorCustomSelectedFocus: OudsColorKeyToken
+    val colorCurrentIndicatorCustomSelectedHover: OudsColorKeyToken
+    val colorCurrentIndicatorCustomSelectedPressed: OudsColorKeyToken
+    val colorIosAccent: OudsColorKeyToken
     val effectBgBlur: Int
-    val opacityActiveIndicatorCustom: OudsOpacityKeyToken
-    val sizeHeightActiveIndicatorCustom: Float
-    val sizeWidthActiveIndicatorCustomBottom: Float
-    val sizeWidthActiveIndicatorCustomTop: Float
+    val opacityCurrentIndicatorCustom: OudsOpacityKeyToken
+    val sizeHeightCurrentIndicatorCustom: Float
+    val sizeWidthCurrentIndicatorCustomBottom: Float
+    val sizeWidthCurrentIndicatorCustomTop: Float
 }
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsBulletListTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsBulletListTokens.kt
index 4496f744c0..4f1efc2641 100644
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsBulletListTokens.kt
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsBulletListTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.tokens.components
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsButtonMonoTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsButtonMonoTokens.kt
index e4e2f055fd..2dfe456e53 100644
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsButtonMonoTokens.kt
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsButtonMonoTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.tokens.components
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsButtonTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsButtonTokens.kt
index d55d2504bf..ec0b085621 100644
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsButtonTokens.kt
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsButtonTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.tokens.components
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsCheckboxTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsCheckboxTokens.kt
index 0f272d8187..695cdda331 100644
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsCheckboxTokens.kt
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsCheckboxTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.tokens.components
@@ -31,7 +31,6 @@ interface OudsCheckboxTokens {
     val borderWidthUnselectedFocus: OudsBorderKeyToken.Width
     val borderWidthUnselectedHover: OudsBorderKeyToken.Width
     val borderWidthUnselectedPressed: OudsBorderKeyToken.Width
-    val sizeIndicator: OudsSizeKeyToken.Icon
     val sizeMaxHeight: OudsSizeKeyToken
     val sizeMinHeight: OudsSizeKeyToken
     val sizeMinWidth: OudsSizeKeyToken
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsChipTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsChipTokens.kt
index 327dd59305..5ec73f2a83 100644
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsChipTokens.kt
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsChipTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.tokens.components
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsControlItemTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsControlItemTokens.kt
index c012e6a388..dc98a65934 100644
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsControlItemTokens.kt
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsControlItemTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.tokens.components
@@ -18,12 +18,62 @@ package com.orange.ouds.theme.tokens.components
 import com.orange.ouds.foundation.InternalOudsApi
 import com.orange.ouds.theme.tokens.OudsBorderKeyToken
 import com.orange.ouds.theme.tokens.OudsColorKeyToken
+import com.orange.ouds.theme.tokens.OudsOpacityKeyToken
 import com.orange.ouds.theme.tokens.OudsSizeKeyToken
 import com.orange.ouds.theme.tokens.OudsSpaceKeyToken
 
 /** @suppress */
 @InternalOudsApi
 interface OudsControlItemTokens {
+    val borderRadiusCurrentIndicator: OudsBorderKeyToken.Radius
+    val borderRadiusDefault: OudsBorderKeyToken.Radius
+    val borderRadiusMedia: OudsBorderKeyToken.Radius
+    val borderRadiusMediaRoundedCorner: OudsBorderKeyToken.Radius
+    val borderRadiusRounded: OudsBorderKeyToken.Radius
+    val borderWidthCurrentPage: OudsBorderKeyToken.Width
+    val borderWidthDefault: OudsBorderKeyToken.Width
+    val colorBadgeSafetyArea: OudsColorKeyToken
+    val colorBgCurrentDisabled: OudsColorKeyToken
+    val colorBgCurrentEnabled: OudsColorKeyToken
+    val colorBgCurrentFocus: OudsColorKeyToken
+    val colorBgCurrentHover: OudsColorKeyToken
+    val colorBgCurrentPressed: OudsColorKeyToken
+    val colorContentCurrentDisabled: OudsColorKeyToken
+    val colorContentCurrentEnabled: OudsColorKeyToken
+    val colorContentCurrentFocus: OudsColorKeyToken
+    val colorContentCurrentHover: OudsColorKeyToken
+    val colorContentCurrentPressed: OudsColorKeyToken
+    val fontLetterSpacingAvatarInitialXlarge: Float
+    val fontLineHeightAvatarInitialXlarge: Int
+    val fontSizeAvatarInitialXlarge: Int
+    val opacityCurrentDivider: OudsOpacityKeyToken
+    val opacityCurrentIndicator: OudsOpacityKeyToken
+    val sizeAssetLarge: Float
+    val sizeAssetMedium: OudsSizeKeyToken.Icon
+    val sizeAssetSmall: OudsSizeKeyToken.Icon
+    val sizeAssetXlarge: Float
+    val sizeControlIndicator: OudsSizeKeyToken.Icon
+    val sizeCurrentIndicatorWidth: Float
+    val sizeFlagHeight: OudsSizeKeyToken.Icon
+    val sizeMaxWidth: Float
+    val sizeMinHeightCompact: OudsSizeKeyToken
+    val sizeMinHeightDefault: Float
+    val sizeMinWidth: Float
+    val spaceColumnGap: OudsSpaceKeyToken.ColumnGap
+    val spacePaddingBlockBottomSlot: OudsSpaceKeyToken.PaddingBlock
+    val spacePaddingBlockDensityCompact: OudsSpaceKeyToken.PaddingBlock
+    val spacePaddingBlockDensityCompactBottomExpandContainer: OudsSpaceKeyToken.PaddingBlock
+    val spacePaddingBlockDensityCompactTopAlignmentTopCounterweight: OudsSpaceKeyToken.PaddingBlock
+    val spacePaddingBlockDensityCompactTopAlignmentTopTextContainer: OudsSpaceKeyToken.PaddingBlock
+    val spacePaddingBlockDensityDefault: OudsSpaceKeyToken.PaddingBlock
+    val spacePaddingBlockDensityDefaultBottomExpandContainer: OudsSpaceKeyToken.PaddingBlock
+    val spacePaddingBlockDensityDefaultTopAlignmentTopCounterweight: OudsSpaceKeyToken.PaddingBlock
+    val spacePaddingBlockDensityDefaultTopAlignmentTopTextContainer: OudsSpaceKeyToken.PaddingBlock
+    val spacePaddingBlockTopHelperText: OudsSpaceKeyToken.PaddingBlock
+    val spacePaddingInline: OudsSpaceKeyToken.PaddingInline
+    val spaceRowGap: OudsSpaceKeyToken.RowGap
+
+    // TODO Keep the following tokens until the new control items are implemented, then remove them.
     val borderRadius: OudsBorderKeyToken.Radius
     val borderRadiusItemOnly: OudsBorderKeyToken.Radius
     val colorBgFocus: OudsColorKeyToken
@@ -32,16 +82,8 @@ interface OudsControlItemTokens {
     val colorBgPressed: OudsColorKeyToken
     val colorContentLoader: OudsColorKeyToken
     val sizeErrorIcon: OudsSizeKeyToken.Icon
-    val sizeIcon: OudsSizeKeyToken.Icon
     val sizeLoader: OudsSizeKeyToken.Icon
     val sizeMaxHeightAssetsContainer: Float
-    val sizeMaxWidth: Float
-    val sizeMinHeight: Float
-    val sizeMinWidth: Float
-    val spaceColumnGap: OudsSpaceKeyToken.ColumnGap
     val spacePaddingBlockDefault: OudsSpaceKeyToken.PaddingBlock
-    val spacePaddingBlockTopErrorText: OudsSpaceKeyToken.PaddingBlock
-    val spacePaddingInline: OudsSpaceKeyToken.PaddingInline
     val spacePaddingInlineErrorIcon: OudsSpaceKeyToken.PaddingInline
-    val spaceRowGap: OudsSpaceKeyToken.RowGap
 }
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsDividerTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsDividerTokens.kt
index 46d65c8889..da2776fe93 100644
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsDividerTokens.kt
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsDividerTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.tokens.components
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsIconTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsIconTokens.kt
index 0aed6ff3cb..1fd8105688 100644
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsIconTokens.kt
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsIconTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.tokens.components
@@ -21,7 +21,8 @@ import com.orange.ouds.theme.tokens.OudsColorKeyToken
 /** @suppress */
 @InternalOudsApi
 interface OudsIconTokens {
-    val colorContentDefault: OudsColorKeyToken
     val colorContentStatusWarningExternalShape: OudsColorKeyToken
     val colorContentStatusWarningInternalShape: OudsColorKeyToken
+    val colorContentStatusWarningInverseExternalShape: OudsColorKeyToken
+    val colorContentStatusWarningInverseInternalShape: OudsColorKeyToken
 }
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsInputTagTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsInputTagTokens.kt
index 4dd76e8967..c7be19ff0d 100644
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsInputTagTokens.kt
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsInputTagTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.tokens.components
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsLinkMonoTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsLinkMonoTokens.kt
index 17311519eb..c8aa55ea96 100644
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsLinkMonoTokens.kt
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsLinkMonoTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.tokens.components
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsLinkTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsLinkTokens.kt
index bf07daa49c..1a5b92b18a 100644
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsLinkTokens.kt
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsLinkTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.tokens.components
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsPinCodeInputTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsPinCodeInputTokens.kt
index 554219c511..893892cf2c 100644
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsPinCodeInputTokens.kt
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsPinCodeInputTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.tokens.components
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsRadioButtonTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsRadioButtonTokens.kt
index f77e562912..4a6fdb5086 100644
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsRadioButtonTokens.kt
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsRadioButtonTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.tokens.components
@@ -31,7 +31,6 @@ interface OudsRadioButtonTokens {
     val borderWidthUnselectedFocus: OudsBorderKeyToken.Width
     val borderWidthUnselectedHover: OudsBorderKeyToken.Width
     val borderWidthUnselectedPressed: OudsBorderKeyToken.Width
-    val sizeIndicator: OudsSizeKeyToken.Icon
     val sizeMaxHeight: OudsSizeKeyToken
     val sizeMinHeight: OudsSizeKeyToken
     val sizeMinWidth: OudsSizeKeyToken
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsSwitchTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsSwitchTokens.kt
index d669aa9b75..3342b630a0 100644
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsSwitchTokens.kt
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsSwitchTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.tokens.components
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsTagTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsTagTokens.kt
index 1d868ffbfb..5ac6e82f94 100644
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsTagTokens.kt
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsTagTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.tokens.components
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsTextAreaTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsTextAreaTokens.kt
index c6504a02de..c9d3a7689f 100644
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsTextAreaTokens.kt
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsTextAreaTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.tokens.components
@@ -26,4 +26,5 @@ interface OudsTextAreaTokens {
     val sizeMaxWidth: Float
     val sizeMinHeightInput: Float
     val spacePaddingBlock: OudsSpaceKeyToken.PaddingBlock
+    val spacePaddingBlockTopEmpty: OudsSpaceKeyToken.PaddingBlock
 }
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsTextInputTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsTextInputTokens.kt
index 186bfe03d2..5d934976cd 100644
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsTextInputTokens.kt
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsTextInputTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.tokens.components
@@ -41,6 +41,8 @@ interface OudsTextInputTokens {
     val sizeVerticalDividerHeight: Float
     val spaceColumnGapDefault: OudsSpaceKeyToken.ColumnGap
     val spaceColumnGapInlineText: OudsSpaceKeyToken.ColumnGap
+    val spaceColumnGapLabelAsterisk: OudsSpaceKeyToken.ColumnGap
+    val spaceColumnGapLabelSmallAsterisk: Float
     val spaceColumnGapTrailingErrorAction: OudsSpaceKeyToken.ColumnGap
     val spacePaddingBlockDefault: OudsSpaceKeyToken.PaddingBlock
     val spacePaddingBlockTopHelperText: OudsSpaceKeyToken.PaddingBlock
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsBorderSemanticTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsBorderSemanticTokens.kt
index 613f011bdc..f5a7ad3549 100644
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsBorderSemanticTokens.kt
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsBorderSemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.tokens.semantic
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorActionSemanticTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorActionSemanticTokens.kt
index 34ad8a6d34..b5effaeff6 100644
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorActionSemanticTokens.kt
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorActionSemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.tokens.semantic
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorAlwaysSemanticTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorAlwaysSemanticTokens.kt
index 11dce01cd1..718630a089 100644
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorAlwaysSemanticTokens.kt
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorAlwaysSemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.tokens.semantic
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorBgSemanticTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorBgSemanticTokens.kt
index 03f53ebbe6..9b871713cd 100644
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorBgSemanticTokens.kt
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorBgSemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.tokens.semantic
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorBorderSemanticTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorBorderSemanticTokens.kt
index f9268caca6..d5d4842359 100644
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorBorderSemanticTokens.kt
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorBorderSemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.tokens.semantic
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorContentSemanticTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorContentSemanticTokens.kt
index 40f81c4d21..14a1475af0 100644
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorContentSemanticTokens.kt
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorContentSemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.tokens.semantic
@@ -81,6 +81,14 @@ interface OudsColorContentSemanticTokens {
     val contentStatusAccentLight: Color
     val contentStatusInfoDark: Color
     val contentStatusInfoLight: Color
+    val contentStatusInverseInfoDark: Color
+    val contentStatusInverseInfoLight: Color
+    val contentStatusInverseNegativeDark: Color
+    val contentStatusInverseNegativeLight: Color
+    val contentStatusInversePositiveDark: Color
+    val contentStatusInversePositiveLight: Color
+    val contentStatusInverseWarningDark: Color
+    val contentStatusInverseWarningLight: Color
     val contentStatusNegativeDark: Color
     val contentStatusNegativeLight: Color
     val contentStatusPositiveDark: Color
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorModeSemanticTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorModeSemanticTokens.kt
index 0b995ac25f..c98abdca0b 100644
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorModeSemanticTokens.kt
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorModeSemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.tokens.semantic
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorOpacitySemanticTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorOpacitySemanticTokens.kt
index ea2d175c6e..8e58e6eb54 100644
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorOpacitySemanticTokens.kt
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorOpacitySemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.tokens.semantic
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorOverlaySemanticTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorOverlaySemanticTokens.kt
index 65627b980a..d650f32618 100644
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorOverlaySemanticTokens.kt
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorOverlaySemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.tokens.semantic
@@ -21,12 +21,14 @@ import com.orange.ouds.foundation.InternalOudsApi
 /** @suppress */
 @InternalOudsApi
 interface OudsColorOverlaySemanticTokens {
+    val overlayBackdropDark: Color
+    val overlayBackdropLight: Color
     val overlayDragDark: Color
     val overlayDragLight: Color
     val overlayDropdownDark: Color
     val overlayDropdownLight: Color
-    val overlayModalDark: Color
-    val overlayModalLight: Color
+    val overlayModalSheetDark: Color
+    val overlayModalSheetLight: Color
     val overlayTooltipDark: Color
     val overlayTooltipLight: Color
 }
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorRepositorySemanticTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorRepositorySemanticTokens.kt
index e1eb1c32eb..f6b89bc810 100644
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorRepositorySemanticTokens.kt
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorRepositorySemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.tokens.semantic
@@ -110,7 +110,8 @@ interface OudsColorRepositorySemanticTokens {
     val repositoryPrimaryLowest: Color
     val repositoryPrimaryMedium: Color
     val repositorySecondaryHigh: Color
-    val repositorySecondaryHigher: Color
+    val repositorySecondaryHigherHigh: Color
+    val repositorySecondaryHigherLow: Color
     val repositorySecondaryHighest: Color
     val repositorySecondaryLow: Color
     val repositorySecondaryLower: Color
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorSurfaceSemanticTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorSurfaceSemanticTokens.kt
index 9cf68af16d..24ba0c625a 100644
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorSurfaceSemanticTokens.kt
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorSurfaceSemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.tokens.semantic
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsEffectSemanticTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsEffectSemanticTokens.kt
index a704f6dd9c..23b6d214d4 100644
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsEffectSemanticTokens.kt
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsEffectSemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.tokens.semantic
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsFontSemanticTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsFontSemanticTokens.kt
index 9410f06af0..b488de04fc 100644
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsFontSemanticTokens.kt
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsFontSemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.tokens.semantic
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsGridSemanticTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsGridSemanticTokens.kt
index c5581a5feb..b853760983 100644
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsGridSemanticTokens.kt
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsGridSemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.tokens.semantic
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsOpacitySemanticTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsOpacitySemanticTokens.kt
index 7849cb370e..f17113e810 100644
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsOpacitySemanticTokens.kt
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsOpacitySemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.tokens.semantic
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsSizeSemanticTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsSizeSemanticTokens.kt
index a63beba410..0a65fa9d9b 100644
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsSizeSemanticTokens.kt
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsSizeSemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.tokens.semantic
@@ -87,33 +87,34 @@ interface OudsSizeSemanticTokens {
     val iconWithLabelXlargeSizeLarge: Float
     val iconWithLabelXlargeSizeMedium: Float
     val iconWithLabelXlargeSizeSmall: Float
-    val maxWidthTypeBodyLargeMobile: Float
-    val maxWidthTypeBodyLargeTablet: Float
-    val maxWidthTypeBodyMediumMobile: Float
-    val maxWidthTypeBodyMediumTablet: Float
-    val maxWidthTypeBodySmallMobile: Float
-    val maxWidthTypeBodySmallTablet: Float
-    val maxWidthTypeDisplayLargeMobile: Float
-    val maxWidthTypeDisplayLargeTablet: Float
-    val maxWidthTypeDisplayMediumMobile: Float
-    val maxWidthTypeDisplayMediumTablet: Float
-    val maxWidthTypeDisplaySmallMobile: Float
-    val maxWidthTypeDisplaySmallTablet: Float
-    val maxWidthTypeHeadingLargeMobile: Float
-    val maxWidthTypeHeadingLargeTablet: Float
-    val maxWidthTypeHeadingMediumMobile: Float
-    val maxWidthTypeHeadingMediumTablet: Float
-    val maxWidthTypeHeadingSmallMobile: Float
-    val maxWidthTypeHeadingSmallTablet: Float
-    val maxWidthTypeHeadingXlargeMobile: Float
-    val maxWidthTypeHeadingXlargeTablet: Float
-    val maxWidthTypeLabelLargeMobile: Float
-    val maxWidthTypeLabelLargeTablet: Float
-    val maxWidthTypeLabelMediumMobile: Float
-    val maxWidthTypeLabelMediumTablet: Float
-    val maxWidthTypeLabelSmallMobile: Float
-    val maxWidthTypeLabelSmallTablet: Float
-    val maxWidthTypeLabelXlargeMobile: Float
-    val maxWidthTypeLabelXlargeTablet: Float
+    val iconWithLabelXlargeSizeXsmall: Float
+    val maxWidthBodyLargeMobile: Float
+    val maxWidthBodyLargeTablet: Float
+    val maxWidthBodyMediumMobile: Float
+    val maxWidthBodyMediumTablet: Float
+    val maxWidthBodySmallMobile: Float
+    val maxWidthBodySmallTablet: Float
+    val maxWidthDisplayLargeMobile: Float
+    val maxWidthDisplayLargeTablet: Float
+    val maxWidthDisplayMediumMobile: Float
+    val maxWidthDisplayMediumTablet: Float
+    val maxWidthDisplaySmallMobile: Float
+    val maxWidthDisplaySmallTablet: Float
+    val maxWidthHeadingLargeMobile: Float
+    val maxWidthHeadingLargeTablet: Float
+    val maxWidthHeadingMediumMobile: Float
+    val maxWidthHeadingMediumTablet: Float
+    val maxWidthHeadingSmallMobile: Float
+    val maxWidthHeadingSmallTablet: Float
+    val maxWidthHeadingXlargeMobile: Float
+    val maxWidthHeadingXlargeTablet: Float
+    val maxWidthLabelLargeMobile: Float
+    val maxWidthLabelLargeTablet: Float
+    val maxWidthLabelMediumMobile: Float
+    val maxWidthLabelMediumTablet: Float
+    val maxWidthLabelSmallMobile: Float
+    val maxWidthLabelSmallTablet: Float
+    val maxWidthLabelXlargeMobile: Float
+    val maxWidthLabelXlargeTablet: Float
     val minInteractiveArea: Float
 }
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsSpaceSemanticTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsSpaceSemanticTokens.kt
index 3db4f0f8d6..723f729cd7 100644
--- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsSpaceSemanticTokens.kt
+++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsSpaceSemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.tokens.semantic
diff --git a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactAlertTokens.kt b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactAlertTokens.kt
index bd5068ddb4..db1e1dbbfd 100644
--- a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactAlertTokens.kt
+++ b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactAlertTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange Compact brand tokens version 2.3.0
+// Orange Compact brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orangecompact.tokens.components
diff --git a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactBadgeTokens.kt b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactBadgeTokens.kt
index 5aaea741c8..ce031bad95 100644
--- a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactBadgeTokens.kt
+++ b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactBadgeTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange Compact brand tokens version 2.3.0
+// Orange Compact brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orangecompact.tokens.components
@@ -24,7 +24,9 @@ internal data class OrangeCompactBadgeTokens(
     override val sizeMedium: Float = OudsDimensionRawTokens.Dimension200,
     override val sizeSmall: Float = OudsDimensionRawTokens.Dimension150,
     override val sizeXsmall: Float = OudsDimensionRawTokens.Dimension100,
-    override val spaceInset: Float = OudsDimensionRawTokens.DimensionOutOfSystem75,
+    override val spaceInsetMediumLarge: Float = OudsDimensionRawTokens.DimensionOutOfSystem75,
+    override val spaceInsetSmall: Float = OudsDimensionRawTokens.DimensionOutOfSystem50,
+    override val spaceInsetXsmall: Float = OudsDimensionRawTokens.DimensionOutOfSystem25,
     override val spacePaddingInlineLarge: OudsSpaceKeyToken.PaddingInline = OudsSpaceKeyToken.PaddingInline.TwoExtraSmall,
     override val spacePaddingInlineMedium: OudsSpaceKeyToken.PaddingInline = OudsSpaceKeyToken.PaddingInline.ThreeExtraSmall
 ) : OudsBadgeTokens
diff --git a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactBarTokens.kt b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactBarTokens.kt
index a9da2154db..30550faced 100644
--- a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactBarTokens.kt
+++ b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactBarTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange Compact brand tokens version 2.3.0
+// Orange Compact brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orangecompact.tokens.components
@@ -25,36 +25,37 @@ import com.orange.ouds.tokens.raw.OudsDimensionRawTokens
 import com.orange.ouds.tokens.raw.OudsEffectRawTokens
 
 internal data class OrangeCompactBarTokens(
-    override val borderRadiusActiveIndicatorCustomBottom: OudsBorderKeyToken.Radius = OudsBorderKeyToken.Radius.None,
-    override val borderRadiusActiveIndicatorCustomTop: OudsBorderKeyToken.Radius = OudsBorderKeyToken.Radius.None,
-    override val colorActiveIndicatorAndroidSelectedDisabled: OudsColorKeyToken = OudsColorKeyToken.Opacity.Transparent,
-    override val colorActiveIndicatorAndroidSelectedEnabled: OudsColorKeyToken = OudsColorKeyToken.Opacity.Transparent,
-    override val colorActiveIndicatorAndroidSelectedFocus: OudsColorKeyToken = OudsColorKeyToken.Opacity.Transparent,
-    override val colorActiveIndicatorAndroidSelectedHover: OudsColorKeyToken = OudsColorKeyToken.Opacity.Transparent,
-    override val colorActiveIndicatorAndroidSelectedPressed: OudsColorKeyToken = OudsColorKeyToken.Opacity.Transparent,
-    override val colorActiveIndicatorAndroidUnselectedDisabled: OudsColorKeyToken = OudsColorKeyToken.Opacity.Transparent,
-    override val colorActiveIndicatorAndroidUnselectedFocus: OudsColorKeyToken = OudsColorKeyToken.Opacity.Transparent,
-    override val colorActiveIndicatorAndroidUnselectedHover: OudsColorKeyToken = OudsColorKeyToken.Opacity.Transparent,
-    override val colorActiveIndicatorAndroidUnselectedPressed: OudsColorKeyToken = OudsColorKeyToken.Opacity.Transparent,
-    override val colorActiveIndicatorCustomSelectedEnabled: OudsColorKeyToken = OudsColorKeyToken.Action.Selected,
-    override val colorActiveIndicatorCustomSelectedFocus: OudsColorKeyToken = OudsColorKeyToken.Action.Focus,
-    override val colorActiveIndicatorCustomSelectedHover: OudsColorKeyToken = OudsColorKeyToken.Action.Hover,
-    override val colorActiveIndicatorCustomSelectedPressed: OudsColorKeyToken = OudsColorKeyToken.Action.Pressed,
+    override val borderRadiusCurrentIndicatorCustomBottom: OudsBorderKeyToken.Radius = OudsBorderKeyToken.Radius.None,
+    override val borderRadiusCurrentIndicatorCustomTop: OudsBorderKeyToken.Radius = OudsBorderKeyToken.Radius.None,
     override val colorBgOpaque: OudsColorKeyToken = OudsColorKeyToken.Background.Secondary,
-    override val colorBgTranslucent: OudsLightDarkColor = OudsLightDarkColor(Color(0xccf4f4f4), Color(0xcc1f1f1f)),
+    override val colorBgTranslucent: OudsLightDarkColor = OudsLightDarkColor(Color(0xccffffff), Color(0xcc141414)),
     override val colorBorderBadge: OudsColorKeyToken = OudsColorKeyToken.Background.Secondary,
     override val colorContentOnIosAccent: OudsColorKeyToken = OudsColorKeyToken.Content.OnAction.Selected,
     override val colorContentSelectedEnabled: OudsColorKeyToken = OudsColorKeyToken.Content.Default,
     override val colorContentSelectedFocus: OudsColorKeyToken = OudsColorKeyToken.Action.Focus,
     override val colorContentSelectedHover: OudsColorKeyToken = OudsColorKeyToken.Action.Hover,
     override val colorContentSelectedPressed: OudsColorKeyToken = OudsColorKeyToken.Action.Pressed,
-    override val colorContentUnselectedEnabled: OudsLightDarkColor = OudsLightDarkColor(Color(0x99000000), Color(0x99ffffff)),
+    override val colorContentUnselectedEnabled: OudsColorKeyToken = OudsColorKeyToken.Content.Muted,
     override val colorContentUnselectedFocus: OudsColorKeyToken = OudsColorKeyToken.Content.Default,
     override val colorContentUnselectedHover: OudsColorKeyToken = OudsColorKeyToken.Content.Default,
     override val colorContentUnselectedPressed: OudsColorKeyToken = OudsColorKeyToken.Action.Pressed,
-    override val effectBgBlur: Int = OudsEffectRawTokens.EffectBlur160,
-    override val opacityActiveIndicatorCustom: OudsOpacityKeyToken = OudsOpacityKeyToken.Opaque,
-    override val sizeHeightActiveIndicatorCustom: Float = OudsDimensionRawTokens.DimensionOutOfSystem75,
-    override val sizeWidthActiveIndicatorCustomBottom: Float = OudsDimensionRawTokens.Dimension300,
-    override val sizeWidthActiveIndicatorCustomTop: Float = OudsDimensionRawTokens.Dimension650
+    override val colorCurrentIndicatorAndroidSelectedDisabled: OudsColorKeyToken = OudsColorKeyToken.Opacity.Transparent,
+    override val colorCurrentIndicatorAndroidSelectedEnabled: OudsColorKeyToken = OudsColorKeyToken.Opacity.Transparent,
+    override val colorCurrentIndicatorAndroidSelectedFocus: OudsColorKeyToken = OudsColorKeyToken.Opacity.Transparent,
+    override val colorCurrentIndicatorAndroidSelectedHover: OudsColorKeyToken = OudsColorKeyToken.Opacity.Transparent,
+    override val colorCurrentIndicatorAndroidSelectedPressed: OudsColorKeyToken = OudsColorKeyToken.Opacity.Transparent,
+    override val colorCurrentIndicatorAndroidUnselectedDisabled: OudsColorKeyToken = OudsColorKeyToken.Opacity.Transparent,
+    override val colorCurrentIndicatorAndroidUnselectedFocus: OudsColorKeyToken = OudsColorKeyToken.Opacity.Transparent,
+    override val colorCurrentIndicatorAndroidUnselectedHover: OudsColorKeyToken = OudsColorKeyToken.Opacity.Transparent,
+    override val colorCurrentIndicatorAndroidUnselectedPressed: OudsColorKeyToken = OudsColorKeyToken.Opacity.Transparent,
+    override val colorCurrentIndicatorCustomSelectedEnabled: OudsColorKeyToken = OudsColorKeyToken.Action.Selected,
+    override val colorCurrentIndicatorCustomSelectedFocus: OudsColorKeyToken = OudsColorKeyToken.Action.Focus,
+    override val colorCurrentIndicatorCustomSelectedHover: OudsColorKeyToken = OudsColorKeyToken.Action.Hover,
+    override val colorCurrentIndicatorCustomSelectedPressed: OudsColorKeyToken = OudsColorKeyToken.Action.Pressed,
+    override val colorIosAccent: OudsColorKeyToken = OudsColorKeyToken.Action.Selected,
+    override val effectBgBlur: Int = OudsEffectRawTokens.EffectBlur320,
+    override val opacityCurrentIndicatorCustom: OudsOpacityKeyToken = OudsOpacityKeyToken.Opaque,
+    override val sizeHeightCurrentIndicatorCustom: Float = OudsDimensionRawTokens.DimensionOutOfSystem75,
+    override val sizeWidthCurrentIndicatorCustomBottom: Float = OudsDimensionRawTokens.Dimension300,
+    override val sizeWidthCurrentIndicatorCustomTop: Float = OudsDimensionRawTokens.Dimension500
 ) : OudsBarTokens
diff --git a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactBulletListTokens.kt b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactBulletListTokens.kt
index 49ee6b6f1a..5360e620db 100644
--- a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactBulletListTokens.kt
+++ b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactBulletListTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange Compact brand tokens version 2.3.0
+// Orange Compact brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orangecompact.tokens.components
diff --git a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactButtonMonoTokens.kt b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactButtonMonoTokens.kt
index 8846ed2ddb..fbae9e02db 100644
--- a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactButtonMonoTokens.kt
+++ b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactButtonMonoTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange Compact brand tokens version 2.3.0
+// Orange Compact brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orangecompact.tokens.components
diff --git a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactButtonTokens.kt b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactButtonTokens.kt
index 7afac5c50c..856f2e4c75 100644
--- a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactButtonTokens.kt
+++ b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactButtonTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange Compact brand tokens version 2.3.0
+// Orange Compact brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orangecompact.tokens.components
diff --git a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactCheckboxTokens.kt b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactCheckboxTokens.kt
index b4d1267139..9d9a2b6ec0 100644
--- a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactCheckboxTokens.kt
+++ b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactCheckboxTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange Compact brand tokens version 2.3.0
+// Orange Compact brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orangecompact.tokens.components
@@ -29,7 +29,6 @@ internal data class OrangeCompactCheckboxTokens(
     override val borderWidthUnselectedFocus: OudsBorderKeyToken.Width = OudsBorderKeyToken.Width.Medium,
     override val borderWidthUnselectedHover: OudsBorderKeyToken.Width = OudsBorderKeyToken.Width.Medium,
     override val borderWidthUnselectedPressed: OudsBorderKeyToken.Width = OudsBorderKeyToken.Width.Medium,
-    override val sizeIndicator: OudsSizeKeyToken.Icon = OudsSizeKeyToken.Icon.WithLabel.Large.SizeExtraSmall,
     override val sizeMaxHeight: OudsSizeKeyToken = OudsSizeKeyToken.MinInteractiveArea,
     override val sizeMinHeight: OudsSizeKeyToken = OudsSizeKeyToken.MinInteractiveArea,
     override val sizeMinWidth: OudsSizeKeyToken = OudsSizeKeyToken.MinInteractiveArea
diff --git a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactChipTokens.kt b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactChipTokens.kt
index be1ffbe497..6c0185c4c2 100644
--- a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactChipTokens.kt
+++ b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactChipTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange Compact brand tokens version 2.3.0
+// Orange Compact brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orangecompact.tokens.components
diff --git a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactControlItemTokens.kt b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactControlItemTokens.kt
index d890aaaa26..1321c11db3 100644
--- a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactControlItemTokens.kt
+++ b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactControlItemTokens.kt
@@ -10,19 +10,70 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange Compact brand tokens version 2.3.0
+// Orange Compact brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orangecompact.tokens.components
 
 import com.orange.ouds.theme.tokens.OudsBorderKeyToken
 import com.orange.ouds.theme.tokens.OudsColorKeyToken
+import com.orange.ouds.theme.tokens.OudsOpacityKeyToken
 import com.orange.ouds.theme.tokens.OudsSizeKeyToken
 import com.orange.ouds.theme.tokens.OudsSpaceKeyToken
 import com.orange.ouds.theme.tokens.components.OudsControlItemTokens
 import com.orange.ouds.tokens.raw.OudsDimensionRawTokens
+import com.orange.ouds.tokens.raw.OudsFontRawTokens
 
 internal data class OrangeCompactControlItemTokens(
+    override val borderRadiusCurrentIndicator: OudsBorderKeyToken.Radius = OudsBorderKeyToken.Radius.None,
+    override val borderRadiusDefault: OudsBorderKeyToken.Radius = OudsBorderKeyToken.Radius.Default,
+    override val borderRadiusMedia: OudsBorderKeyToken.Radius = OudsBorderKeyToken.Radius.Default,
+    override val borderRadiusMediaRoundedCorner: OudsBorderKeyToken.Radius = OudsBorderKeyToken.Radius.Small,
+    override val borderRadiusRounded: OudsBorderKeyToken.Radius = OudsBorderKeyToken.Radius.Medium,
+    override val borderWidthCurrentPage: OudsBorderKeyToken.Width = OudsBorderKeyToken.Width.Medium,
+    override val borderWidthDefault: OudsBorderKeyToken.Width = OudsBorderKeyToken.Width.Default,
+    override val colorBadgeSafetyArea: OudsColorKeyToken = OudsColorKeyToken.Background.Primary,
+    override val colorBgCurrentDisabled: OudsColorKeyToken = OudsColorKeyToken.Action.Support.Disabled,
+    override val colorBgCurrentEnabled: OudsColorKeyToken = OudsColorKeyToken.Action.Support.Enabled,
+    override val colorBgCurrentFocus: OudsColorKeyToken = OudsColorKeyToken.Action.Support.Focus,
+    override val colorBgCurrentHover: OudsColorKeyToken = OudsColorKeyToken.Action.Support.Hover,
+    override val colorBgCurrentPressed: OudsColorKeyToken = OudsColorKeyToken.Action.Support.Pressed,
+    override val colorContentCurrentDisabled: OudsColorKeyToken = OudsColorKeyToken.Content.Default,
+    override val colorContentCurrentEnabled: OudsColorKeyToken = OudsColorKeyToken.Content.Default,
+    override val colorContentCurrentFocus: OudsColorKeyToken = OudsColorKeyToken.Content.Default,
+    override val colorContentCurrentHover: OudsColorKeyToken = OudsColorKeyToken.Content.Default,
+    override val colorContentCurrentPressed: OudsColorKeyToken = OudsColorKeyToken.Content.Default,
+    override val fontLetterSpacingAvatarInitialXlarge: Float = OudsFontRawTokens.FontLetterSpacing350,
+    override val fontLineHeightAvatarInitialXlarge: Int = OudsFontRawTokens.FontLineHeight550,
+    override val fontSizeAvatarInitialXlarge: Int = OudsFontRawTokens.FontSize350,
+    override val opacityCurrentDivider: OudsOpacityKeyToken = OudsOpacityKeyToken.Opaque,
+    override val opacityCurrentIndicator: OudsOpacityKeyToken = OudsOpacityKeyToken.Opaque,
+    override val sizeAssetLarge: Float = OudsDimensionRawTokens.Dimension450,
+    override val sizeAssetMedium: OudsSizeKeyToken.Icon = OudsSizeKeyToken.Icon.WithLabel.Large.SizeMedium,
+    override val sizeAssetSmall: OudsSizeKeyToken.Icon = OudsSizeKeyToken.Icon.WithLabel.Large.SizeSmall,
+    override val sizeAssetXlarge: Float = OudsDimensionRawTokens.Dimension650,
+    override val sizeControlIndicator: OudsSizeKeyToken.Icon = OudsSizeKeyToken.Icon.WithLabel.Large.SizeExtraSmall,
+    override val sizeCurrentIndicatorWidth: Float = OudsDimensionRawTokens.Dimension50,
+    override val sizeFlagHeight: OudsSizeKeyToken.Icon = OudsSizeKeyToken.Icon.WithLabel.Large.SizeExtraSmall,
+    override val sizeMaxWidth: Float = OudsDimensionRawTokens.Dimension4000,
+    override val sizeMinHeightCompact: OudsSizeKeyToken = OudsSizeKeyToken.MinInteractiveArea,
+    override val sizeMinHeightDefault: Float = OudsDimensionRawTokens.Dimension650,
+    override val sizeMinWidth: Float = OudsDimensionRawTokens.Dimension1800,
+    override val spaceColumnGap: OudsSpaceKeyToken.ColumnGap = OudsSpaceKeyToken.ColumnGap.Medium,
+    override val spacePaddingBlockBottomSlot: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.FourExtraSmall,
+    override val spacePaddingBlockDensityCompact: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.ExtraSmall,
+    override val spacePaddingBlockDensityCompactBottomExpandContainer: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.TwoExtraLarge,
+    override val spacePaddingBlockDensityCompactTopAlignmentTopCounterweight: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.ExtraSmall,
+    override val spacePaddingBlockDensityCompactTopAlignmentTopTextContainer: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.None,
+    override val spacePaddingBlockDensityDefault: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.Medium,
+    override val spacePaddingBlockDensityDefaultBottomExpandContainer: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.ThreeExtraLarge,
+    override val spacePaddingBlockDensityDefaultTopAlignmentTopCounterweight: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.Small,
+    override val spacePaddingBlockDensityDefaultTopAlignmentTopTextContainer: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.None,
+    override val spacePaddingBlockTopHelperText: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.ExtraSmall,
+    override val spacePaddingInline: OudsSpaceKeyToken.PaddingInline = OudsSpaceKeyToken.PaddingInline.Large,
+    override val spaceRowGap: OudsSpaceKeyToken.RowGap = OudsSpaceKeyToken.RowGap.None,
+
+    // TODO Keep the following tokens until the new control items are implemented, then remove them.
     override val borderRadius: OudsBorderKeyToken.Radius = OudsBorderKeyToken.Radius.None,
     override val borderRadiusItemOnly: OudsBorderKeyToken.Radius = OudsBorderKeyToken.Radius.Default,
     override val colorBgFocus: OudsColorKeyToken = OudsColorKeyToken.Action.Support.Focus,
@@ -31,16 +82,8 @@ internal data class OrangeCompactControlItemTokens(
     override val colorBgPressed: OudsColorKeyToken = OudsColorKeyToken.Action.Support.Pressed,
     override val colorContentLoader: OudsColorKeyToken = OudsColorKeyToken.Content.Default,
     override val sizeErrorIcon: OudsSizeKeyToken.Icon = OudsSizeKeyToken.Icon.WithLabel.Large.SizeSmall,
-    override val sizeIcon: OudsSizeKeyToken.Icon = OudsSizeKeyToken.Icon.WithLabel.Large.SizeMedium,
     override val sizeLoader: OudsSizeKeyToken.Icon = OudsSizeKeyToken.Icon.WithLabel.Large.SizeSmall,
     override val sizeMaxHeightAssetsContainer: Float = OudsDimensionRawTokens.Dimension1000,
-    override val sizeMaxWidth: Float = OudsDimensionRawTokens.Dimension4000,
-    override val sizeMinHeight: Float = OudsDimensionRawTokens.Dimension500,
-    override val sizeMinWidth: Float = OudsDimensionRawTokens.Dimension1800,
-    override val spaceColumnGap: OudsSpaceKeyToken.ColumnGap = OudsSpaceKeyToken.ColumnGap.Medium,
     override val spacePaddingBlockDefault: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.Medium,
-    override val spacePaddingBlockTopErrorText: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.ExtraSmall,
-    override val spacePaddingInline: OudsSpaceKeyToken.PaddingInline = OudsSpaceKeyToken.PaddingInline.Large,
-    override val spacePaddingInlineErrorIcon: OudsSpaceKeyToken.PaddingInline = OudsSpaceKeyToken.PaddingInline.FourExtraSmall,
-    override val spaceRowGap: OudsSpaceKeyToken.RowGap = OudsSpaceKeyToken.RowGap.None
+    override val spacePaddingInlineErrorIcon: OudsSpaceKeyToken.PaddingInline = OudsSpaceKeyToken.PaddingInline.FourExtraSmall
 ) : OudsControlItemTokens
diff --git a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactDividerTokens.kt b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactDividerTokens.kt
index 245562883a..4f319b4e63 100644
--- a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactDividerTokens.kt
+++ b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactDividerTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange Compact brand tokens version 2.3.0
+// Orange Compact brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orangecompact.tokens.components
diff --git a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactIconTokens.kt b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactIconTokens.kt
index 6f3f3c84f4..b76fbd7a23 100644
--- a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactIconTokens.kt
+++ b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactIconTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange Compact brand tokens version 2.3.0
+// Orange Compact brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orangecompact.tokens.components
@@ -20,7 +20,8 @@ import com.orange.ouds.theme.tokens.OudsLightDarkColorKeyToken
 import com.orange.ouds.theme.tokens.components.OudsIconTokens
 
 internal data class OrangeCompactIconTokens(
-    override val colorContentDefault: OudsColorKeyToken = OudsLightDarkColorKeyToken(OudsColorKeyToken.Repository.Neutral.Emphasized.Black, OudsColorKeyToken.Repository.Neutral.Muted.Lower),
     override val colorContentStatusWarningExternalShape: OudsColorKeyToken = OudsLightDarkColorKeyToken(OudsColorKeyToken.Repository.Warning.Medium, OudsColorKeyToken.Repository.Warning.Low),
-    override val colorContentStatusWarningInternalShape: OudsColorKeyToken = OudsLightDarkColorKeyToken(OudsColorKeyToken.Repository.Warning.High, OudsColorKeyToken.Opacity.Transparent)
+    override val colorContentStatusWarningInternalShape: OudsColorKeyToken = OudsLightDarkColorKeyToken(OudsColorKeyToken.Repository.Warning.High, OudsColorKeyToken.Opacity.Transparent),
+    override val colorContentStatusWarningInverseExternalShape: OudsColorKeyToken = OudsLightDarkColorKeyToken(OudsColorKeyToken.Repository.Warning.Low, OudsColorKeyToken.Repository.Warning.Medium),
+    override val colorContentStatusWarningInverseInternalShape: OudsColorKeyToken = OudsLightDarkColorKeyToken(OudsColorKeyToken.Opacity.Transparent, OudsColorKeyToken.Repository.Warning.High)
 ) : OudsIconTokens
diff --git a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactInputTagTokens.kt b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactInputTagTokens.kt
index e91ec8043b..3808e42bd3 100644
--- a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactInputTagTokens.kt
+++ b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactInputTagTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange Compact brand tokens version 2.3.0
+// Orange Compact brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orangecompact.tokens.components
diff --git a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactLinkMonoTokens.kt b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactLinkMonoTokens.kt
index 79bbd4d28d..990c28d037 100644
--- a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactLinkMonoTokens.kt
+++ b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactLinkMonoTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange Compact brand tokens version 2.3.0
+// Orange Compact brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orangecompact.tokens.components
diff --git a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactLinkTokens.kt b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactLinkTokens.kt
index 892e704c5a..76241e8f59 100644
--- a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactLinkTokens.kt
+++ b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactLinkTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange Compact brand tokens version 2.3.0
+// Orange Compact brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orangecompact.tokens.components
diff --git a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactPinCodeInputTokens.kt b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactPinCodeInputTokens.kt
index 89273bb974..77896ae384 100644
--- a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactPinCodeInputTokens.kt
+++ b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactPinCodeInputTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange Compact brand tokens version 2.3.0
+// Orange Compact brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orangecompact.tokens.components
diff --git a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactRadioButtonTokens.kt b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactRadioButtonTokens.kt
index 48fbd9eb44..77ee262efb 100644
--- a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactRadioButtonTokens.kt
+++ b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactRadioButtonTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange Compact brand tokens version 2.3.0
+// Orange Compact brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orangecompact.tokens.components
@@ -29,7 +29,6 @@ internal data class OrangeCompactRadioButtonTokens(
     override val borderWidthUnselectedFocus: OudsBorderKeyToken.Width = OudsBorderKeyToken.Width.Medium,
     override val borderWidthUnselectedHover: OudsBorderKeyToken.Width = OudsBorderKeyToken.Width.Medium,
     override val borderWidthUnselectedPressed: OudsBorderKeyToken.Width = OudsBorderKeyToken.Width.Medium,
-    override val sizeIndicator: OudsSizeKeyToken.Icon = OudsSizeKeyToken.Icon.WithLabel.Large.SizeExtraSmall,
     override val sizeMaxHeight: OudsSizeKeyToken = OudsSizeKeyToken.MinInteractiveArea,
     override val sizeMinHeight: OudsSizeKeyToken = OudsSizeKeyToken.MinInteractiveArea,
     override val sizeMinWidth: OudsSizeKeyToken = OudsSizeKeyToken.MinInteractiveArea
diff --git a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactSwitchTokens.kt b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactSwitchTokens.kt
index c565a84428..f68fe0d9c6 100644
--- a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactSwitchTokens.kt
+++ b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactSwitchTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange Compact brand tokens version 2.3.0
+// Orange Compact brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orangecompact.tokens.components
diff --git a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactTagTokens.kt b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactTagTokens.kt
index c742466eaa..e566dd7970 100644
--- a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactTagTokens.kt
+++ b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactTagTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange Compact brand tokens version 2.3.0
+// Orange Compact brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orangecompact.tokens.components
@@ -28,8 +28,8 @@ internal data class OrangeCompactTagTokens(
     override val sizeMinHeightDefault: Float = OudsDimensionRawTokens.Dimension350,
     override val sizeMinHeightInteractiveArea: OudsSizeKeyToken = OudsSizeKeyToken.MinInteractiveArea,
     override val sizeMinHeightSmall: Float = OudsDimensionRawTokens.Dimension250,
-    override val sizeMinWidthDefault: Float = OudsDimensionRawTokens.Dimension550,
-    override val sizeMinWidthSmall: Float = OudsDimensionRawTokens.Dimension500,
+    override val sizeMinWidthDefault: Float = OudsDimensionRawTokens.Dimension350,
+    override val sizeMinWidthSmall: Float = OudsDimensionRawTokens.Dimension300,
     override val spaceColumnGapDefault: OudsSpaceKeyToken.ColumnGap = OudsSpaceKeyToken.ColumnGap.TwoExtraSmall,
     override val spaceColumnGapSmall: OudsSpaceKeyToken.ColumnGap = OudsSpaceKeyToken.ColumnGap.TwoExtraSmall,
     override val spaceInsetBulletDefault: Float = OudsDimensionRawTokens.DimensionOutOfSystem75,
diff --git a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactTextAreaTokens.kt b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactTextAreaTokens.kt
index d60641f8d3..3a7ef062d4 100644
--- a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactTextAreaTokens.kt
+++ b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactTextAreaTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange Compact brand tokens version 2.3.0
+// Orange Compact brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orangecompact.tokens.components
@@ -24,5 +24,6 @@ internal data class OrangeCompactTextAreaTokens(
     override val sizeMaxHeightInput: Float = OudsDimensionRawTokens.Dimension2500,
     override val sizeMaxWidth: Float = OudsDimensionRawTokens.Dimension6000,
     override val sizeMinHeightInput: Float = OudsDimensionRawTokens.Dimension750,
-    override val spacePaddingBlock: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.Small
+    override val spacePaddingBlock: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.ExtraSmall,
+    override val spacePaddingBlockTopEmpty: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.Large
 ) : OudsTextAreaTokens
diff --git a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactTextInputTokens.kt b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactTextInputTokens.kt
index ecaeed1461..f28274801a 100644
--- a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactTextInputTokens.kt
+++ b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/components/OrangeCompactTextInputTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange Compact brand tokens version 2.3.0
+// Orange Compact brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orangecompact.tokens.components
@@ -24,7 +24,7 @@ import com.orange.ouds.tokens.raw.OudsDimensionRawTokens
 
 internal data class OrangeCompactTextInputTokens(
     override val borderRadiusDefault: OudsBorderKeyToken.Radius = OudsBorderKeyToken.Radius.Default,
-    override val borderRadiusRounded: OudsBorderKeyToken.Radius = OudsBorderKeyToken.Radius.Small,
+    override val borderRadiusRounded: OudsBorderKeyToken.Radius = OudsBorderKeyToken.Radius.Medium,
     override val borderWidthDefault: OudsBorderKeyToken.Width = OudsBorderKeyToken.Width.Default,
     override val borderWidthFocus: OudsBorderKeyToken.Width = OudsBorderKeyToken.Width.Medium,
     override val colorBorderEnabled: OudsColorKeyToken = OudsColorKeyToken.Border.Default,
@@ -40,6 +40,8 @@ internal data class OrangeCompactTextInputTokens(
     override val sizeVerticalDividerHeight: Float = OudsDimensionRawTokens.Dimension200,
     override val spaceColumnGapDefault: OudsSpaceKeyToken.ColumnGap = OudsSpaceKeyToken.ColumnGap.Medium,
     override val spaceColumnGapInlineText: OudsSpaceKeyToken.ColumnGap = OudsSpaceKeyToken.ColumnGap.ExtraSmall,
+    override val spaceColumnGapLabelAsterisk: OudsSpaceKeyToken.ColumnGap = OudsSpaceKeyToken.ColumnGap.TwoExtraSmall,
+    override val spaceColumnGapLabelSmallAsterisk: Float = OudsDimensionRawTokens.DimensionOutOfSystem75,
     override val spaceColumnGapTrailingErrorAction: OudsSpaceKeyToken.ColumnGap = OudsSpaceKeyToken.ColumnGap.ExtraSmall,
     override val spacePaddingBlockDefault: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.TwoExtraSmall,
     override val spacePaddingBlockTopHelperText: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.ExtraSmall,
diff --git a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactBorderSemanticTokens.kt b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactBorderSemanticTokens.kt
index b24b8a42ca..14ef5db4bd 100644
--- a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactBorderSemanticTokens.kt
+++ b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactBorderSemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange Compact brand tokens version 2.3.0
+// Orange Compact brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orangecompact.tokens.semantic
diff --git a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactColorActionSemanticTokens.kt b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactColorActionSemanticTokens.kt
index d4941b6dd1..f5709a3f97 100644
--- a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactColorActionSemanticTokens.kt
+++ b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactColorActionSemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange Compact brand tokens version 2.3.0
+// Orange Compact brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orangecompact.tokens.semantic
diff --git a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactColorAlwaysSemanticTokens.kt b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactColorAlwaysSemanticTokens.kt
index 0df0f797b1..669e4647a0 100644
--- a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactColorAlwaysSemanticTokens.kt
+++ b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactColorAlwaysSemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange Compact brand tokens version 2.3.0
+// Orange Compact brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orangecompact.tokens.semantic
diff --git a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactColorBgSemanticTokens.kt b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactColorBgSemanticTokens.kt
index 265b5dcd56..8ca2fdeb6a 100644
--- a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactColorBgSemanticTokens.kt
+++ b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactColorBgSemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange Compact brand tokens version 2.3.0
+// Orange Compact brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orangecompact.tokens.semantic
diff --git a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactColorBorderSemanticTokens.kt b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactColorBorderSemanticTokens.kt
index 6098b9b393..ce7d52a78b 100644
--- a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactColorBorderSemanticTokens.kt
+++ b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactColorBorderSemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange Compact brand tokens version 2.3.0
+// Orange Compact brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orangecompact.tokens.semantic
@@ -29,7 +29,7 @@ internal data class OrangeCompactColorBorderSemanticTokens(
     override val borderBrandTertiaryLight: Color = Color.Unspecified,
     override val borderDefaultDark: Color = OudsColorRawTokens.ColorOpacityWhite200,
     override val borderDefaultLight: Color = OudsColorRawTokens.ColorOpacityBlack200,
-    override val borderEmphasizedDark: Color = OudsColorRawTokens.ColorOpacityWhite920,
+    override val borderEmphasizedDark: Color = OudsColorRawTokens.ColorFunctionalGrayLight160,
     override val borderEmphasizedLight: Color = OudsColorRawTokens.ColorFunctionalBlack,
     override val borderFocusDark: Color = OudsColorRawTokens.ColorFunctionalGrayLight160,
     override val borderFocusInsetDark: Color = OudsColorRawTokens.ColorFunctionalBlack,
diff --git a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactColorContentSemanticTokens.kt b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactColorContentSemanticTokens.kt
index 5f463e46fd..036a854f5e 100644
--- a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactColorContentSemanticTokens.kt
+++ b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactColorContentSemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange Compact brand tokens version 2.3.0
+// Orange Compact brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orangecompact.tokens.semantic
@@ -81,6 +81,14 @@ internal data class OrangeCompactColorContentSemanticTokens(
     override val contentStatusAccentLight: Color = OrangeColorRawTokens.ColorOrange500,
     override val contentStatusInfoDark: Color = OudsColorRawTokens.ColorFunctionalDodgerBlue300,
     override val contentStatusInfoLight: Color = OudsColorRawTokens.ColorFunctionalDodgerBlue700,
+    override val contentStatusInverseInfoDark: Color = OudsColorRawTokens.ColorFunctionalDodgerBlue700,
+    override val contentStatusInverseInfoLight: Color = OudsColorRawTokens.ColorFunctionalDodgerBlue300,
+    override val contentStatusInverseNegativeDark: Color = OudsColorRawTokens.ColorFunctionalScarlet600,
+    override val contentStatusInverseNegativeLight: Color = OudsColorRawTokens.ColorFunctionalScarlet300,
+    override val contentStatusInversePositiveDark: Color = OudsColorRawTokens.ColorFunctionalMalachite750,
+    override val contentStatusInversePositiveLight: Color = OudsColorRawTokens.ColorFunctionalMalachite300,
+    override val contentStatusInverseWarningDark: Color = OudsColorRawTokens.ColorFunctionalSun750,
+    override val contentStatusInverseWarningLight: Color = OudsColorRawTokens.ColorFunctionalSun300,
     override val contentStatusNegativeDark: Color = OudsColorRawTokens.ColorFunctionalScarlet300,
     override val contentStatusNegativeLight: Color = OudsColorRawTokens.ColorFunctionalScarlet600,
     override val contentStatusPositiveDark: Color = OudsColorRawTokens.ColorFunctionalMalachite300,
diff --git a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactColorModeSemanticTokens.kt b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactColorModeSemanticTokens.kt
index 18409262f2..278219546c 100644
--- a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactColorModeSemanticTokens.kt
+++ b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactColorModeSemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange Compact brand tokens version 2.3.0
+// Orange Compact brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orangecompact.tokens.semantic
diff --git a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactColorOpacitySemanticTokens.kt b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactColorOpacitySemanticTokens.kt
index 0f71476a28..77c3a85867 100644
--- a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactColorOpacitySemanticTokens.kt
+++ b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactColorOpacitySemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange Compact brand tokens version 2.3.0
+// Orange Compact brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orangecompact.tokens.semantic
diff --git a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactColorOverlaySemanticTokens.kt b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactColorOverlaySemanticTokens.kt
index 142950b262..d90e9df6da 100644
--- a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactColorOverlaySemanticTokens.kt
+++ b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactColorOverlaySemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange Compact brand tokens version 2.3.0
+// Orange Compact brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orangecompact.tokens.semantic
@@ -20,12 +20,14 @@ import com.orange.ouds.theme.tokens.semantic.OudsColorOverlaySemanticTokens
 import com.orange.ouds.tokens.raw.OudsColorRawTokens
 
 internal data class OrangeCompactColorOverlaySemanticTokens(
+    override val overlayBackdropDark: Color = OudsColorRawTokens.ColorOpacityBlack680,
+    override val overlayBackdropLight: Color = OudsColorRawTokens.ColorOpacityBlack680,
     override val overlayDragDark: Color = OudsColorRawTokens.ColorOpacityWhite80,
     override val overlayDragLight: Color = OudsColorRawTokens.ColorOpacityBlack40,
     override val overlayDropdownDark: Color = OudsColorRawTokens.ColorFunctionalGrayDark560,
     override val overlayDropdownLight: Color = OudsColorRawTokens.ColorFunctionalWhite,
-    override val overlayModalDark: Color = OudsColorRawTokens.ColorFunctionalGrayDark640,
-    override val overlayModalLight: Color = OudsColorRawTokens.ColorFunctionalWhite,
+    override val overlayModalSheetDark: Color = OudsColorRawTokens.ColorFunctionalGrayDark720,
+    override val overlayModalSheetLight: Color = OudsColorRawTokens.ColorFunctionalWhite,
     override val overlayTooltipDark: Color = OudsColorRawTokens.ColorFunctionalGrayDark560,
     override val overlayTooltipLight: Color = OudsColorRawTokens.ColorFunctionalGrayDark720
 ) : OudsColorOverlaySemanticTokens
diff --git a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactColorRepositorySemanticTokens.kt b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactColorRepositorySemanticTokens.kt
index b8483cd14d..07c10f8ec9 100644
--- a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactColorRepositorySemanticTokens.kt
+++ b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactColorRepositorySemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange Compact brand tokens version 2.3.0
+// Orange Compact brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orangecompact.tokens.semantic
@@ -110,7 +110,8 @@ internal data class OrangeCompactColorRepositorySemanticTokens(
     override val repositoryPrimaryLowest: Color = Color.Unspecified,
     override val repositoryPrimaryMedium: Color = OrangeColorRawTokens.ColorOrange550,
     override val repositorySecondaryHigh: Color = Color.Unspecified,
-    override val repositorySecondaryHigher: Color = Color.Unspecified,
+    override val repositorySecondaryHigherHigh: Color = Color.Unspecified,
+    override val repositorySecondaryHigherLow: Color = Color.Unspecified,
     override val repositorySecondaryHighest: Color = Color.Unspecified,
     override val repositorySecondaryLow: Color = Color.Unspecified,
     override val repositorySecondaryLower: Color = Color.Unspecified,
diff --git a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactColorSurfaceSemanticTokens.kt b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactColorSurfaceSemanticTokens.kt
index 8248c0821a..58dd394c0f 100644
--- a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactColorSurfaceSemanticTokens.kt
+++ b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactColorSurfaceSemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange Compact brand tokens version 2.3.0
+// Orange Compact brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orangecompact.tokens.semantic
diff --git a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactEffectSemanticTokens.kt b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactEffectSemanticTokens.kt
index a636e05a51..3270fd8847 100644
--- a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactEffectSemanticTokens.kt
+++ b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactEffectSemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange Compact brand tokens version 2.3.0
+// Orange Compact brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orangecompact.tokens.semantic
@@ -19,5 +19,5 @@ import com.orange.ouds.theme.tokens.semantic.OudsEffectSemanticTokens
 import com.orange.ouds.tokens.raw.OudsEffectRawTokens
 
 internal data class OrangeCompactEffectSemanticTokens(
-    override val blurDrag: Int = OudsEffectRawTokens.EffectBlur320
+    override val blurDrag: Int = OudsEffectRawTokens.EffectBlur480
 ) : OudsEffectSemanticTokens
diff --git a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactFontSemanticTokens.kt b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactFontSemanticTokens.kt
index efd91a2ad3..e0b5304d9e 100644
--- a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactFontSemanticTokens.kt
+++ b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactFontSemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange Compact brand tokens version 2.3.0
+// Orange Compact brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orangecompact.tokens.semantic
diff --git a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactGridSemanticTokens.kt b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactGridSemanticTokens.kt
index 9a6ec2d2f4..854cb72e08 100644
--- a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactGridSemanticTokens.kt
+++ b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactGridSemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange Compact brand tokens version 2.3.0
+// Orange Compact brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orangecompact.tokens.semantic
@@ -19,7 +19,7 @@ import com.orange.ouds.theme.tokens.semantic.OudsGridSemanticTokens
 import com.orange.ouds.tokens.raw.OudsGridRawTokens
 
 internal data class OrangeCompactGridSemanticTokens(
-    override val compactColumnGap: Int = OudsGridRawTokens.GridColumnGap100,
+    override val compactColumnGap: Int = OudsGridRawTokens.GridColumnGap200,
     override val compactMargin: Int = OudsGridRawTokens.GridMargin100,
     override val compactMaxWidth: Int = OudsGridRawTokens.GridMaxWidthCompact,
     override val compactMinWidth: Int = OudsGridRawTokens.GridMinWidthCompact,
diff --git a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactOpacitySemanticTokens.kt b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactOpacitySemanticTokens.kt
index 4e10eb97a2..b89d5937da 100644
--- a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactOpacitySemanticTokens.kt
+++ b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactOpacitySemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange Compact brand tokens version 2.3.0
+// Orange Compact brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orangecompact.tokens.semantic
diff --git a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactSizeSemanticTokens.kt b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactSizeSemanticTokens.kt
index b18f0a5530..951d0a0b10 100644
--- a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactSizeSemanticTokens.kt
+++ b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactSizeSemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange Compact brand tokens version 2.3.0
+// Orange Compact brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orangecompact.tokens.semantic
@@ -73,7 +73,7 @@ internal data class OrangeCompactSizeSemanticTokens(
     override val iconWithLabelLargeSizeLarge: Float = OudsDimensionRawTokens.Dimension350,
     override val iconWithLabelLargeSizeMedium: Float = OudsDimensionRawTokens.Dimension300,
     override val iconWithLabelLargeSizeSmall: Float = OudsDimensionRawTokens.Dimension250,
-    override val iconWithLabelLargeSizeXlarge: Float = OudsDimensionRawTokens.Dimension500,
+    override val iconWithLabelLargeSizeXlarge: Float = OudsDimensionRawTokens.Dimension400,
     override val iconWithLabelLargeSizeXsmall: Float = OudsDimensionRawTokens.Dimension200,
     override val iconWithLabelMediumSizeLarge: Float = OudsDimensionRawTokens.Dimension250,
     override val iconWithLabelMediumSizeMedium: Float = OudsDimensionRawTokens.Dimension200,
@@ -83,36 +83,37 @@ internal data class OrangeCompactSizeSemanticTokens(
     override val iconWithLabelSmallSizeMedium: Float = OudsDimensionRawTokens.Dimension200,
     override val iconWithLabelSmallSizeSmall: Float = OudsDimensionRawTokens.Dimension150,
     override val iconWithLabelSmallSizeXsmall: Float = OudsDimensionRawTokens.DimensionOutOfSystem250,
-    override val iconWithLabelXlargeSizeLarge: Float = OudsDimensionRawTokens.Dimension500,
-    override val iconWithLabelXlargeSizeMedium: Float = OudsDimensionRawTokens.Dimension450,
+    override val iconWithLabelXlargeSizeLarge: Float = OudsDimensionRawTokens.Dimension450,
+    override val iconWithLabelXlargeSizeMedium: Float = OudsDimensionRawTokens.Dimension400,
     override val iconWithLabelXlargeSizeSmall: Float = OudsDimensionRawTokens.Dimension350,
-    override val maxWidthTypeBodyLargeMobile: Float = OudsDimensionRawTokens.Dimension6000,
-    override val maxWidthTypeBodyLargeTablet: Float = OudsDimensionRawTokens.Dimension6000,
-    override val maxWidthTypeBodyMediumMobile: Float = OudsDimensionRawTokens.Dimension6000,
-    override val maxWidthTypeBodyMediumTablet: Float = OudsDimensionRawTokens.Dimension6000,
-    override val maxWidthTypeBodySmallMobile: Float = OudsDimensionRawTokens.Dimension6000,
-    override val maxWidthTypeBodySmallTablet: Float = OudsDimensionRawTokens.Dimension6000,
-    override val maxWidthTypeDisplayLargeMobile: Float = OudsDimensionRawTokens.Dimension9000,
-    override val maxWidthTypeDisplayLargeTablet: Float = OudsDimensionRawTokens.Dimension9000,
-    override val maxWidthTypeDisplayMediumMobile: Float = OudsDimensionRawTokens.Dimension9000,
-    override val maxWidthTypeDisplayMediumTablet: Float = OudsDimensionRawTokens.Dimension9000,
-    override val maxWidthTypeDisplaySmallMobile: Float = OudsDimensionRawTokens.Dimension7000,
-    override val maxWidthTypeDisplaySmallTablet: Float = OudsDimensionRawTokens.Dimension9000,
-    override val maxWidthTypeHeadingLargeMobile: Float = OudsDimensionRawTokens.Dimension7000,
-    override val maxWidthTypeHeadingLargeTablet: Float = OudsDimensionRawTokens.Dimension7000,
-    override val maxWidthTypeHeadingMediumMobile: Float = OudsDimensionRawTokens.Dimension6000,
-    override val maxWidthTypeHeadingMediumTablet: Float = OudsDimensionRawTokens.Dimension6000,
-    override val maxWidthTypeHeadingSmallMobile: Float = OudsDimensionRawTokens.Dimension6000,
-    override val maxWidthTypeHeadingSmallTablet: Float = OudsDimensionRawTokens.Dimension6000,
-    override val maxWidthTypeHeadingXlargeMobile: Float = OudsDimensionRawTokens.Dimension7000,
-    override val maxWidthTypeHeadingXlargeTablet: Float = OudsDimensionRawTokens.Dimension7000,
-    override val maxWidthTypeLabelLargeMobile: Float = OudsDimensionRawTokens.Dimension6000,
-    override val maxWidthTypeLabelLargeTablet: Float = OudsDimensionRawTokens.Dimension6000,
-    override val maxWidthTypeLabelMediumMobile: Float = OudsDimensionRawTokens.Dimension6000,
-    override val maxWidthTypeLabelMediumTablet: Float = OudsDimensionRawTokens.Dimension6000,
-    override val maxWidthTypeLabelSmallMobile: Float = OudsDimensionRawTokens.Dimension6000,
-    override val maxWidthTypeLabelSmallTablet: Float = OudsDimensionRawTokens.Dimension6000,
-    override val maxWidthTypeLabelXlargeMobile: Float = OudsDimensionRawTokens.Dimension6000,
-    override val maxWidthTypeLabelXlargeTablet: Float = OudsDimensionRawTokens.Dimension6000,
+    override val iconWithLabelXlargeSizeXsmall: Float = OudsDimensionRawTokens.Dimension300,
+    override val maxWidthBodyLargeMobile: Float = OudsDimensionRawTokens.Dimension6000,
+    override val maxWidthBodyLargeTablet: Float = OudsDimensionRawTokens.Dimension6000,
+    override val maxWidthBodyMediumMobile: Float = OudsDimensionRawTokens.Dimension6000,
+    override val maxWidthBodyMediumTablet: Float = OudsDimensionRawTokens.Dimension6000,
+    override val maxWidthBodySmallMobile: Float = OudsDimensionRawTokens.Dimension6000,
+    override val maxWidthBodySmallTablet: Float = OudsDimensionRawTokens.Dimension6000,
+    override val maxWidthDisplayLargeMobile: Float = OudsDimensionRawTokens.Dimension9000,
+    override val maxWidthDisplayLargeTablet: Float = OudsDimensionRawTokens.Dimension9000,
+    override val maxWidthDisplayMediumMobile: Float = OudsDimensionRawTokens.Dimension9000,
+    override val maxWidthDisplayMediumTablet: Float = OudsDimensionRawTokens.Dimension9000,
+    override val maxWidthDisplaySmallMobile: Float = OudsDimensionRawTokens.Dimension7000,
+    override val maxWidthDisplaySmallTablet: Float = OudsDimensionRawTokens.Dimension9000,
+    override val maxWidthHeadingLargeMobile: Float = OudsDimensionRawTokens.Dimension7000,
+    override val maxWidthHeadingLargeTablet: Float = OudsDimensionRawTokens.Dimension7000,
+    override val maxWidthHeadingMediumMobile: Float = OudsDimensionRawTokens.Dimension6000,
+    override val maxWidthHeadingMediumTablet: Float = OudsDimensionRawTokens.Dimension6000,
+    override val maxWidthHeadingSmallMobile: Float = OudsDimensionRawTokens.Dimension6000,
+    override val maxWidthHeadingSmallTablet: Float = OudsDimensionRawTokens.Dimension6000,
+    override val maxWidthHeadingXlargeMobile: Float = OudsDimensionRawTokens.Dimension7000,
+    override val maxWidthHeadingXlargeTablet: Float = OudsDimensionRawTokens.Dimension7000,
+    override val maxWidthLabelLargeMobile: Float = OudsDimensionRawTokens.Dimension6000,
+    override val maxWidthLabelLargeTablet: Float = OudsDimensionRawTokens.Dimension6000,
+    override val maxWidthLabelMediumMobile: Float = OudsDimensionRawTokens.Dimension6000,
+    override val maxWidthLabelMediumTablet: Float = OudsDimensionRawTokens.Dimension6000,
+    override val maxWidthLabelSmallMobile: Float = OudsDimensionRawTokens.Dimension6000,
+    override val maxWidthLabelSmallTablet: Float = OudsDimensionRawTokens.Dimension6000,
+    override val maxWidthLabelXlargeMobile: Float = OudsDimensionRawTokens.Dimension6000,
+    override val maxWidthLabelXlargeTablet: Float = OudsDimensionRawTokens.Dimension6000,
     override val minInteractiveArea: Float = OudsDimensionRawTokens.Dimension500
 ) : OudsSizeSemanticTokens
diff --git a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactSpaceSemanticTokens.kt b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactSpaceSemanticTokens.kt
index abc89bf40a..c38597e5fe 100644
--- a/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactSpaceSemanticTokens.kt
+++ b/theme-orange-compact/src/main/java/com/orange/ouds/theme/orangecompact/tokens/semantic/OrangeCompactSpaceSemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange Compact brand tokens version 2.3.0
+// Orange Compact brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orangecompact.tokens.semantic
diff --git a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeAlertTokens.kt b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeAlertTokens.kt
index 7536f13962..b9370045ab 100644
--- a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeAlertTokens.kt
+++ b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeAlertTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orange.tokens.components
diff --git a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeBadgeTokens.kt b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeBadgeTokens.kt
index 6909f702e0..b87f0260b3 100644
--- a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeBadgeTokens.kt
+++ b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeBadgeTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orange.tokens.components
@@ -24,7 +24,9 @@ internal data class OrangeBadgeTokens(
     override val sizeMedium: Float = OudsDimensionRawTokens.Dimension200,
     override val sizeSmall: Float = OudsDimensionRawTokens.Dimension150,
     override val sizeXsmall: Float = OudsDimensionRawTokens.Dimension100,
-    override val spaceInset: Float = OudsDimensionRawTokens.DimensionOutOfSystem75,
+    override val spaceInsetMediumLarge: Float = OudsDimensionRawTokens.DimensionOutOfSystem75,
+    override val spaceInsetSmall: Float = OudsDimensionRawTokens.DimensionOutOfSystem50,
+    override val spaceInsetXsmall: Float = OudsDimensionRawTokens.DimensionOutOfSystem25,
     override val spacePaddingInlineLarge: OudsSpaceKeyToken.PaddingInline = OudsSpaceKeyToken.PaddingInline.TwoExtraSmall,
     override val spacePaddingInlineMedium: OudsSpaceKeyToken.PaddingInline = OudsSpaceKeyToken.PaddingInline.ThreeExtraSmall
 ) : OudsBadgeTokens
diff --git a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeBarTokens.kt b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeBarTokens.kt
index a70a19f021..564a57e093 100644
--- a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeBarTokens.kt
+++ b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeBarTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orange.tokens.components
@@ -25,36 +25,37 @@ import com.orange.ouds.tokens.raw.OudsDimensionRawTokens
 import com.orange.ouds.tokens.raw.OudsEffectRawTokens
 
 internal data class OrangeBarTokens(
-    override val borderRadiusActiveIndicatorCustomBottom: OudsBorderKeyToken.Radius = OudsBorderKeyToken.Radius.None,
-    override val borderRadiusActiveIndicatorCustomTop: OudsBorderKeyToken.Radius = OudsBorderKeyToken.Radius.None,
-    override val colorActiveIndicatorAndroidSelectedDisabled: OudsColorKeyToken = OudsColorKeyToken.Opacity.Transparent,
-    override val colorActiveIndicatorAndroidSelectedEnabled: OudsColorKeyToken = OudsColorKeyToken.Opacity.Transparent,
-    override val colorActiveIndicatorAndroidSelectedFocus: OudsColorKeyToken = OudsColorKeyToken.Opacity.Transparent,
-    override val colorActiveIndicatorAndroidSelectedHover: OudsColorKeyToken = OudsColorKeyToken.Opacity.Transparent,
-    override val colorActiveIndicatorAndroidSelectedPressed: OudsColorKeyToken = OudsColorKeyToken.Opacity.Transparent,
-    override val colorActiveIndicatorAndroidUnselectedDisabled: OudsColorKeyToken = OudsColorKeyToken.Opacity.Transparent,
-    override val colorActiveIndicatorAndroidUnselectedFocus: OudsColorKeyToken = OudsColorKeyToken.Opacity.Transparent,
-    override val colorActiveIndicatorAndroidUnselectedHover: OudsColorKeyToken = OudsColorKeyToken.Opacity.Transparent,
-    override val colorActiveIndicatorAndroidUnselectedPressed: OudsColorKeyToken = OudsColorKeyToken.Opacity.Transparent,
-    override val colorActiveIndicatorCustomSelectedEnabled: OudsColorKeyToken = OudsColorKeyToken.Action.Selected,
-    override val colorActiveIndicatorCustomSelectedFocus: OudsColorKeyToken = OudsColorKeyToken.Action.Focus,
-    override val colorActiveIndicatorCustomSelectedHover: OudsColorKeyToken = OudsColorKeyToken.Action.Hover,
-    override val colorActiveIndicatorCustomSelectedPressed: OudsColorKeyToken = OudsColorKeyToken.Action.Pressed,
+    override val borderRadiusCurrentIndicatorCustomBottom: OudsBorderKeyToken.Radius = OudsBorderKeyToken.Radius.None,
+    override val borderRadiusCurrentIndicatorCustomTop: OudsBorderKeyToken.Radius = OudsBorderKeyToken.Radius.None,
     override val colorBgOpaque: OudsColorKeyToken = OudsColorKeyToken.Background.Secondary,
-    override val colorBgTranslucent: OudsLightDarkColor = OudsLightDarkColor(Color(0xccf4f4f4), Color(0xcc1f1f1f)),
+    override val colorBgTranslucent: OudsLightDarkColor = OudsLightDarkColor(Color(0xccffffff), Color(0xcc141414)),
     override val colorBorderBadge: OudsColorKeyToken = OudsColorKeyToken.Background.Secondary,
     override val colorContentOnIosAccent: OudsColorKeyToken = OudsColorKeyToken.Content.OnAction.Selected,
     override val colorContentSelectedEnabled: OudsColorKeyToken = OudsColorKeyToken.Content.Default,
     override val colorContentSelectedFocus: OudsColorKeyToken = OudsColorKeyToken.Action.Focus,
     override val colorContentSelectedHover: OudsColorKeyToken = OudsColorKeyToken.Action.Hover,
     override val colorContentSelectedPressed: OudsColorKeyToken = OudsColorKeyToken.Action.Pressed,
-    override val colorContentUnselectedEnabled: OudsLightDarkColor = OudsLightDarkColor(Color(0x99000000), Color(0x99ffffff)),
+    override val colorContentUnselectedEnabled: OudsColorKeyToken = OudsColorKeyToken.Content.Muted,
     override val colorContentUnselectedFocus: OudsColorKeyToken = OudsColorKeyToken.Content.Default,
     override val colorContentUnselectedHover: OudsColorKeyToken = OudsColorKeyToken.Content.Default,
     override val colorContentUnselectedPressed: OudsColorKeyToken = OudsColorKeyToken.Action.Pressed,
-    override val effectBgBlur: Int = OudsEffectRawTokens.EffectBlur160,
-    override val opacityActiveIndicatorCustom: OudsOpacityKeyToken = OudsOpacityKeyToken.Opaque,
-    override val sizeHeightActiveIndicatorCustom: Float = OudsDimensionRawTokens.DimensionOutOfSystem75,
-    override val sizeWidthActiveIndicatorCustomBottom: Float = OudsDimensionRawTokens.Dimension300,
-    override val sizeWidthActiveIndicatorCustomTop: Float = OudsDimensionRawTokens.Dimension650
+    override val colorCurrentIndicatorAndroidSelectedDisabled: OudsColorKeyToken = OudsColorKeyToken.Opacity.Transparent,
+    override val colorCurrentIndicatorAndroidSelectedEnabled: OudsColorKeyToken = OudsColorKeyToken.Opacity.Transparent,
+    override val colorCurrentIndicatorAndroidSelectedFocus: OudsColorKeyToken = OudsColorKeyToken.Opacity.Transparent,
+    override val colorCurrentIndicatorAndroidSelectedHover: OudsColorKeyToken = OudsColorKeyToken.Opacity.Transparent,
+    override val colorCurrentIndicatorAndroidSelectedPressed: OudsColorKeyToken = OudsColorKeyToken.Opacity.Transparent,
+    override val colorCurrentIndicatorAndroidUnselectedDisabled: OudsColorKeyToken = OudsColorKeyToken.Opacity.Transparent,
+    override val colorCurrentIndicatorAndroidUnselectedFocus: OudsColorKeyToken = OudsColorKeyToken.Opacity.Transparent,
+    override val colorCurrentIndicatorAndroidUnselectedHover: OudsColorKeyToken = OudsColorKeyToken.Opacity.Transparent,
+    override val colorCurrentIndicatorAndroidUnselectedPressed: OudsColorKeyToken = OudsColorKeyToken.Opacity.Transparent,
+    override val colorCurrentIndicatorCustomSelectedEnabled: OudsColorKeyToken = OudsColorKeyToken.Action.Selected,
+    override val colorCurrentIndicatorCustomSelectedFocus: OudsColorKeyToken = OudsColorKeyToken.Action.Focus,
+    override val colorCurrentIndicatorCustomSelectedHover: OudsColorKeyToken = OudsColorKeyToken.Action.Hover,
+    override val colorCurrentIndicatorCustomSelectedPressed: OudsColorKeyToken = OudsColorKeyToken.Action.Pressed,
+    override val colorIosAccent: OudsColorKeyToken = OudsColorKeyToken.Action.Selected,
+    override val effectBgBlur: Int = OudsEffectRawTokens.EffectBlur320,
+    override val opacityCurrentIndicatorCustom: OudsOpacityKeyToken = OudsOpacityKeyToken.Opaque,
+    override val sizeHeightCurrentIndicatorCustom: Float = OudsDimensionRawTokens.DimensionOutOfSystem75,
+    override val sizeWidthCurrentIndicatorCustomBottom: Float = OudsDimensionRawTokens.Dimension300,
+    override val sizeWidthCurrentIndicatorCustomTop: Float = OudsDimensionRawTokens.Dimension500
 ) : OudsBarTokens
diff --git a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeBulletListTokens.kt b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeBulletListTokens.kt
index 4b7bd0878b..b9be8626ef 100644
--- a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeBulletListTokens.kt
+++ b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeBulletListTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orange.tokens.components
diff --git a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeButtonMonoTokens.kt b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeButtonMonoTokens.kt
index 9fe5743192..77e5394b3d 100644
--- a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeButtonMonoTokens.kt
+++ b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeButtonMonoTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orange.tokens.components
diff --git a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeButtonTokens.kt b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeButtonTokens.kt
index 0b1382f485..61a2501902 100644
--- a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeButtonTokens.kt
+++ b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeButtonTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orange.tokens.components
diff --git a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeCheckboxTokens.kt b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeCheckboxTokens.kt
index c971dab152..8fd50f1b1d 100644
--- a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeCheckboxTokens.kt
+++ b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeCheckboxTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orange.tokens.components
@@ -29,7 +29,6 @@ internal data class OrangeCheckboxTokens(
     override val borderWidthUnselectedFocus: OudsBorderKeyToken.Width = OudsBorderKeyToken.Width.Medium,
     override val borderWidthUnselectedHover: OudsBorderKeyToken.Width = OudsBorderKeyToken.Width.Medium,
     override val borderWidthUnselectedPressed: OudsBorderKeyToken.Width = OudsBorderKeyToken.Width.Medium,
-    override val sizeIndicator: OudsSizeKeyToken.Icon = OudsSizeKeyToken.Icon.WithLabel.Large.SizeExtraSmall,
     override val sizeMaxHeight: OudsSizeKeyToken = OudsSizeKeyToken.MinInteractiveArea,
     override val sizeMinHeight: OudsSizeKeyToken = OudsSizeKeyToken.MinInteractiveArea,
     override val sizeMinWidth: OudsSizeKeyToken = OudsSizeKeyToken.MinInteractiveArea
diff --git a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeChipTokens.kt b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeChipTokens.kt
index 2373602a47..cd9831d3a0 100644
--- a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeChipTokens.kt
+++ b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeChipTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orange.tokens.components
diff --git a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeControlItemTokens.kt b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeControlItemTokens.kt
index cf5bf6f901..649e0fd1c6 100644
--- a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeControlItemTokens.kt
+++ b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeControlItemTokens.kt
@@ -10,19 +10,74 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orange.tokens.components
 
 import com.orange.ouds.theme.tokens.OudsBorderKeyToken
 import com.orange.ouds.theme.tokens.OudsColorKeyToken
+import com.orange.ouds.theme.tokens.OudsLightDarkColorKeyToken
+import com.orange.ouds.theme.tokens.OudsOpacityKeyToken
 import com.orange.ouds.theme.tokens.OudsSizeKeyToken
 import com.orange.ouds.theme.tokens.OudsSpaceKeyToken
 import com.orange.ouds.theme.tokens.components.OudsControlItemTokens
 import com.orange.ouds.tokens.raw.OudsDimensionRawTokens
+import com.orange.ouds.tokens.raw.OudsFontRawTokens
 
 internal data class OrangeControlItemTokens(
+    override val borderRadiusCurrentIndicator: OudsBorderKeyToken.Radius = OudsBorderKeyToken.Radius.None,
+    override val borderRadiusDefault: OudsBorderKeyToken.Radius = OudsBorderKeyToken.Radius.Default,
+    override val borderRadiusMedia: OudsBorderKeyToken.Radius = OudsBorderKeyToken.Radius.Default,
+    override val borderRadiusMediaRoundedCorner: OudsBorderKeyToken.Radius = OudsBorderKeyToken.Radius.Small,
+    override val borderRadiusRounded: OudsBorderKeyToken.Radius = OudsBorderKeyToken.Radius.Medium,
+    override val borderWidthCurrentPage: OudsBorderKeyToken.Width = OudsBorderKeyToken.Width.Medium,
+    override val borderWidthDefault: OudsBorderKeyToken.Width = OudsBorderKeyToken.Width.Default,
+    override val colorBadgeSafetyArea: OudsColorKeyToken = OudsColorKeyToken.Background.Primary,
+    override val colorBgCurrentDisabled: OudsColorKeyToken = OudsColorKeyToken.Action.Support.Disabled,
+    override val colorBgCurrentEnabled: OudsColorKeyToken = OudsLightDarkColorKeyToken(
+        OudsColorKeyToken.Action.Support.Enabled,
+        OudsColorKeyToken.Action.Support.Hover
+    ),
+    override val colorBgCurrentFocus: OudsColorKeyToken = OudsColorKeyToken.Action.Support.Focus,
+    override val colorBgCurrentHover: OudsColorKeyToken = OudsColorKeyToken.Action.Support.Hover,
+    override val colorBgCurrentPressed: OudsColorKeyToken = OudsColorKeyToken.Action.Support.Pressed,
+    override val colorContentCurrentDisabled: OudsColorKeyToken = OudsColorKeyToken.Content.Default,
+    override val colorContentCurrentEnabled: OudsColorKeyToken = OudsColorKeyToken.Content.Default,
+    override val colorContentCurrentFocus: OudsColorKeyToken = OudsColorKeyToken.Content.Default,
+    override val colorContentCurrentHover: OudsColorKeyToken = OudsColorKeyToken.Content.Default,
+    override val colorContentCurrentPressed: OudsColorKeyToken = OudsColorKeyToken.Content.Default,
+    override val fontLetterSpacingAvatarInitialXlarge: Float = OudsFontRawTokens.FontLetterSpacing450,
+    override val fontLineHeightAvatarInitialXlarge: Int = OudsFontRawTokens.FontLineHeight650,
+    override val fontSizeAvatarInitialXlarge: Int = OudsFontRawTokens.FontSize450,
+    override val opacityCurrentDivider: OudsOpacityKeyToken = OudsOpacityKeyToken.Opaque,
+    override val opacityCurrentIndicator: OudsOpacityKeyToken = OudsOpacityKeyToken.Opaque,
+    override val sizeAssetLarge: Float = OudsDimensionRawTokens.Dimension500,
+    override val sizeAssetMedium: OudsSizeKeyToken.Icon = OudsSizeKeyToken.Icon.WithLabel.Large.SizeMedium,
+    override val sizeAssetSmall: OudsSizeKeyToken.Icon = OudsSizeKeyToken.Icon.WithLabel.Large.SizeSmall,
+    override val sizeAssetXlarge: Float = OudsDimensionRawTokens.Dimension700,
+    override val sizeControlIndicator: OudsSizeKeyToken.Icon = OudsSizeKeyToken.Icon.WithLabel.Large.SizeExtraSmall,
+    override val sizeCurrentIndicatorWidth: Float = OudsDimensionRawTokens.Dimension50,
+    override val sizeFlagHeight: OudsSizeKeyToken.Icon = OudsSizeKeyToken.Icon.WithLabel.Large.SizeExtraSmall,
+    override val sizeMaxWidth: Float = OudsDimensionRawTokens.Dimension4000,
+    override val sizeMinHeightCompact: OudsSizeKeyToken = OudsSizeKeyToken.MinInteractiveArea,
+    override val sizeMinHeightDefault: Float = OudsDimensionRawTokens.Dimension750,
+    override val sizeMinWidth: Float = OudsDimensionRawTokens.Dimension2000,
+    override val spaceColumnGap: OudsSpaceKeyToken.ColumnGap = OudsSpaceKeyToken.ColumnGap.Medium,
+    override val spacePaddingBlockBottomSlot: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.ThreeExtraSmall,
+    override val spacePaddingBlockDensityCompact: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.ExtraSmall,
+    override val spacePaddingBlockDensityCompactBottomExpandContainer: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.TwoExtraLarge,
+    override val spacePaddingBlockDensityCompactTopAlignmentTopCounterweight: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.ExtraSmall,
+    override val spacePaddingBlockDensityCompactTopAlignmentTopTextContainer: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.None,
+    override val spacePaddingBlockDensityDefault: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.Medium,
+    override val spacePaddingBlockDensityDefaultBottomExpandContainer: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.ThreeExtraLarge,
+    override val spacePaddingBlockDensityDefaultTopAlignmentTopCounterweight: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.Small,
+    override val spacePaddingBlockDensityDefaultTopAlignmentTopTextContainer: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.FourExtraSmall,
+    override val spacePaddingBlockTopHelperText: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.ExtraSmall,
+    override val spacePaddingInline: OudsSpaceKeyToken.PaddingInline = OudsSpaceKeyToken.PaddingInline.Large,
+    override val spaceRowGap: OudsSpaceKeyToken.RowGap = OudsSpaceKeyToken.RowGap.None,
+
+    // TODO Keep the following tokens until the new control items are implemented, then remove them.
     override val borderRadius: OudsBorderKeyToken.Radius = OudsBorderKeyToken.Radius.None,
     override val borderRadiusItemOnly: OudsBorderKeyToken.Radius = OudsBorderKeyToken.Radius.Default,
     override val colorBgFocus: OudsColorKeyToken = OudsColorKeyToken.Action.Support.Focus,
@@ -31,16 +86,8 @@ internal data class OrangeControlItemTokens(
     override val colorBgPressed: OudsColorKeyToken = OudsColorKeyToken.Action.Support.Pressed,
     override val colorContentLoader: OudsColorKeyToken = OudsColorKeyToken.Content.Default,
     override val sizeErrorIcon: OudsSizeKeyToken.Icon = OudsSizeKeyToken.Icon.WithLabel.Large.SizeSmall,
-    override val sizeIcon: OudsSizeKeyToken.Icon = OudsSizeKeyToken.Icon.WithLabel.Large.SizeMedium,
     override val sizeLoader: OudsSizeKeyToken.Icon = OudsSizeKeyToken.Icon.WithLabel.Large.SizeSmall,
     override val sizeMaxHeightAssetsContainer: Float = OudsDimensionRawTokens.Dimension1200,
-    override val sizeMaxWidth: Float = OudsDimensionRawTokens.Dimension4000,
-    override val sizeMinHeight: Float = OudsDimensionRawTokens.Dimension650,
-    override val sizeMinWidth: Float = OudsDimensionRawTokens.Dimension2000,
-    override val spaceColumnGap: OudsSpaceKeyToken.ColumnGap = OudsSpaceKeyToken.ColumnGap.Medium,
     override val spacePaddingBlockDefault: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.Medium,
-    override val spacePaddingBlockTopErrorText: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.ExtraSmall,
-    override val spacePaddingInline: OudsSpaceKeyToken.PaddingInline = OudsSpaceKeyToken.PaddingInline.Large,
-    override val spacePaddingInlineErrorIcon: OudsSpaceKeyToken.PaddingInline = OudsSpaceKeyToken.PaddingInline.FourExtraSmall,
-    override val spaceRowGap: OudsSpaceKeyToken.RowGap = OudsSpaceKeyToken.RowGap.None
+    override val spacePaddingInlineErrorIcon: OudsSpaceKeyToken.PaddingInline = OudsSpaceKeyToken.PaddingInline.FourExtraSmall
 ) : OudsControlItemTokens
diff --git a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeDividerTokens.kt b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeDividerTokens.kt
index 0b0d262091..b4e1fd41d7 100644
--- a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeDividerTokens.kt
+++ b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeDividerTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orange.tokens.components
diff --git a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeIconTokens.kt b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeIconTokens.kt
index fb2d030b45..11124ac2e1 100644
--- a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeIconTokens.kt
+++ b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeIconTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orange.tokens.components
@@ -20,7 +20,8 @@ import com.orange.ouds.theme.tokens.OudsLightDarkColorKeyToken
 import com.orange.ouds.theme.tokens.components.OudsIconTokens
 
 internal data class OrangeIconTokens(
-    override val colorContentDefault: OudsColorKeyToken = OudsLightDarkColorKeyToken(OudsColorKeyToken.Repository.Neutral.Emphasized.Black, OudsColorKeyToken.Repository.Neutral.Muted.Lower),
     override val colorContentStatusWarningExternalShape: OudsColorKeyToken = OudsLightDarkColorKeyToken(OudsColorKeyToken.Repository.Warning.Medium, OudsColorKeyToken.Repository.Warning.Low),
-    override val colorContentStatusWarningInternalShape: OudsColorKeyToken = OudsLightDarkColorKeyToken(OudsColorKeyToken.Repository.Warning.High, OudsColorKeyToken.Opacity.Transparent)
+    override val colorContentStatusWarningInternalShape: OudsColorKeyToken = OudsLightDarkColorKeyToken(OudsColorKeyToken.Repository.Warning.High, OudsColorKeyToken.Opacity.Transparent),
+    override val colorContentStatusWarningInverseExternalShape: OudsColorKeyToken = OudsLightDarkColorKeyToken(OudsColorKeyToken.Repository.Warning.Low, OudsColorKeyToken.Repository.Warning.Medium),
+    override val colorContentStatusWarningInverseInternalShape: OudsColorKeyToken = OudsLightDarkColorKeyToken(OudsColorKeyToken.Opacity.Transparent, OudsColorKeyToken.Repository.Warning.High)
 ) : OudsIconTokens
diff --git a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeInputTagTokens.kt b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeInputTagTokens.kt
index 2c381117ed..34a936369f 100644
--- a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeInputTagTokens.kt
+++ b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeInputTagTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orange.tokens.components
diff --git a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeLinkMonoTokens.kt b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeLinkMonoTokens.kt
index e5088d947f..cc3667ffdb 100644
--- a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeLinkMonoTokens.kt
+++ b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeLinkMonoTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orange.tokens.components
diff --git a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeLinkTokens.kt b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeLinkTokens.kt
index 6806c3196f..ca99fcf332 100644
--- a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeLinkTokens.kt
+++ b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeLinkTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orange.tokens.components
diff --git a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangePinCodeInputTokens.kt b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangePinCodeInputTokens.kt
index 6d3358963b..6a88ad3bb6 100644
--- a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangePinCodeInputTokens.kt
+++ b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangePinCodeInputTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orange.tokens.components
diff --git a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeRadioButtonTokens.kt b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeRadioButtonTokens.kt
index da80091bbd..edb02611cb 100644
--- a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeRadioButtonTokens.kt
+++ b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeRadioButtonTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orange.tokens.components
@@ -29,7 +29,6 @@ internal data class OrangeRadioButtonTokens(
     override val borderWidthUnselectedFocus: OudsBorderKeyToken.Width = OudsBorderKeyToken.Width.Medium,
     override val borderWidthUnselectedHover: OudsBorderKeyToken.Width = OudsBorderKeyToken.Width.Medium,
     override val borderWidthUnselectedPressed: OudsBorderKeyToken.Width = OudsBorderKeyToken.Width.Medium,
-    override val sizeIndicator: OudsSizeKeyToken.Icon = OudsSizeKeyToken.Icon.WithLabel.Large.SizeExtraSmall,
     override val sizeMaxHeight: OudsSizeKeyToken = OudsSizeKeyToken.MinInteractiveArea,
     override val sizeMinHeight: OudsSizeKeyToken = OudsSizeKeyToken.MinInteractiveArea,
     override val sizeMinWidth: OudsSizeKeyToken = OudsSizeKeyToken.MinInteractiveArea
diff --git a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeSwitchTokens.kt b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeSwitchTokens.kt
index 83032342b2..ed2439bc0f 100644
--- a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeSwitchTokens.kt
+++ b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeSwitchTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orange.tokens.components
diff --git a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeTagTokens.kt b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeTagTokens.kt
index 49c8c5eb59..628dfd827e 100644
--- a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeTagTokens.kt
+++ b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeTagTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orange.tokens.components
@@ -28,8 +28,8 @@ internal data class OrangeTagTokens(
     override val sizeMinHeightDefault: Float = OudsDimensionRawTokens.Dimension400,
     override val sizeMinHeightInteractiveArea: OudsSizeKeyToken = OudsSizeKeyToken.MinInteractiveArea,
     override val sizeMinHeightSmall: Float = OudsDimensionRawTokens.Dimension300,
-    override val sizeMinWidthDefault: Float = OudsDimensionRawTokens.Dimension600,
-    override val sizeMinWidthSmall: Float = OudsDimensionRawTokens.Dimension550,
+    override val sizeMinWidthDefault: Float = OudsDimensionRawTokens.Dimension400,
+    override val sizeMinWidthSmall: Float = OudsDimensionRawTokens.Dimension300,
     override val spaceColumnGapDefault: OudsSpaceKeyToken.ColumnGap = OudsSpaceKeyToken.ColumnGap.TwoExtraSmall,
     override val spaceColumnGapSmall: OudsSpaceKeyToken.ColumnGap = OudsSpaceKeyToken.ColumnGap.TwoExtraSmall,
     override val spaceInsetBulletDefault: Float = OudsDimensionRawTokens.DimensionOutOfSystem75,
diff --git a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeTextAreaTokens.kt b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeTextAreaTokens.kt
index 89fe8f8dee..649fccc363 100644
--- a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeTextAreaTokens.kt
+++ b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeTextAreaTokens.kt
@@ -10,13 +10,13 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orange.tokens.components
 
-import com.orange.ouds.theme.tokens.components.OudsTextAreaTokens
 import com.orange.ouds.theme.tokens.OudsSpaceKeyToken
+import com.orange.ouds.theme.tokens.components.OudsTextAreaTokens
 import com.orange.ouds.tokens.raw.OudsDimensionRawTokens
 
 internal data class OrangeTextAreaTokens(
@@ -24,5 +24,6 @@ internal data class OrangeTextAreaTokens(
     override val sizeMaxHeightInput: Float = OudsDimensionRawTokens.Dimension2500,
     override val sizeMaxWidth: Float = OudsDimensionRawTokens.Dimension6000,
     override val sizeMinHeightInput: Float = OudsDimensionRawTokens.Dimension900,
-    override val spacePaddingBlock: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.Small
+    override val spacePaddingBlock: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.Small,
+    override val spacePaddingBlockTopEmpty: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.Medium
 ) : OudsTextAreaTokens
diff --git a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeTextInputTokens.kt b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeTextInputTokens.kt
index 1564862673..f4ad2f3ee6 100644
--- a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeTextInputTokens.kt
+++ b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeTextInputTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orange.tokens.components
@@ -24,7 +24,7 @@ import com.orange.ouds.tokens.raw.OudsDimensionRawTokens
 
 internal data class OrangeTextInputTokens(
     override val borderRadiusDefault: OudsBorderKeyToken.Radius = OudsBorderKeyToken.Radius.Default,
-    override val borderRadiusRounded: OudsBorderKeyToken.Radius = OudsBorderKeyToken.Radius.Small,
+    override val borderRadiusRounded: OudsBorderKeyToken.Radius = OudsBorderKeyToken.Radius.Medium,
     override val borderWidthDefault: OudsBorderKeyToken.Width = OudsBorderKeyToken.Width.Default,
     override val borderWidthFocus: OudsBorderKeyToken.Width = OudsBorderKeyToken.Width.Medium,
     override val colorBorderEnabled: OudsColorKeyToken = OudsColorKeyToken.Border.Default,
@@ -40,6 +40,8 @@ internal data class OrangeTextInputTokens(
     override val sizeVerticalDividerHeight: Float = OudsDimensionRawTokens.Dimension250,
     override val spaceColumnGapDefault: OudsSpaceKeyToken.ColumnGap = OudsSpaceKeyToken.ColumnGap.Medium,
     override val spaceColumnGapInlineText: OudsSpaceKeyToken.ColumnGap = OudsSpaceKeyToken.ColumnGap.ExtraSmall,
+    override val spaceColumnGapLabelAsterisk: OudsSpaceKeyToken.ColumnGap = OudsSpaceKeyToken.ColumnGap.TwoExtraSmall,
+    override val spaceColumnGapLabelSmallAsterisk: Float = OudsDimensionRawTokens.DimensionOutOfSystem75,
     override val spaceColumnGapTrailingErrorAction: OudsSpaceKeyToken.ColumnGap = OudsSpaceKeyToken.ColumnGap.ExtraSmall,
     override val spacePaddingBlockDefault: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.TwoExtraSmall,
     override val spacePaddingBlockTopHelperText: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.ExtraSmall,
diff --git a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeBorderSemanticTokens.kt b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeBorderSemanticTokens.kt
index d2424e6e2b..b4aab50d79 100644
--- a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeBorderSemanticTokens.kt
+++ b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeBorderSemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orange.tokens.semantic
diff --git a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeColorActionSemanticTokens.kt b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeColorActionSemanticTokens.kt
index 70cc0443ce..93a60275ed 100644
--- a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeColorActionSemanticTokens.kt
+++ b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeColorActionSemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orange.tokens.semantic
diff --git a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeColorAlwaysSemanticTokens.kt b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeColorAlwaysSemanticTokens.kt
index b2501269ca..823d19cd26 100644
--- a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeColorAlwaysSemanticTokens.kt
+++ b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeColorAlwaysSemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orange.tokens.semantic
diff --git a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeColorBgSemanticTokens.kt b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeColorBgSemanticTokens.kt
index 4a6ec307b4..6ec3246840 100644
--- a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeColorBgSemanticTokens.kt
+++ b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeColorBgSemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orange.tokens.semantic
diff --git a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeColorBorderSemanticTokens.kt b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeColorBorderSemanticTokens.kt
index d53ad928b7..3dea1c31f9 100644
--- a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeColorBorderSemanticTokens.kt
+++ b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeColorBorderSemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orange.tokens.semantic
@@ -29,7 +29,7 @@ internal data class OrangeColorBorderSemanticTokens(
     override val borderBrandTertiaryLight: Color = Color.Unspecified,
     override val borderDefaultDark: Color = OudsColorRawTokens.ColorOpacityWhite200,
     override val borderDefaultLight: Color = OudsColorRawTokens.ColorOpacityBlack200,
-    override val borderEmphasizedDark: Color = OudsColorRawTokens.ColorOpacityWhite920,
+    override val borderEmphasizedDark: Color = OudsColorRawTokens.ColorFunctionalGrayLight160,
     override val borderEmphasizedLight: Color = OudsColorRawTokens.ColorFunctionalBlack,
     override val borderFocusDark: Color = OudsColorRawTokens.ColorFunctionalGrayLight160,
     override val borderFocusInsetDark: Color = OudsColorRawTokens.ColorFunctionalGrayDark880,
diff --git a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeColorContentSemanticTokens.kt b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeColorContentSemanticTokens.kt
index c550ea7958..611884229a 100644
--- a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeColorContentSemanticTokens.kt
+++ b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeColorContentSemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orange.tokens.semantic
@@ -81,6 +81,14 @@ internal data class OrangeColorContentSemanticTokens(
     override val contentStatusAccentLight: Color = OrangeColorRawTokens.ColorOrange500,
     override val contentStatusInfoDark: Color = OudsColorRawTokens.ColorFunctionalDodgerBlue300,
     override val contentStatusInfoLight: Color = OudsColorRawTokens.ColorFunctionalDodgerBlue700,
+    override val contentStatusInverseInfoDark: Color = OudsColorRawTokens.ColorFunctionalDodgerBlue700,
+    override val contentStatusInverseInfoLight: Color = OudsColorRawTokens.ColorFunctionalDodgerBlue300,
+    override val contentStatusInverseNegativeDark: Color = OudsColorRawTokens.ColorFunctionalScarlet600,
+    override val contentStatusInverseNegativeLight: Color = OudsColorRawTokens.ColorFunctionalScarlet300,
+    override val contentStatusInversePositiveDark: Color = OudsColorRawTokens.ColorFunctionalMalachite750,
+    override val contentStatusInversePositiveLight: Color = OudsColorRawTokens.ColorFunctionalMalachite300,
+    override val contentStatusInverseWarningDark: Color = OudsColorRawTokens.ColorFunctionalSun750,
+    override val contentStatusInverseWarningLight: Color = OudsColorRawTokens.ColorFunctionalSun300,
     override val contentStatusNegativeDark: Color = OudsColorRawTokens.ColorFunctionalScarlet300,
     override val contentStatusNegativeLight: Color = OudsColorRawTokens.ColorFunctionalScarlet600,
     override val contentStatusPositiveDark: Color = OudsColorRawTokens.ColorFunctionalMalachite300,
diff --git a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeColorModeSemanticTokens.kt b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeColorModeSemanticTokens.kt
index 9e25d3efd0..17d028ccc1 100644
--- a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeColorModeSemanticTokens.kt
+++ b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeColorModeSemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orange.tokens.semantic
diff --git a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeColorOpacitySemanticTokens.kt b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeColorOpacitySemanticTokens.kt
index a2b48d6b35..5ae6b7dc59 100644
--- a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeColorOpacitySemanticTokens.kt
+++ b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeColorOpacitySemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orange.tokens.semantic
diff --git a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeColorOverlaySemanticTokens.kt b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeColorOverlaySemanticTokens.kt
index f8bfad337e..b7c45c61f8 100644
--- a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeColorOverlaySemanticTokens.kt
+++ b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeColorOverlaySemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orange.tokens.semantic
@@ -20,12 +20,14 @@ import com.orange.ouds.theme.tokens.semantic.OudsColorOverlaySemanticTokens
 import com.orange.ouds.tokens.raw.OudsColorRawTokens
 
 internal data class OrangeColorOverlaySemanticTokens(
+    override val overlayBackdropDark: Color = OudsColorRawTokens.ColorOpacityBlack680,
+    override val overlayBackdropLight: Color = OudsColorRawTokens.ColorOpacityBlack680,
     override val overlayDragDark: Color = OudsColorRawTokens.ColorOpacityWhite80,
     override val overlayDragLight: Color = OudsColorRawTokens.ColorOpacityBlack40,
     override val overlayDropdownDark: Color = OudsColorRawTokens.ColorFunctionalGrayDark560,
     override val overlayDropdownLight: Color = OudsColorRawTokens.ColorFunctionalWhite,
-    override val overlayModalDark: Color = OudsColorRawTokens.ColorFunctionalGrayDark640,
-    override val overlayModalLight: Color = OudsColorRawTokens.ColorFunctionalWhite,
+    override val overlayModalSheetDark: Color = OudsColorRawTokens.ColorFunctionalGrayDark720,
+    override val overlayModalSheetLight: Color = OudsColorRawTokens.ColorFunctionalWhite,
     override val overlayTooltipDark: Color = OudsColorRawTokens.ColorFunctionalGrayDark560,
     override val overlayTooltipLight: Color = OudsColorRawTokens.ColorFunctionalGrayDark720
 ) : OudsColorOverlaySemanticTokens
diff --git a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeColorRepositorySemanticTokens.kt b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeColorRepositorySemanticTokens.kt
index c2d80e39f2..56c33dfeb0 100644
--- a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeColorRepositorySemanticTokens.kt
+++ b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeColorRepositorySemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orange.tokens.semantic
@@ -110,7 +110,8 @@ internal data class OrangeColorRepositorySemanticTokens(
     override val repositoryPrimaryLowest: Color = Color.Unspecified,
     override val repositoryPrimaryMedium: Color = OrangeColorRawTokens.ColorOrange550,
     override val repositorySecondaryHigh: Color = Color.Unspecified,
-    override val repositorySecondaryHigher: Color = Color.Unspecified,
+    override val repositorySecondaryHigherHigh: Color = Color.Unspecified,
+    override val repositorySecondaryHigherLow: Color = Color.Unspecified,
     override val repositorySecondaryHighest: Color = Color.Unspecified,
     override val repositorySecondaryLow: Color = Color.Unspecified,
     override val repositorySecondaryLower: Color = Color.Unspecified,
diff --git a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeColorSurfaceSemanticTokens.kt b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeColorSurfaceSemanticTokens.kt
index 6e3190238b..683c3b15c4 100644
--- a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeColorSurfaceSemanticTokens.kt
+++ b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeColorSurfaceSemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orange.tokens.semantic
diff --git a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeEffectSemanticTokens.kt b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeEffectSemanticTokens.kt
index 871b6dd847..f73f353fd4 100644
--- a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeEffectSemanticTokens.kt
+++ b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeEffectSemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orange.tokens.semantic
@@ -19,5 +19,5 @@ import com.orange.ouds.theme.tokens.semantic.OudsEffectSemanticTokens
 import com.orange.ouds.tokens.raw.OudsEffectRawTokens
 
 internal data class OrangeEffectSemanticTokens(
-    override val blurDrag: Int = OudsEffectRawTokens.EffectBlur320
+    override val blurDrag: Int = OudsEffectRawTokens.EffectBlur480
 ) : OudsEffectSemanticTokens
diff --git a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeFontSemanticTokens.kt b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeFontSemanticTokens.kt
index f39d942a0e..9970c90884 100644
--- a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeFontSemanticTokens.kt
+++ b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeFontSemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orange.tokens.semantic
diff --git a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeGridSemanticTokens.kt b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeGridSemanticTokens.kt
index 7de222e7c4..9717cea265 100644
--- a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeGridSemanticTokens.kt
+++ b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeGridSemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orange.tokens.semantic
@@ -19,7 +19,7 @@ import com.orange.ouds.theme.tokens.semantic.OudsGridSemanticTokens
 import com.orange.ouds.tokens.raw.OudsGridRawTokens
 
 internal data class OrangeGridSemanticTokens(
-    override val compactColumnGap: Int = OudsGridRawTokens.GridColumnGap100,
+    override val compactColumnGap: Int = OudsGridRawTokens.GridColumnGap200,
     override val compactMargin: Int = OudsGridRawTokens.GridMargin300,
     override val compactMaxWidth: Int = OudsGridRawTokens.GridMaxWidthCompact,
     override val compactMinWidth: Int = OudsGridRawTokens.GridMinWidthCompact,
diff --git a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeOpacitySemanticTokens.kt b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeOpacitySemanticTokens.kt
index 061f1068fc..d54d55f303 100644
--- a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeOpacitySemanticTokens.kt
+++ b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeOpacitySemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orange.tokens.semantic
diff --git a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeSizeSemanticTokens.kt b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeSizeSemanticTokens.kt
index 8d69573f03..d8e045c294 100644
--- a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeSizeSemanticTokens.kt
+++ b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeSizeSemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orange.tokens.semantic
@@ -73,7 +73,7 @@ internal data class OrangeSizeSemanticTokens(
     override val iconWithLabelLargeSizeLarge: Float = OudsDimensionRawTokens.Dimension400,
     override val iconWithLabelLargeSizeMedium: Float = OudsDimensionRawTokens.Dimension350,
     override val iconWithLabelLargeSizeSmall: Float = OudsDimensionRawTokens.Dimension300,
-    override val iconWithLabelLargeSizeXlarge: Float = OudsDimensionRawTokens.Dimension550,
+    override val iconWithLabelLargeSizeXlarge: Float = OudsDimensionRawTokens.Dimension450,
     override val iconWithLabelLargeSizeXsmall: Float = OudsDimensionRawTokens.Dimension250,
     override val iconWithLabelMediumSizeLarge: Float = OudsDimensionRawTokens.Dimension300,
     override val iconWithLabelMediumSizeMedium: Float = OudsDimensionRawTokens.Dimension250,
@@ -83,36 +83,37 @@ internal data class OrangeSizeSemanticTokens(
     override val iconWithLabelSmallSizeMedium: Float = OudsDimensionRawTokens.Dimension200,
     override val iconWithLabelSmallSizeSmall: Float = OudsDimensionRawTokens.Dimension150,
     override val iconWithLabelSmallSizeXsmall: Float = OudsDimensionRawTokens.DimensionOutOfSystem250,
-    override val iconWithLabelXlargeSizeLarge: Float = OudsDimensionRawTokens.Dimension550,
-    override val iconWithLabelXlargeSizeMedium: Float = OudsDimensionRawTokens.Dimension500,
+    override val iconWithLabelXlargeSizeLarge: Float = OudsDimensionRawTokens.Dimension500,
+    override val iconWithLabelXlargeSizeMedium: Float = OudsDimensionRawTokens.Dimension450,
     override val iconWithLabelXlargeSizeSmall: Float = OudsDimensionRawTokens.Dimension400,
-    override val maxWidthTypeBodyLargeMobile: Float = OudsDimensionRawTokens.Dimension6000,
-    override val maxWidthTypeBodyLargeTablet: Float = OudsDimensionRawTokens.Dimension6000,
-    override val maxWidthTypeBodyMediumMobile: Float = OudsDimensionRawTokens.Dimension6000,
-    override val maxWidthTypeBodyMediumTablet: Float = OudsDimensionRawTokens.Dimension6000,
-    override val maxWidthTypeBodySmallMobile: Float = OudsDimensionRawTokens.Dimension6000,
-    override val maxWidthTypeBodySmallTablet: Float = OudsDimensionRawTokens.Dimension6000,
-    override val maxWidthTypeDisplayLargeMobile: Float = OudsDimensionRawTokens.Dimension9000,
-    override val maxWidthTypeDisplayLargeTablet: Float = OudsDimensionRawTokens.Dimension9000,
-    override val maxWidthTypeDisplayMediumMobile: Float = OudsDimensionRawTokens.Dimension9000,
-    override val maxWidthTypeDisplayMediumTablet: Float = OudsDimensionRawTokens.Dimension9000,
-    override val maxWidthTypeDisplaySmallMobile: Float = OudsDimensionRawTokens.Dimension9000,
-    override val maxWidthTypeDisplaySmallTablet: Float = OudsDimensionRawTokens.Dimension9000,
-    override val maxWidthTypeHeadingLargeMobile: Float = OudsDimensionRawTokens.Dimension7000,
-    override val maxWidthTypeHeadingLargeTablet: Float = OudsDimensionRawTokens.Dimension9000,
-    override val maxWidthTypeHeadingMediumMobile: Float = OudsDimensionRawTokens.Dimension7000,
-    override val maxWidthTypeHeadingMediumTablet: Float = OudsDimensionRawTokens.Dimension7000,
-    override val maxWidthTypeHeadingSmallMobile: Float = OudsDimensionRawTokens.Dimension6000,
-    override val maxWidthTypeHeadingSmallTablet: Float = OudsDimensionRawTokens.Dimension7000,
-    override val maxWidthTypeHeadingXlargeMobile: Float = OudsDimensionRawTokens.Dimension7000,
-    override val maxWidthTypeHeadingXlargeTablet: Float = OudsDimensionRawTokens.Dimension9000,
-    override val maxWidthTypeLabelLargeMobile: Float = OudsDimensionRawTokens.Dimension6000,
-    override val maxWidthTypeLabelLargeTablet: Float = OudsDimensionRawTokens.Dimension6000,
-    override val maxWidthTypeLabelMediumMobile: Float = OudsDimensionRawTokens.Dimension6000,
-    override val maxWidthTypeLabelMediumTablet: Float = OudsDimensionRawTokens.Dimension6000,
-    override val maxWidthTypeLabelSmallMobile: Float = OudsDimensionRawTokens.Dimension6000,
-    override val maxWidthTypeLabelSmallTablet: Float = OudsDimensionRawTokens.Dimension6000,
-    override val maxWidthTypeLabelXlargeMobile: Float = OudsDimensionRawTokens.Dimension6000,
-    override val maxWidthTypeLabelXlargeTablet: Float = OudsDimensionRawTokens.Dimension6000,
+    override val iconWithLabelXlargeSizeXsmall: Float = OudsDimensionRawTokens.Dimension350,
+    override val maxWidthBodyLargeMobile: Float = OudsDimensionRawTokens.Dimension6000,
+    override val maxWidthBodyLargeTablet: Float = OudsDimensionRawTokens.Dimension6000,
+    override val maxWidthBodyMediumMobile: Float = OudsDimensionRawTokens.Dimension6000,
+    override val maxWidthBodyMediumTablet: Float = OudsDimensionRawTokens.Dimension6000,
+    override val maxWidthBodySmallMobile: Float = OudsDimensionRawTokens.Dimension6000,
+    override val maxWidthBodySmallTablet: Float = OudsDimensionRawTokens.Dimension6000,
+    override val maxWidthDisplayLargeMobile: Float = OudsDimensionRawTokens.Dimension9000,
+    override val maxWidthDisplayLargeTablet: Float = OudsDimensionRawTokens.Dimension9000,
+    override val maxWidthDisplayMediumMobile: Float = OudsDimensionRawTokens.Dimension9000,
+    override val maxWidthDisplayMediumTablet: Float = OudsDimensionRawTokens.Dimension9000,
+    override val maxWidthDisplaySmallMobile: Float = OudsDimensionRawTokens.Dimension9000,
+    override val maxWidthDisplaySmallTablet: Float = OudsDimensionRawTokens.Dimension9000,
+    override val maxWidthHeadingLargeMobile: Float = OudsDimensionRawTokens.Dimension7000,
+    override val maxWidthHeadingLargeTablet: Float = OudsDimensionRawTokens.Dimension9000,
+    override val maxWidthHeadingMediumMobile: Float = OudsDimensionRawTokens.Dimension7000,
+    override val maxWidthHeadingMediumTablet: Float = OudsDimensionRawTokens.Dimension7000,
+    override val maxWidthHeadingSmallMobile: Float = OudsDimensionRawTokens.Dimension6000,
+    override val maxWidthHeadingSmallTablet: Float = OudsDimensionRawTokens.Dimension7000,
+    override val maxWidthHeadingXlargeMobile: Float = OudsDimensionRawTokens.Dimension7000,
+    override val maxWidthHeadingXlargeTablet: Float = OudsDimensionRawTokens.Dimension9000,
+    override val maxWidthLabelLargeMobile: Float = OudsDimensionRawTokens.Dimension6000,
+    override val maxWidthLabelLargeTablet: Float = OudsDimensionRawTokens.Dimension6000,
+    override val maxWidthLabelMediumMobile: Float = OudsDimensionRawTokens.Dimension6000,
+    override val maxWidthLabelMediumTablet: Float = OudsDimensionRawTokens.Dimension6000,
+    override val maxWidthLabelSmallMobile: Float = OudsDimensionRawTokens.Dimension6000,
+    override val maxWidthLabelSmallTablet: Float = OudsDimensionRawTokens.Dimension6000,
+    override val maxWidthLabelXlargeMobile: Float = OudsDimensionRawTokens.Dimension6000,
+    override val maxWidthLabelXlargeTablet: Float = OudsDimensionRawTokens.Dimension6000,
     override val minInteractiveArea: Float = OudsDimensionRawTokens.Dimension600
 ) : OudsSizeSemanticTokens
diff --git a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeSpaceSemanticTokens.kt b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeSpaceSemanticTokens.kt
index 4946815259..56f67eddb6 100644
--- a/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeSpaceSemanticTokens.kt
+++ b/theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/semantic/OrangeSpaceSemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Orange brand tokens version 2.3.0
+// Orange brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.orange.tokens.semantic
diff --git a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshAlertTokens.kt b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshAlertTokens.kt
index 68c52f36f5..8588f1b3d5 100644
--- a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshAlertTokens.kt
+++ b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshAlertTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Sosh brand tokens version 2.3.0
+// Sosh brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.sosh.tokens.components
diff --git a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshBadgeTokens.kt b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshBadgeTokens.kt
index 2ed1de2da5..9aa65f6475 100644
--- a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshBadgeTokens.kt
+++ b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshBadgeTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Sosh brand tokens version 2.3.0
+// Sosh brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.sosh.tokens.components
@@ -24,7 +24,9 @@ internal data class SoshBadgeTokens(
     override val sizeMedium: Float = OudsDimensionRawTokens.Dimension200,
     override val sizeSmall: Float = OudsDimensionRawTokens.Dimension150,
     override val sizeXsmall: Float = OudsDimensionRawTokens.Dimension100,
-    override val spaceInset: Float = OudsDimensionRawTokens.DimensionOutOfSystem75,
+    override val spaceInsetMediumLarge: Float = OudsDimensionRawTokens.DimensionOutOfSystem75,
+    override val spaceInsetSmall: Float = OudsDimensionRawTokens.DimensionOutOfSystem50,
+    override val spaceInsetXsmall: Float = OudsDimensionRawTokens.DimensionOutOfSystem25,
     override val spacePaddingInlineLarge: OudsSpaceKeyToken.PaddingInline = OudsSpaceKeyToken.PaddingInline.TwoExtraSmall,
     override val spacePaddingInlineMedium: OudsSpaceKeyToken.PaddingInline = OudsSpaceKeyToken.PaddingInline.ThreeExtraSmall
 ) : OudsBadgeTokens
diff --git a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshBarTokens.kt b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshBarTokens.kt
index 9060f99c58..c34aba25a1 100644
--- a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshBarTokens.kt
+++ b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshBarTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Sosh brand tokens version 2.3.0
+// Sosh brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.sosh.tokens.components
@@ -25,36 +25,37 @@ import com.orange.ouds.tokens.raw.OudsDimensionRawTokens
 import com.orange.ouds.tokens.raw.OudsEffectRawTokens
 
 internal data class SoshBarTokens(
-    override val borderRadiusActiveIndicatorCustomBottom: OudsBorderKeyToken.Radius = OudsBorderKeyToken.Radius.Pill,
-    override val borderRadiusActiveIndicatorCustomTop: OudsBorderKeyToken.Radius = OudsBorderKeyToken.Radius.Default,
-    override val colorActiveIndicatorAndroidSelectedDisabled: OudsColorKeyToken = OudsColorKeyToken.Opacity.Transparent,
-    override val colorActiveIndicatorAndroidSelectedEnabled: OudsColorKeyToken = OudsColorKeyToken.Opacity.Transparent,
-    override val colorActiveIndicatorAndroidSelectedFocus: OudsColorKeyToken = OudsColorKeyToken.Opacity.Transparent,
-    override val colorActiveIndicatorAndroidSelectedHover: OudsColorKeyToken = OudsColorKeyToken.Opacity.Transparent,
-    override val colorActiveIndicatorAndroidSelectedPressed: OudsColorKeyToken = OudsColorKeyToken.Opacity.Transparent,
-    override val colorActiveIndicatorAndroidUnselectedDisabled: OudsColorKeyToken = OudsColorKeyToken.Opacity.Transparent,
-    override val colorActiveIndicatorAndroidUnselectedFocus: OudsColorKeyToken = OudsColorKeyToken.Opacity.Transparent,
-    override val colorActiveIndicatorAndroidUnselectedHover: OudsColorKeyToken = OudsColorKeyToken.Opacity.Transparent,
-    override val colorActiveIndicatorAndroidUnselectedPressed: OudsColorKeyToken = OudsColorKeyToken.Opacity.Transparent,
-    override val colorActiveIndicatorCustomSelectedEnabled: OudsColorKeyToken = OudsColorKeyToken.Action.Selected,
-    override val colorActiveIndicatorCustomSelectedFocus: OudsColorKeyToken = OudsColorKeyToken.Action.Focus,
-    override val colorActiveIndicatorCustomSelectedHover: OudsColorKeyToken = OudsColorKeyToken.Action.Hover,
-    override val colorActiveIndicatorCustomSelectedPressed: OudsColorKeyToken = OudsColorKeyToken.Action.Pressed,
+    override val borderRadiusCurrentIndicatorCustomBottom: OudsBorderKeyToken.Radius = OudsBorderKeyToken.Radius.Pill,
+    override val borderRadiusCurrentIndicatorCustomTop: OudsBorderKeyToken.Radius = OudsBorderKeyToken.Radius.Default,
     override val colorBgOpaque: OudsColorKeyToken = OudsColorKeyToken.Background.Secondary,
-    override val colorBgTranslucent: OudsLightDarkColor = OudsLightDarkColor(Color(0xccf4f4f4), Color(0xcc1f1f1f)),
+    override val colorBgTranslucent: OudsLightDarkColor = OudsLightDarkColor(Color(0xccffffff), Color(0xcc061618)),
     override val colorBorderBadge: OudsColorKeyToken = OudsColorKeyToken.Background.Secondary,
     override val colorContentOnIosAccent: OudsColorKeyToken = OudsColorKeyToken.Content.OnAction.Selected,
     override val colorContentSelectedEnabled: OudsColorKeyToken = OudsColorKeyToken.Action.Selected,
     override val colorContentSelectedFocus: OudsColorKeyToken = OudsColorKeyToken.Action.Focus,
     override val colorContentSelectedHover: OudsColorKeyToken = OudsColorKeyToken.Action.Hover,
     override val colorContentSelectedPressed: OudsColorKeyToken = OudsColorKeyToken.Action.Pressed,
-    override val colorContentUnselectedEnabled: OudsLightDarkColor = OudsLightDarkColor(Color(0x99000000), Color(0x99ffffff)),
+    override val colorContentUnselectedEnabled: OudsColorKeyToken = OudsColorKeyToken.Content.Muted,
     override val colorContentUnselectedFocus: OudsColorKeyToken = OudsColorKeyToken.Content.Default,
     override val colorContentUnselectedHover: OudsColorKeyToken = OudsColorKeyToken.Content.Default,
     override val colorContentUnselectedPressed: OudsColorKeyToken = OudsColorKeyToken.Action.Pressed,
-    override val effectBgBlur: Int = OudsEffectRawTokens.EffectBlur160,
-    override val opacityActiveIndicatorCustom: OudsOpacityKeyToken = OudsOpacityKeyToken.Opaque,
-    override val sizeHeightActiveIndicatorCustom: Float = OudsDimensionRawTokens.DimensionOutOfSystem75,
-    override val sizeWidthActiveIndicatorCustomBottom: Float = OudsDimensionRawTokens.Dimension300,
-    override val sizeWidthActiveIndicatorCustomTop: Float = OudsDimensionRawTokens.Dimension650
+    override val colorCurrentIndicatorAndroidSelectedDisabled: OudsColorKeyToken = OudsColorKeyToken.Opacity.Transparent,
+    override val colorCurrentIndicatorAndroidSelectedEnabled: OudsColorKeyToken = OudsColorKeyToken.Opacity.Transparent,
+    override val colorCurrentIndicatorAndroidSelectedFocus: OudsColorKeyToken = OudsColorKeyToken.Opacity.Transparent,
+    override val colorCurrentIndicatorAndroidSelectedHover: OudsColorKeyToken = OudsColorKeyToken.Opacity.Transparent,
+    override val colorCurrentIndicatorAndroidSelectedPressed: OudsColorKeyToken = OudsColorKeyToken.Opacity.Transparent,
+    override val colorCurrentIndicatorAndroidUnselectedDisabled: OudsColorKeyToken = OudsColorKeyToken.Opacity.Transparent,
+    override val colorCurrentIndicatorAndroidUnselectedFocus: OudsColorKeyToken = OudsColorKeyToken.Opacity.Transparent,
+    override val colorCurrentIndicatorAndroidUnselectedHover: OudsColorKeyToken = OudsColorKeyToken.Opacity.Transparent,
+    override val colorCurrentIndicatorAndroidUnselectedPressed: OudsColorKeyToken = OudsColorKeyToken.Opacity.Transparent,
+    override val colorCurrentIndicatorCustomSelectedEnabled: OudsColorKeyToken = OudsColorKeyToken.Action.Selected,
+    override val colorCurrentIndicatorCustomSelectedFocus: OudsColorKeyToken = OudsColorKeyToken.Action.Focus,
+    override val colorCurrentIndicatorCustomSelectedHover: OudsColorKeyToken = OudsColorKeyToken.Action.Hover,
+    override val colorCurrentIndicatorCustomSelectedPressed: OudsColorKeyToken = OudsColorKeyToken.Action.Pressed,
+    override val colorIosAccent: OudsColorKeyToken = OudsColorKeyToken.Action.Selected,
+    override val effectBgBlur: Int = OudsEffectRawTokens.EffectBlur320,
+    override val opacityCurrentIndicatorCustom: OudsOpacityKeyToken = OudsOpacityKeyToken.Opaque,
+    override val sizeHeightCurrentIndicatorCustom: Float = OudsDimensionRawTokens.DimensionOutOfSystem75,
+    override val sizeWidthCurrentIndicatorCustomBottom: Float = OudsDimensionRawTokens.Dimension300,
+    override val sizeWidthCurrentIndicatorCustomTop: Float = OudsDimensionRawTokens.Dimension500
 ) : OudsBarTokens
diff --git a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshBulletListTokens.kt b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshBulletListTokens.kt
index 3c7bc3f477..35a40a9e3f 100644
--- a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshBulletListTokens.kt
+++ b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshBulletListTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Sosh brand tokens version 2.3.0
+// Sosh brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.sosh.tokens.components
diff --git a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshButtonMonoTokens.kt b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshButtonMonoTokens.kt
index 175d3827e6..094b3b4aa1 100644
--- a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshButtonMonoTokens.kt
+++ b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshButtonMonoTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Sosh brand tokens version 2.3.0
+// Sosh brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.sosh.tokens.components
diff --git a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshButtonTokens.kt b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshButtonTokens.kt
index d4bc929ddd..60f31c1bfd 100644
--- a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshButtonTokens.kt
+++ b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshButtonTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Sosh brand tokens version 2.3.0
+// Sosh brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.sosh.tokens.components
diff --git a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshCheckboxTokens.kt b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshCheckboxTokens.kt
index e386867693..da14725e9c 100644
--- a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshCheckboxTokens.kt
+++ b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshCheckboxTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Sosh brand tokens version 2.3.0
+// Sosh brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.sosh.tokens.components
@@ -29,7 +29,6 @@ internal data class SoshCheckboxTokens(
     override val borderWidthUnselectedFocus: OudsBorderKeyToken.Width = OudsBorderKeyToken.Width.Medium,
     override val borderWidthUnselectedHover: OudsBorderKeyToken.Width = OudsBorderKeyToken.Width.Medium,
     override val borderWidthUnselectedPressed: OudsBorderKeyToken.Width = OudsBorderKeyToken.Width.Medium,
-    override val sizeIndicator: OudsSizeKeyToken.Icon = OudsSizeKeyToken.Icon.WithLabel.Large.SizeExtraSmall,
     override val sizeMaxHeight: OudsSizeKeyToken = OudsSizeKeyToken.MinInteractiveArea,
     override val sizeMinHeight: OudsSizeKeyToken = OudsSizeKeyToken.MinInteractiveArea,
     override val sizeMinWidth: OudsSizeKeyToken = OudsSizeKeyToken.MinInteractiveArea
diff --git a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshChipTokens.kt b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshChipTokens.kt
index 21a1a055fa..43a322ba1b 100644
--- a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshChipTokens.kt
+++ b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshChipTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Sosh brand tokens version 2.3.0
+// Sosh brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.sosh.tokens.components
diff --git a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshControlItemTokens.kt b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshControlItemTokens.kt
index 6354daa847..fb8fec28d5 100644
--- a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshControlItemTokens.kt
+++ b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshControlItemTokens.kt
@@ -10,19 +10,70 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Sosh brand tokens version 2.3.0
+// Sosh brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.sosh.tokens.components
 
 import com.orange.ouds.theme.tokens.OudsBorderKeyToken
 import com.orange.ouds.theme.tokens.OudsColorKeyToken
+import com.orange.ouds.theme.tokens.OudsOpacityKeyToken
 import com.orange.ouds.theme.tokens.OudsSizeKeyToken
 import com.orange.ouds.theme.tokens.OudsSpaceKeyToken
 import com.orange.ouds.theme.tokens.components.OudsControlItemTokens
 import com.orange.ouds.tokens.raw.OudsDimensionRawTokens
+import com.orange.ouds.tokens.raw.OudsFontRawTokens
 
 internal data class SoshControlItemTokens(
+    override val borderRadiusCurrentIndicator: OudsBorderKeyToken.Radius = OudsBorderKeyToken.Radius.Default,
+    override val borderRadiusDefault: OudsBorderKeyToken.Radius = OudsBorderKeyToken.Radius.Default,
+    override val borderRadiusMedia: OudsBorderKeyToken.Radius = OudsBorderKeyToken.Radius.Default,
+    override val borderRadiusMediaRoundedCorner: OudsBorderKeyToken.Radius = OudsBorderKeyToken.Radius.Default,
+    override val borderRadiusRounded: OudsBorderKeyToken.Radius = OudsBorderKeyToken.Radius.Default,
+    override val borderWidthCurrentPage: OudsBorderKeyToken.Width = OudsBorderKeyToken.Width.Medium,
+    override val borderWidthDefault: OudsBorderKeyToken.Width = OudsBorderKeyToken.Width.Default,
+    override val colorBadgeSafetyArea: OudsColorKeyToken = OudsColorKeyToken.Background.Primary,
+    override val colorBgCurrentDisabled: OudsColorKeyToken = OudsColorKeyToken.Action.Support.Disabled,
+    override val colorBgCurrentEnabled: OudsColorKeyToken = OudsColorKeyToken.Action.Support.Enabled,
+    override val colorBgCurrentFocus: OudsColorKeyToken = OudsColorKeyToken.Action.Support.Focus,
+    override val colorBgCurrentHover: OudsColorKeyToken = OudsColorKeyToken.Action.Support.Hover,
+    override val colorBgCurrentPressed: OudsColorKeyToken = OudsColorKeyToken.Action.Support.Pressed,
+    override val colorContentCurrentDisabled: OudsColorKeyToken = OudsColorKeyToken.Content.Default,
+    override val colorContentCurrentEnabled: OudsColorKeyToken = OudsColorKeyToken.Content.Default,
+    override val colorContentCurrentFocus: OudsColorKeyToken = OudsColorKeyToken.Content.Default,
+    override val colorContentCurrentHover: OudsColorKeyToken = OudsColorKeyToken.Content.Default,
+    override val colorContentCurrentPressed: OudsColorKeyToken = OudsColorKeyToken.Content.Default,
+    override val fontLetterSpacingAvatarInitialXlarge: Float = OudsFontRawTokens.FontLetterSpacing450,
+    override val fontLineHeightAvatarInitialXlarge: Int = OudsFontRawTokens.FontLineHeight650,
+    override val fontSizeAvatarInitialXlarge: Int = OudsFontRawTokens.FontSize450,
+    override val opacityCurrentDivider: OudsOpacityKeyToken = OudsOpacityKeyToken.Opaque,
+    override val opacityCurrentIndicator: OudsOpacityKeyToken = OudsOpacityKeyToken.Opaque,
+    override val sizeAssetLarge: Float = OudsDimensionRawTokens.Dimension500,
+    override val sizeAssetMedium: OudsSizeKeyToken.Icon = OudsSizeKeyToken.Icon.WithLabel.Large.SizeMedium,
+    override val sizeAssetSmall: OudsSizeKeyToken.Icon = OudsSizeKeyToken.Icon.WithLabel.Large.SizeSmall,
+    override val sizeAssetXlarge: Float = OudsDimensionRawTokens.Dimension700,
+    override val sizeControlIndicator: OudsSizeKeyToken.Icon = OudsSizeKeyToken.Icon.WithLabel.Large.SizeExtraSmall,
+    override val sizeCurrentIndicatorWidth: Float = OudsDimensionRawTokens.Dimension50,
+    override val sizeFlagHeight: OudsSizeKeyToken.Icon = OudsSizeKeyToken.Icon.WithLabel.Large.SizeExtraSmall,
+    override val sizeMaxWidth: Float = OudsDimensionRawTokens.Dimension4000,
+    override val sizeMinHeightCompact: OudsSizeKeyToken = OudsSizeKeyToken.MinInteractiveArea,
+    override val sizeMinHeightDefault: Float = OudsDimensionRawTokens.Dimension750,
+    override val sizeMinWidth: Float = OudsDimensionRawTokens.Dimension2000,
+    override val spaceColumnGap: OudsSpaceKeyToken.ColumnGap = OudsSpaceKeyToken.ColumnGap.Medium,
+    override val spacePaddingBlockBottomSlot: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.ThreeExtraSmall,
+    override val spacePaddingBlockDensityCompact: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.ExtraSmall,
+    override val spacePaddingBlockDensityCompactBottomExpandContainer: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.TwoExtraLarge,
+    override val spacePaddingBlockDensityCompactTopAlignmentTopCounterweight: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.ExtraSmall,
+    override val spacePaddingBlockDensityCompactTopAlignmentTopTextContainer: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.None,
+    override val spacePaddingBlockDensityDefault: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.Medium,
+    override val spacePaddingBlockDensityDefaultBottomExpandContainer: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.ThreeExtraLarge,
+    override val spacePaddingBlockDensityDefaultTopAlignmentTopCounterweight: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.Small,
+    override val spacePaddingBlockDensityDefaultTopAlignmentTopTextContainer: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.FourExtraSmall,
+    override val spacePaddingBlockTopHelperText: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.ExtraSmall,
+    override val spacePaddingInline: OudsSpaceKeyToken.PaddingInline = OudsSpaceKeyToken.PaddingInline.Large,
+    override val spaceRowGap: OudsSpaceKeyToken.RowGap = OudsSpaceKeyToken.RowGap.None,
+
+    // TODO Keep the following tokens until the new control items are implemented, then remove them.
     override val borderRadius: OudsBorderKeyToken.Radius = OudsBorderKeyToken.Radius.None,
     override val borderRadiusItemOnly: OudsBorderKeyToken.Radius = OudsBorderKeyToken.Radius.Default,
     override val colorBgFocus: OudsColorKeyToken = OudsColorKeyToken.Action.Support.Focus,
@@ -31,16 +82,8 @@ internal data class SoshControlItemTokens(
     override val colorBgPressed: OudsColorKeyToken = OudsColorKeyToken.Action.Support.Pressed,
     override val colorContentLoader: OudsColorKeyToken = OudsColorKeyToken.Content.Default,
     override val sizeErrorIcon: OudsSizeKeyToken.Icon = OudsSizeKeyToken.Icon.WithLabel.Large.SizeSmall,
-    override val sizeIcon: OudsSizeKeyToken.Icon = OudsSizeKeyToken.Icon.WithLabel.Large.SizeMedium,
     override val sizeLoader: OudsSizeKeyToken.Icon = OudsSizeKeyToken.Icon.WithLabel.Large.SizeSmall,
     override val sizeMaxHeightAssetsContainer: Float = OudsDimensionRawTokens.Dimension1200,
-    override val sizeMaxWidth: Float = OudsDimensionRawTokens.Dimension4000,
-    override val sizeMinHeight: Float = OudsDimensionRawTokens.Dimension650,
-    override val sizeMinWidth: Float = OudsDimensionRawTokens.Dimension2000,
-    override val spaceColumnGap: OudsSpaceKeyToken.ColumnGap = OudsSpaceKeyToken.ColumnGap.Medium,
     override val spacePaddingBlockDefault: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.Medium,
-    override val spacePaddingBlockTopErrorText: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.ExtraSmall,
-    override val spacePaddingInline: OudsSpaceKeyToken.PaddingInline = OudsSpaceKeyToken.PaddingInline.Large,
-    override val spacePaddingInlineErrorIcon: OudsSpaceKeyToken.PaddingInline = OudsSpaceKeyToken.PaddingInline.FourExtraSmall,
-    override val spaceRowGap: OudsSpaceKeyToken.RowGap = OudsSpaceKeyToken.RowGap.None
+    override val spacePaddingInlineErrorIcon: OudsSpaceKeyToken.PaddingInline = OudsSpaceKeyToken.PaddingInline.FourExtraSmall
 ) : OudsControlItemTokens
diff --git a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshDividerTokens.kt b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshDividerTokens.kt
index 23c25b1277..bded7e1fcf 100644
--- a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshDividerTokens.kt
+++ b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshDividerTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Sosh brand tokens version 2.3.0
+// Sosh brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.sosh.tokens.components
diff --git a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshIconTokens.kt b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshIconTokens.kt
index f4e75a68f4..80e3c0c141 100644
--- a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshIconTokens.kt
+++ b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshIconTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Sosh brand tokens version 2.3.0
+// Sosh brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.sosh.tokens.components
@@ -20,7 +20,8 @@ import com.orange.ouds.theme.tokens.OudsLightDarkColorKeyToken
 import com.orange.ouds.theme.tokens.components.OudsIconTokens
 
 internal data class SoshIconTokens(
-    override val colorContentDefault: OudsColorKeyToken = OudsLightDarkColorKeyToken(OudsColorKeyToken.Repository.Neutral.Emphasized.Black, OudsColorKeyToken.Repository.Neutral.Muted.Lower),
     override val colorContentStatusWarningExternalShape: OudsColorKeyToken = OudsLightDarkColorKeyToken(OudsColorKeyToken.Repository.Warning.Medium, OudsColorKeyToken.Repository.Warning.Low),
-    override val colorContentStatusWarningInternalShape: OudsColorKeyToken = OudsLightDarkColorKeyToken(OudsColorKeyToken.Repository.Warning.High, OudsColorKeyToken.Opacity.Transparent)
+    override val colorContentStatusWarningInternalShape: OudsColorKeyToken = OudsLightDarkColorKeyToken(OudsColorKeyToken.Repository.Warning.High, OudsColorKeyToken.Opacity.Transparent),
+    override val colorContentStatusWarningInverseExternalShape: OudsColorKeyToken = OudsLightDarkColorKeyToken(OudsColorKeyToken.Repository.Warning.Low, OudsColorKeyToken.Repository.Warning.Medium),
+    override val colorContentStatusWarningInverseInternalShape: OudsColorKeyToken = OudsLightDarkColorKeyToken(OudsColorKeyToken.Opacity.Transparent, OudsColorKeyToken.Repository.Warning.High)
 ) : OudsIconTokens
diff --git a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshInputTagTokens.kt b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshInputTagTokens.kt
index c298c70647..8b1de42d9d 100644
--- a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshInputTagTokens.kt
+++ b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshInputTagTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Sosh brand tokens version 2.3.0
+// Sosh brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.sosh.tokens.components
diff --git a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshLinkMonoTokens.kt b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshLinkMonoTokens.kt
index f2022e55f6..652bc417fc 100644
--- a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshLinkMonoTokens.kt
+++ b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshLinkMonoTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Sosh brand tokens version 2.3.0
+// Sosh brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.sosh.tokens.components
diff --git a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshLinkTokens.kt b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshLinkTokens.kt
index 78636a4c0b..87e6369105 100644
--- a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshLinkTokens.kt
+++ b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshLinkTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Sosh brand tokens version 2.3.0
+// Sosh brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.sosh.tokens.components
diff --git a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshPinCodeInputTokens.kt b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshPinCodeInputTokens.kt
index 26430d785a..0758324853 100644
--- a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshPinCodeInputTokens.kt
+++ b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshPinCodeInputTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Sosh brand tokens version 2.3.0
+// Sosh brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.sosh.tokens.components
diff --git a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshRadioButtonTokens.kt b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshRadioButtonTokens.kt
index 328fa6f53b..182752fa54 100644
--- a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshRadioButtonTokens.kt
+++ b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshRadioButtonTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Sosh brand tokens version 2.3.0
+// Sosh brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.sosh.tokens.components
@@ -29,7 +29,6 @@ internal data class SoshRadioButtonTokens(
     override val borderWidthUnselectedFocus: OudsBorderKeyToken.Width = OudsBorderKeyToken.Width.Medium,
     override val borderWidthUnselectedHover: OudsBorderKeyToken.Width = OudsBorderKeyToken.Width.Medium,
     override val borderWidthUnselectedPressed: OudsBorderKeyToken.Width = OudsBorderKeyToken.Width.Medium,
-    override val sizeIndicator: OudsSizeKeyToken.Icon = OudsSizeKeyToken.Icon.WithLabel.Large.SizeExtraSmall,
     override val sizeMaxHeight: OudsSizeKeyToken = OudsSizeKeyToken.MinInteractiveArea,
     override val sizeMinHeight: OudsSizeKeyToken = OudsSizeKeyToken.MinInteractiveArea,
     override val sizeMinWidth: OudsSizeKeyToken = OudsSizeKeyToken.MinInteractiveArea
diff --git a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshSwitchTokens.kt b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshSwitchTokens.kt
index b0fffce7dc..517ef4baf6 100644
--- a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshSwitchTokens.kt
+++ b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshSwitchTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Sosh brand tokens version 2.3.0
+// Sosh brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.sosh.tokens.components
diff --git a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshTagTokens.kt b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshTagTokens.kt
index d945fa476e..c294f65531 100644
--- a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshTagTokens.kt
+++ b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshTagTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Sosh brand tokens version 2.3.0
+// Sosh brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.sosh.tokens.components
@@ -28,8 +28,8 @@ internal data class SoshTagTokens(
     override val sizeMinHeightDefault: Float = OudsDimensionRawTokens.Dimension400,
     override val sizeMinHeightInteractiveArea: OudsSizeKeyToken = OudsSizeKeyToken.MinInteractiveArea,
     override val sizeMinHeightSmall: Float = OudsDimensionRawTokens.Dimension300,
-    override val sizeMinWidthDefault: Float = OudsDimensionRawTokens.Dimension600,
-    override val sizeMinWidthSmall: Float = OudsDimensionRawTokens.Dimension550,
+    override val sizeMinWidthDefault: Float = OudsDimensionRawTokens.Dimension400,
+    override val sizeMinWidthSmall: Float = OudsDimensionRawTokens.Dimension300,
     override val spaceColumnGapDefault: OudsSpaceKeyToken.ColumnGap = OudsSpaceKeyToken.ColumnGap.TwoExtraSmall,
     override val spaceColumnGapSmall: OudsSpaceKeyToken.ColumnGap = OudsSpaceKeyToken.ColumnGap.TwoExtraSmall,
     override val spaceInsetBulletDefault: Float = OudsDimensionRawTokens.DimensionOutOfSystem75,
diff --git a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshTextAreaTokens.kt b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshTextAreaTokens.kt
index 40a843ecf3..d6aea71719 100644
--- a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshTextAreaTokens.kt
+++ b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshTextAreaTokens.kt
@@ -10,13 +10,13 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Sosh brand tokens version 2.3.0
+// Sosh brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.sosh.tokens.components
 
-import com.orange.ouds.theme.tokens.components.OudsTextAreaTokens
 import com.orange.ouds.theme.tokens.OudsSpaceKeyToken
+import com.orange.ouds.theme.tokens.components.OudsTextAreaTokens
 import com.orange.ouds.tokens.raw.OudsDimensionRawTokens
 
 internal data class SoshTextAreaTokens(
@@ -24,5 +24,6 @@ internal data class SoshTextAreaTokens(
     override val sizeMaxHeightInput: Float = OudsDimensionRawTokens.Dimension2500,
     override val sizeMaxWidth: Float = OudsDimensionRawTokens.Dimension6000,
     override val sizeMinHeightInput: Float = OudsDimensionRawTokens.Dimension900,
-    override val spacePaddingBlock: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.Small
+    override val spacePaddingBlock: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.Small,
+    override val spacePaddingBlockTopEmpty: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.Medium
 ) : OudsTextAreaTokens
diff --git a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshTextInputTokens.kt b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshTextInputTokens.kt
index 22182c5bf0..1a7e0775ad 100644
--- a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshTextInputTokens.kt
+++ b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/components/SoshTextInputTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Sosh brand tokens version 2.3.0
+// Sosh brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.sosh.tokens.components
@@ -25,7 +25,7 @@ import com.orange.ouds.tokens.raw.OudsDimensionRawTokens
 internal data class SoshTextInputTokens(
     override val borderRadiusDefault: OudsBorderKeyToken.Radius = OudsBorderKeyToken.Radius.Default,
     override val borderRadiusRounded: OudsBorderKeyToken.Radius = OudsBorderKeyToken.Radius.Default,
-    override val borderWidthDefault: OudsBorderKeyToken.Width = OudsBorderKeyToken.Width.Thin,
+    override val borderWidthDefault: OudsBorderKeyToken.Width = OudsBorderKeyToken.Width.Default,
     override val borderWidthFocus: OudsBorderKeyToken.Width = OudsBorderKeyToken.Width.Medium,
     override val colorBorderEnabled: OudsColorKeyToken = OudsColorKeyToken.Border.Default,
     override val colorBorderFocus: OudsColorKeyToken = OudsColorKeyToken.Border.Emphasized,
@@ -40,6 +40,8 @@ internal data class SoshTextInputTokens(
     override val sizeVerticalDividerHeight: Float = OudsDimensionRawTokens.Dimension250,
     override val spaceColumnGapDefault: OudsSpaceKeyToken.ColumnGap = OudsSpaceKeyToken.ColumnGap.Medium,
     override val spaceColumnGapInlineText: OudsSpaceKeyToken.ColumnGap = OudsSpaceKeyToken.ColumnGap.ExtraSmall,
+    override val spaceColumnGapLabelAsterisk: OudsSpaceKeyToken.ColumnGap = OudsSpaceKeyToken.ColumnGap.TwoExtraSmall,
+    override val spaceColumnGapLabelSmallAsterisk: Float = OudsDimensionRawTokens.DimensionOutOfSystem75,
     override val spaceColumnGapTrailingErrorAction: OudsSpaceKeyToken.ColumnGap = OudsSpaceKeyToken.ColumnGap.ExtraSmall,
     override val spacePaddingBlockDefault: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.TwoExtraSmall,
     override val spacePaddingBlockTopHelperText: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.ExtraSmall,
diff --git a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/raw/SoshColorRawTokens.kt b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/raw/SoshColorRawTokens.kt
index 100af702ed..19da395e03 100644
--- a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/raw/SoshColorRawTokens.kt
+++ b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/raw/SoshColorRawTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Sosh core tokens version 1.2.0
+// Sosh core tokens version 1.3.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.sosh.tokens.raw
@@ -65,6 +65,7 @@ object SoshColorRawTokens {
   val ColorMagenta800 = Color(0xff590d20)
   val ColorMagenta900 = Color(0xff2c0710)
   val ColorMagenta950 = Color(0xff160308)
+  val ColorOpacityBlueDuckDark960800 = Color(0xcc061618)
   val ColorOpacityMagenta120 = Color(0x1fe55277)
   val ColorOpacityMagenta640 = Color(0xa3851430)
 }
diff --git a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshBorderSemanticTokens.kt b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshBorderSemanticTokens.kt
index ef102c290b..42a7d90160 100644
--- a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshBorderSemanticTokens.kt
+++ b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshBorderSemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Sosh brand tokens version 2.3.0
+// Sosh brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.sosh.tokens.semantic
diff --git a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshColorActionSemanticTokens.kt b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshColorActionSemanticTokens.kt
index 2226ba7114..cce1a3c3d4 100644
--- a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshColorActionSemanticTokens.kt
+++ b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshColorActionSemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Sosh brand tokens version 2.3.0
+// Sosh brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.sosh.tokens.semantic
diff --git a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshColorAlwaysSemanticTokens.kt b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshColorAlwaysSemanticTokens.kt
index 7edcb0ff7e..da51dc40d2 100644
--- a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshColorAlwaysSemanticTokens.kt
+++ b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshColorAlwaysSemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Sosh brand tokens version 2.3.0
+// Sosh brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.sosh.tokens.semantic
diff --git a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshColorBgSemanticTokens.kt b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshColorBgSemanticTokens.kt
index b51c6c86f5..0471fcd1e2 100644
--- a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshColorBgSemanticTokens.kt
+++ b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshColorBgSemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Sosh brand tokens version 2.3.0
+// Sosh brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.sosh.tokens.semantic
diff --git a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshColorBorderSemanticTokens.kt b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshColorBorderSemanticTokens.kt
index 8fb13ba716..c7131912c5 100644
--- a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshColorBorderSemanticTokens.kt
+++ b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshColorBorderSemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Sosh brand tokens version 2.3.0
+// Sosh brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.sosh.tokens.semantic
@@ -29,7 +29,7 @@ internal data class SoshColorBorderSemanticTokens(
     override val borderBrandTertiaryLight: Color = SoshColorRawTokens.ColorCitrine500,
     override val borderDefaultDark: Color = OudsColorRawTokens.ColorOpacityWhite200,
     override val borderDefaultLight: Color = OudsColorRawTokens.ColorOpacityBlack200,
-    override val borderEmphasizedDark: Color = OudsColorRawTokens.ColorOpacityWhite920,
+    override val borderEmphasizedDark: Color = OudsColorRawTokens.ColorFunctionalGrayLight160,
     override val borderEmphasizedLight: Color = OudsColorRawTokens.ColorFunctionalBlack,
     override val borderFocusDark: Color = OudsColorRawTokens.ColorFunctionalGrayLight160,
     override val borderFocusInsetDark: Color = OudsColorRawTokens.ColorFunctionalGrayDark880,
diff --git a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshColorContentSemanticTokens.kt b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshColorContentSemanticTokens.kt
index 73b3f55970..57d2ff9a8d 100644
--- a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshColorContentSemanticTokens.kt
+++ b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshColorContentSemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Sosh brand tokens version 2.3.0
+// Sosh brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.sosh.tokens.semantic
@@ -81,6 +81,14 @@ internal data class SoshColorContentSemanticTokens(
     override val contentStatusAccentLight: Color = SoshColorRawTokens.ColorMagenta500,
     override val contentStatusInfoDark: Color = OudsColorRawTokens.ColorFunctionalDodgerBlue300,
     override val contentStatusInfoLight: Color = OudsColorRawTokens.ColorFunctionalDodgerBlue700,
+    override val contentStatusInverseInfoDark: Color = OudsColorRawTokens.ColorFunctionalDodgerBlue700,
+    override val contentStatusInverseInfoLight: Color = OudsColorRawTokens.ColorFunctionalDodgerBlue300,
+    override val contentStatusInverseNegativeDark: Color = OudsColorRawTokens.ColorFunctionalScarlet600,
+    override val contentStatusInverseNegativeLight: Color = OudsColorRawTokens.ColorFunctionalScarlet300,
+    override val contentStatusInversePositiveDark: Color = OudsColorRawTokens.ColorFunctionalMalachite750,
+    override val contentStatusInversePositiveLight: Color = OudsColorRawTokens.ColorFunctionalMalachite300,
+    override val contentStatusInverseWarningDark: Color = OudsColorRawTokens.ColorFunctionalSun750,
+    override val contentStatusInverseWarningLight: Color = OudsColorRawTokens.ColorFunctionalSun300,
     override val contentStatusNegativeDark: Color = OudsColorRawTokens.ColorFunctionalScarlet300,
     override val contentStatusNegativeLight: Color = OudsColorRawTokens.ColorFunctionalScarlet600,
     override val contentStatusPositiveDark: Color = OudsColorRawTokens.ColorFunctionalMalachite300,
diff --git a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshColorModeSemanticTokens.kt b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshColorModeSemanticTokens.kt
index 071c37090c..d634ab56c2 100644
--- a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshColorModeSemanticTokens.kt
+++ b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshColorModeSemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Sosh brand tokens version 2.3.0
+// Sosh brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.sosh.tokens.semantic
diff --git a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshColorOpacitySemanticTokens.kt b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshColorOpacitySemanticTokens.kt
index 566f0708fc..788bb7f770 100644
--- a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshColorOpacitySemanticTokens.kt
+++ b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshColorOpacitySemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Sosh brand tokens version 2.3.0
+// Sosh brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.sosh.tokens.semantic
diff --git a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshColorOverlaySemanticTokens.kt b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshColorOverlaySemanticTokens.kt
index 8be9157c59..06407f886e 100644
--- a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshColorOverlaySemanticTokens.kt
+++ b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshColorOverlaySemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Sosh brand tokens version 2.3.0
+// Sosh brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.sosh.tokens.semantic
@@ -21,12 +21,14 @@ import com.orange.ouds.theme.tokens.semantic.OudsColorOverlaySemanticTokens
 import com.orange.ouds.tokens.raw.OudsColorRawTokens
 
 internal data class SoshColorOverlaySemanticTokens(
+    override val overlayBackdropDark: Color = OudsColorRawTokens.ColorOpacityBlack680,
+    override val overlayBackdropLight: Color = OudsColorRawTokens.ColorOpacityBlack680,
     override val overlayDragDark: Color = OudsColorRawTokens.ColorOpacityWhite80,
     override val overlayDragLight: Color = OudsColorRawTokens.ColorOpacityBlack40,
     override val overlayDropdownDark: Color = OudsColorRawTokens.ColorFunctionalGrayDark560,
     override val overlayDropdownLight: Color = OudsColorRawTokens.ColorFunctionalWhite,
-    override val overlayModalDark: Color = SoshColorRawTokens.ColorBlueDuckDark720,
-    override val overlayModalLight: Color = OudsColorRawTokens.ColorFunctionalWhite,
+    override val overlayModalSheetDark: Color = SoshColorRawTokens.ColorBlueDuckDark800,
+    override val overlayModalSheetLight: Color = OudsColorRawTokens.ColorFunctionalWhite,
     override val overlayTooltipDark: Color = OudsColorRawTokens.ColorFunctionalGrayDark560,
     override val overlayTooltipLight: Color = OudsColorRawTokens.ColorFunctionalGrayDark720
 ) : OudsColorOverlaySemanticTokens
diff --git a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshColorRepositorySemanticTokens.kt b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshColorRepositorySemanticTokens.kt
index b85b61d61e..16bf950e61 100644
--- a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshColorRepositorySemanticTokens.kt
+++ b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshColorRepositorySemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Sosh brand tokens version 2.3.0
+// Sosh brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.sosh.tokens.semantic
@@ -110,7 +110,8 @@ internal data class SoshColorRepositorySemanticTokens(
     override val repositoryPrimaryLowest: Color = SoshColorRawTokens.ColorMagenta50,
     override val repositoryPrimaryMedium: Color = SoshColorRawTokens.ColorMagenta500,
     override val repositorySecondaryHigh: Color = SoshColorRawTokens.ColorBlueDuckDark720,
-    override val repositorySecondaryHigher: Color = SoshColorRawTokens.ColorBlueDuckDark880,
+    override val repositorySecondaryHigherHigh: Color = SoshColorRawTokens.ColorBlueDuckDark880,
+    override val repositorySecondaryHigherLow: Color = SoshColorRawTokens.ColorBlueDuckDark800,
     override val repositorySecondaryHighest: Color = SoshColorRawTokens.ColorBlueDuckDark960,
     override val repositorySecondaryLow: Color = SoshColorRawTokens.ColorBlueDuckDark400,
     override val repositorySecondaryLower: Color = SoshColorRawTokens.ColorBlueDuckLight800,
diff --git a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshColorSurfaceSemanticTokens.kt b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshColorSurfaceSemanticTokens.kt
index e87ef750b7..57f78a0dc5 100644
--- a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshColorSurfaceSemanticTokens.kt
+++ b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshColorSurfaceSemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Sosh brand tokens version 2.3.0
+// Sosh brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.sosh.tokens.semantic
diff --git a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshEffectSemanticTokens.kt b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshEffectSemanticTokens.kt
index 8310d703fe..d78e440539 100644
--- a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshEffectSemanticTokens.kt
+++ b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshEffectSemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Sosh brand tokens version 2.3.0
+// Sosh brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.sosh.tokens.semantic
@@ -19,5 +19,5 @@ import com.orange.ouds.theme.tokens.semantic.OudsEffectSemanticTokens
 import com.orange.ouds.tokens.raw.OudsEffectRawTokens
 
 internal data class SoshEffectSemanticTokens(
-    override val blurDrag: Int = OudsEffectRawTokens.EffectBlur320
+    override val blurDrag: Int = OudsEffectRawTokens.EffectBlur480
 ) : OudsEffectSemanticTokens
diff --git a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshFontSemanticTokens.kt b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshFontSemanticTokens.kt
index 52a1c160fe..eaa6e51a1c 100644
--- a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshFontSemanticTokens.kt
+++ b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshFontSemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Sosh brand tokens version 2.3.0
+// Sosh brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.sosh.tokens.semantic
diff --git a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshGridSemanticTokens.kt b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshGridSemanticTokens.kt
index c0df5c104a..dea7bd7882 100644
--- a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshGridSemanticTokens.kt
+++ b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshGridSemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Sosh brand tokens version 2.3.0
+// Sosh brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.sosh.tokens.semantic
@@ -19,7 +19,7 @@ import com.orange.ouds.theme.tokens.semantic.OudsGridSemanticTokens
 import com.orange.ouds.tokens.raw.OudsGridRawTokens
 
 internal data class SoshGridSemanticTokens(
-    override val compactColumnGap: Int = OudsGridRawTokens.GridColumnGap100,
+    override val compactColumnGap: Int = OudsGridRawTokens.GridColumnGap200,
     override val compactMargin: Int = OudsGridRawTokens.GridMargin300,
     override val compactMaxWidth: Int = OudsGridRawTokens.GridMaxWidthCompact,
     override val compactMinWidth: Int = OudsGridRawTokens.GridMinWidthCompact,
diff --git a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshOpacitySemanticTokens.kt b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshOpacitySemanticTokens.kt
index 4c39b80e0d..3b286871c2 100644
--- a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshOpacitySemanticTokens.kt
+++ b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshOpacitySemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Sosh brand tokens version 2.3.0
+// Sosh brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.sosh.tokens.semantic
diff --git a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshSizeSemanticTokens.kt b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshSizeSemanticTokens.kt
index f92f4c9a5f..b5a6b17e4b 100644
--- a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshSizeSemanticTokens.kt
+++ b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshSizeSemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Sosh brand tokens version 2.3.0
+// Sosh brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.sosh.tokens.semantic
@@ -73,7 +73,7 @@ internal data class SoshSizeSemanticTokens(
     override val iconWithLabelLargeSizeLarge: Float = OudsDimensionRawTokens.Dimension400,
     override val iconWithLabelLargeSizeMedium: Float = OudsDimensionRawTokens.Dimension350,
     override val iconWithLabelLargeSizeSmall: Float = OudsDimensionRawTokens.Dimension300,
-    override val iconWithLabelLargeSizeXlarge: Float = OudsDimensionRawTokens.Dimension550,
+    override val iconWithLabelLargeSizeXlarge: Float = OudsDimensionRawTokens.Dimension450,
     override val iconWithLabelLargeSizeXsmall: Float = OudsDimensionRawTokens.Dimension250,
     override val iconWithLabelMediumSizeLarge: Float = OudsDimensionRawTokens.Dimension300,
     override val iconWithLabelMediumSizeMedium: Float = OudsDimensionRawTokens.Dimension250,
@@ -83,36 +83,37 @@ internal data class SoshSizeSemanticTokens(
     override val iconWithLabelSmallSizeMedium: Float = OudsDimensionRawTokens.Dimension200,
     override val iconWithLabelSmallSizeSmall: Float = OudsDimensionRawTokens.Dimension150,
     override val iconWithLabelSmallSizeXsmall: Float = OudsDimensionRawTokens.DimensionOutOfSystem250,
-    override val iconWithLabelXlargeSizeLarge: Float = OudsDimensionRawTokens.Dimension550,
-    override val iconWithLabelXlargeSizeMedium: Float = OudsDimensionRawTokens.Dimension500,
+    override val iconWithLabelXlargeSizeLarge: Float = OudsDimensionRawTokens.Dimension500,
+    override val iconWithLabelXlargeSizeMedium: Float = OudsDimensionRawTokens.Dimension450,
     override val iconWithLabelXlargeSizeSmall: Float = OudsDimensionRawTokens.Dimension400,
-    override val maxWidthTypeBodyLargeMobile: Float = OudsDimensionRawTokens.Dimension6000,
-    override val maxWidthTypeBodyLargeTablet: Float = OudsDimensionRawTokens.Dimension6000,
-    override val maxWidthTypeBodyMediumMobile: Float = OudsDimensionRawTokens.Dimension6000,
-    override val maxWidthTypeBodyMediumTablet: Float = OudsDimensionRawTokens.Dimension6000,
-    override val maxWidthTypeBodySmallMobile: Float = OudsDimensionRawTokens.Dimension6000,
-    override val maxWidthTypeBodySmallTablet: Float = OudsDimensionRawTokens.Dimension6000,
-    override val maxWidthTypeDisplayLargeMobile: Float = OudsDimensionRawTokens.Dimension9000,
-    override val maxWidthTypeDisplayLargeTablet: Float = OudsDimensionRawTokens.Dimension9000,
-    override val maxWidthTypeDisplayMediumMobile: Float = OudsDimensionRawTokens.Dimension9000,
-    override val maxWidthTypeDisplayMediumTablet: Float = OudsDimensionRawTokens.Dimension9000,
-    override val maxWidthTypeDisplaySmallMobile: Float = OudsDimensionRawTokens.Dimension9000,
-    override val maxWidthTypeDisplaySmallTablet: Float = OudsDimensionRawTokens.Dimension9000,
-    override val maxWidthTypeHeadingLargeMobile: Float = OudsDimensionRawTokens.Dimension7000,
-    override val maxWidthTypeHeadingLargeTablet: Float = OudsDimensionRawTokens.Dimension9000,
-    override val maxWidthTypeHeadingMediumMobile: Float = OudsDimensionRawTokens.Dimension7000,
-    override val maxWidthTypeHeadingMediumTablet: Float = OudsDimensionRawTokens.Dimension7000,
-    override val maxWidthTypeHeadingSmallMobile: Float = OudsDimensionRawTokens.Dimension6000,
-    override val maxWidthTypeHeadingSmallTablet: Float = OudsDimensionRawTokens.Dimension7000,
-    override val maxWidthTypeHeadingXlargeMobile: Float = OudsDimensionRawTokens.Dimension7000,
-    override val maxWidthTypeHeadingXlargeTablet: Float = OudsDimensionRawTokens.Dimension9000,
-    override val maxWidthTypeLabelLargeMobile: Float = OudsDimensionRawTokens.Dimension6000,
-    override val maxWidthTypeLabelLargeTablet: Float = OudsDimensionRawTokens.Dimension6000,
-    override val maxWidthTypeLabelMediumMobile: Float = OudsDimensionRawTokens.Dimension6000,
-    override val maxWidthTypeLabelMediumTablet: Float = OudsDimensionRawTokens.Dimension6000,
-    override val maxWidthTypeLabelSmallMobile: Float = OudsDimensionRawTokens.Dimension6000,
-    override val maxWidthTypeLabelSmallTablet: Float = OudsDimensionRawTokens.Dimension6000,
-    override val maxWidthTypeLabelXlargeMobile: Float = OudsDimensionRawTokens.Dimension6000,
-    override val maxWidthTypeLabelXlargeTablet: Float = OudsDimensionRawTokens.Dimension6000,
+    override val iconWithLabelXlargeSizeXsmall: Float = OudsDimensionRawTokens.Dimension350,
+    override val maxWidthBodyLargeMobile: Float = OudsDimensionRawTokens.Dimension6000,
+    override val maxWidthBodyLargeTablet: Float = OudsDimensionRawTokens.Dimension6000,
+    override val maxWidthBodyMediumMobile: Float = OudsDimensionRawTokens.Dimension6000,
+    override val maxWidthBodyMediumTablet: Float = OudsDimensionRawTokens.Dimension6000,
+    override val maxWidthBodySmallMobile: Float = OudsDimensionRawTokens.Dimension6000,
+    override val maxWidthBodySmallTablet: Float = OudsDimensionRawTokens.Dimension6000,
+    override val maxWidthDisplayLargeMobile: Float = OudsDimensionRawTokens.Dimension9000,
+    override val maxWidthDisplayLargeTablet: Float = OudsDimensionRawTokens.Dimension9000,
+    override val maxWidthDisplayMediumMobile: Float = OudsDimensionRawTokens.Dimension9000,
+    override val maxWidthDisplayMediumTablet: Float = OudsDimensionRawTokens.Dimension9000,
+    override val maxWidthDisplaySmallMobile: Float = OudsDimensionRawTokens.Dimension9000,
+    override val maxWidthDisplaySmallTablet: Float = OudsDimensionRawTokens.Dimension9000,
+    override val maxWidthHeadingLargeMobile: Float = OudsDimensionRawTokens.Dimension7000,
+    override val maxWidthHeadingLargeTablet: Float = OudsDimensionRawTokens.Dimension9000,
+    override val maxWidthHeadingMediumMobile: Float = OudsDimensionRawTokens.Dimension7000,
+    override val maxWidthHeadingMediumTablet: Float = OudsDimensionRawTokens.Dimension7000,
+    override val maxWidthHeadingSmallMobile: Float = OudsDimensionRawTokens.Dimension6000,
+    override val maxWidthHeadingSmallTablet: Float = OudsDimensionRawTokens.Dimension7000,
+    override val maxWidthHeadingXlargeMobile: Float = OudsDimensionRawTokens.Dimension7000,
+    override val maxWidthHeadingXlargeTablet: Float = OudsDimensionRawTokens.Dimension9000,
+    override val maxWidthLabelLargeMobile: Float = OudsDimensionRawTokens.Dimension6000,
+    override val maxWidthLabelLargeTablet: Float = OudsDimensionRawTokens.Dimension6000,
+    override val maxWidthLabelMediumMobile: Float = OudsDimensionRawTokens.Dimension6000,
+    override val maxWidthLabelMediumTablet: Float = OudsDimensionRawTokens.Dimension6000,
+    override val maxWidthLabelSmallMobile: Float = OudsDimensionRawTokens.Dimension6000,
+    override val maxWidthLabelSmallTablet: Float = OudsDimensionRawTokens.Dimension6000,
+    override val maxWidthLabelXlargeMobile: Float = OudsDimensionRawTokens.Dimension6000,
+    override val maxWidthLabelXlargeTablet: Float = OudsDimensionRawTokens.Dimension6000,
     override val minInteractiveArea: Float = OudsDimensionRawTokens.Dimension600
 ) : OudsSizeSemanticTokens
diff --git a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshSpaceSemanticTokens.kt b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshSpaceSemanticTokens.kt
index bea0e50fa7..50e9eecd30 100644
--- a/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshSpaceSemanticTokens.kt
+++ b/theme-sosh/src/main/java/com/orange/ouds/theme/sosh/tokens/semantic/SoshSpaceSemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Sosh brand tokens version 2.3.0
+// Sosh brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.sosh.tokens.semantic
diff --git a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeAlertTokens.kt b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeAlertTokens.kt
index bc9058d6db..9e1ad8d14d 100644
--- a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeAlertTokens.kt
+++ b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeAlertTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Wireframe brand tokens version 2.3.0
+// Wireframe brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.wireframe.tokens.components
diff --git a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeBadgeTokens.kt b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeBadgeTokens.kt
index 98260fc795..9a06c44e71 100644
--- a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeBadgeTokens.kt
+++ b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeBadgeTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Wireframe brand tokens version 2.3.0
+// Wireframe brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.wireframe.tokens.components
@@ -24,7 +24,9 @@ internal data class WireframeBadgeTokens(
     override val sizeMedium: Float = OudsDimensionRawTokens.Dimension200,
     override val sizeSmall: Float = OudsDimensionRawTokens.Dimension150,
     override val sizeXsmall: Float = OudsDimensionRawTokens.Dimension100,
-    override val spaceInset: Float = OudsDimensionRawTokens.DimensionOutOfSystem75,
+    override val spaceInsetMediumLarge: Float = OudsDimensionRawTokens.DimensionOutOfSystem75,
+    override val spaceInsetSmall: Float = OudsDimensionRawTokens.DimensionOutOfSystem50,
+    override val spaceInsetXsmall: Float = OudsDimensionRawTokens.DimensionOutOfSystem25,
     override val spacePaddingInlineLarge: OudsSpaceKeyToken.PaddingInline = OudsSpaceKeyToken.PaddingInline.TwoExtraSmall,
     override val spacePaddingInlineMedium: OudsSpaceKeyToken.PaddingInline = OudsSpaceKeyToken.PaddingInline.ThreeExtraSmall
 ) : OudsBadgeTokens
diff --git a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeBarTokens.kt b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeBarTokens.kt
index 6d9907571c..aa12f47675 100644
--- a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeBarTokens.kt
+++ b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeBarTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Wireframe brand tokens version 2.3.0
+// Wireframe brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.wireframe.tokens.components
@@ -25,36 +25,37 @@ import com.orange.ouds.tokens.raw.OudsDimensionRawTokens
 import com.orange.ouds.tokens.raw.OudsEffectRawTokens
 
 internal data class WireframeBarTokens(
-    override val borderRadiusActiveIndicatorCustomBottom: OudsBorderKeyToken.Radius = OudsBorderKeyToken.Radius.Pill,
-    override val borderRadiusActiveIndicatorCustomTop: OudsBorderKeyToken.Radius = OudsBorderKeyToken.Radius.Default,
-    override val colorActiveIndicatorAndroidSelectedDisabled: OudsColorKeyToken = OudsColorKeyToken.Action.Support.Disabled,
-    override val colorActiveIndicatorAndroidSelectedEnabled: OudsColorKeyToken = OudsColorKeyToken.Action.Support.Enabled,
-    override val colorActiveIndicatorAndroidSelectedFocus: OudsColorKeyToken = OudsColorKeyToken.Action.Support.Focus,
-    override val colorActiveIndicatorAndroidSelectedHover: OudsColorKeyToken = OudsColorKeyToken.Action.Support.Hover,
-    override val colorActiveIndicatorAndroidSelectedPressed: OudsColorKeyToken = OudsColorKeyToken.Action.Support.Pressed,
-    override val colorActiveIndicatorAndroidUnselectedDisabled: OudsColorKeyToken = OudsColorKeyToken.Action.Support.Disabled,
-    override val colorActiveIndicatorAndroidUnselectedFocus: OudsColorKeyToken = OudsColorKeyToken.Action.Support.Focus,
-    override val colorActiveIndicatorAndroidUnselectedHover: OudsColorKeyToken = OudsColorKeyToken.Action.Support.Hover,
-    override val colorActiveIndicatorAndroidUnselectedPressed: OudsColorKeyToken = OudsColorKeyToken.Action.Support.Pressed,
-    override val colorActiveIndicatorCustomSelectedEnabled: OudsColorKeyToken = OudsColorKeyToken.Action.Selected,
-    override val colorActiveIndicatorCustomSelectedFocus: OudsColorKeyToken = OudsColorKeyToken.Action.Focus,
-    override val colorActiveIndicatorCustomSelectedHover: OudsColorKeyToken = OudsColorKeyToken.Action.Hover,
-    override val colorActiveIndicatorCustomSelectedPressed: OudsColorKeyToken = OudsColorKeyToken.Action.Pressed,
+    override val borderRadiusCurrentIndicatorCustomBottom: OudsBorderKeyToken.Radius = OudsBorderKeyToken.Radius.Pill,
+    override val borderRadiusCurrentIndicatorCustomTop: OudsBorderKeyToken.Radius = OudsBorderKeyToken.Radius.Default,
     override val colorBgOpaque: OudsColorKeyToken = OudsColorKeyToken.Background.Secondary,
-    override val colorBgTranslucent: OudsLightDarkColor = OudsLightDarkColor(Color(0xccf7f8fa), Color(0xcc181c26)),
+    override val colorBgTranslucent: OudsLightDarkColor = OudsLightDarkColor(Color(0xccffffff), Color(0xcc101319)),
     override val colorBorderBadge: OudsColorKeyToken = OudsColorKeyToken.Background.Secondary,
     override val colorContentOnIosAccent: OudsColorKeyToken = OudsColorKeyToken.Content.OnAction.Selected,
     override val colorContentSelectedEnabled: OudsColorKeyToken = OudsColorKeyToken.Action.Selected,
     override val colorContentSelectedFocus: OudsColorKeyToken = OudsColorKeyToken.Action.Focus,
     override val colorContentSelectedHover: OudsColorKeyToken = OudsColorKeyToken.Action.Hover,
     override val colorContentSelectedPressed: OudsColorKeyToken = OudsColorKeyToken.Action.Pressed,
-    override val colorContentUnselectedEnabled: OudsLightDarkColor = OudsLightDarkColor(Color(0x99000000), Color(0x99ffffff)),
+    override val colorContentUnselectedEnabled: OudsColorKeyToken = OudsColorKeyToken.Content.Muted,
     override val colorContentUnselectedFocus: OudsColorKeyToken = OudsColorKeyToken.Action.Focus,
     override val colorContentUnselectedHover: OudsColorKeyToken = OudsColorKeyToken.Action.Hover,
     override val colorContentUnselectedPressed: OudsColorKeyToken = OudsColorKeyToken.Action.Pressed,
-    override val effectBgBlur: Int = OudsEffectRawTokens.EffectBlur160,
-    override val opacityActiveIndicatorCustom: OudsOpacityKeyToken = OudsOpacityKeyToken.Invisible,
-    override val sizeHeightActiveIndicatorCustom: Float = OudsDimensionRawTokens.DimensionOutOfSystem75,
-    override val sizeWidthActiveIndicatorCustomBottom: Float = OudsDimensionRawTokens.Dimension300,
-    override val sizeWidthActiveIndicatorCustomTop: Float = OudsDimensionRawTokens.Dimension650
+    override val colorCurrentIndicatorAndroidSelectedDisabled: OudsColorKeyToken = OudsColorKeyToken.Action.Support.Disabled,
+    override val colorCurrentIndicatorAndroidSelectedEnabled: OudsColorKeyToken = OudsColorKeyToken.Action.Support.Enabled,
+    override val colorCurrentIndicatorAndroidSelectedFocus: OudsColorKeyToken = OudsColorKeyToken.Action.Support.Focus,
+    override val colorCurrentIndicatorAndroidSelectedHover: OudsColorKeyToken = OudsColorKeyToken.Action.Support.Hover,
+    override val colorCurrentIndicatorAndroidSelectedPressed: OudsColorKeyToken = OudsColorKeyToken.Action.Support.Pressed,
+    override val colorCurrentIndicatorAndroidUnselectedDisabled: OudsColorKeyToken = OudsColorKeyToken.Action.Support.Disabled,
+    override val colorCurrentIndicatorAndroidUnselectedFocus: OudsColorKeyToken = OudsColorKeyToken.Action.Support.Focus,
+    override val colorCurrentIndicatorAndroidUnselectedHover: OudsColorKeyToken = OudsColorKeyToken.Action.Support.Hover,
+    override val colorCurrentIndicatorAndroidUnselectedPressed: OudsColorKeyToken = OudsColorKeyToken.Action.Support.Pressed,
+    override val colorCurrentIndicatorCustomSelectedEnabled: OudsColorKeyToken = OudsColorKeyToken.Action.Selected,
+    override val colorCurrentIndicatorCustomSelectedFocus: OudsColorKeyToken = OudsColorKeyToken.Action.Focus,
+    override val colorCurrentIndicatorCustomSelectedHover: OudsColorKeyToken = OudsColorKeyToken.Action.Hover,
+    override val colorCurrentIndicatorCustomSelectedPressed: OudsColorKeyToken = OudsColorKeyToken.Action.Pressed,
+    override val colorIosAccent: OudsColorKeyToken = OudsColorKeyToken.Action.Selected,
+    override val effectBgBlur: Int = OudsEffectRawTokens.EffectBlur320,
+    override val opacityCurrentIndicatorCustom: OudsOpacityKeyToken = OudsOpacityKeyToken.Invisible,
+    override val sizeHeightCurrentIndicatorCustom: Float = OudsDimensionRawTokens.DimensionOutOfSystem75,
+    override val sizeWidthCurrentIndicatorCustomBottom: Float = OudsDimensionRawTokens.Dimension300,
+    override val sizeWidthCurrentIndicatorCustomTop: Float = OudsDimensionRawTokens.Dimension500
 ) : OudsBarTokens
diff --git a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeBulletListTokens.kt b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeBulletListTokens.kt
index e85405746a..3f8cd68303 100644
--- a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeBulletListTokens.kt
+++ b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeBulletListTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Wireframe brand tokens version 2.3.0
+// Wireframe brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.wireframe.tokens.components
diff --git a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeButtonMonoTokens.kt b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeButtonMonoTokens.kt
index f8fc46b83c..980ee3612a 100644
--- a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeButtonMonoTokens.kt
+++ b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeButtonMonoTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Wireframe brand tokens version 2.3.0
+// Wireframe brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.wireframe.tokens.components
diff --git a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeButtonTokens.kt b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeButtonTokens.kt
index 00ff1fa121..b8ab0a617f 100644
--- a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeButtonTokens.kt
+++ b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeButtonTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Wireframe brand tokens version 2.3.0
+// Wireframe brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.wireframe.tokens.components
@@ -32,8 +32,8 @@ internal data class WireframeButtonTokens(
     override val colorBgBrandEnabled: OudsColorKeyToken = OudsColorKeyToken.Surface.Brand.Secondary,
     override val colorBgBrandFocus: OudsColorKeyToken = OudsLightDarkColorKeyToken(OudsColorKeyToken.Repository.Secondary.High, OudsColorKeyToken.Repository.Secondary.Lower),
     override val colorBgBrandHover: OudsColorKeyToken = OudsLightDarkColorKeyToken(OudsColorKeyToken.Repository.Secondary.High, OudsColorKeyToken.Repository.Secondary.Lower),
-    override val colorBgBrandLoading: OudsColorKeyToken = OudsLightDarkColorKeyToken(OudsColorKeyToken.Repository.Secondary.Higher, OudsColorKeyToken.Repository.Secondary.Lowest),
-    override val colorBgBrandPressed: OudsColorKeyToken = OudsLightDarkColorKeyToken(OudsColorKeyToken.Repository.Secondary.Higher, OudsColorKeyToken.Repository.Secondary.Lowest),
+    override val colorBgBrandLoading: OudsColorKeyToken = OudsLightDarkColorKeyToken(OudsColorKeyToken.Repository.Secondary.HigherHigh, OudsColorKeyToken.Repository.Secondary.Lowest),
+    override val colorBgBrandPressed: OudsColorKeyToken = OudsLightDarkColorKeyToken(OudsColorKeyToken.Repository.Secondary.HigherHigh, OudsColorKeyToken.Repository.Secondary.Lowest),
     override val colorBgDefaultDisabled: OudsColorKeyToken = OudsColorKeyToken.Action.Disabled,
     override val colorBgDefaultEnabled: OudsColorKeyToken = OudsLightDarkColorKeyToken(OudsColorKeyToken.Repository.Opacity.Primary.Lowest, OudsColorKeyToken.Repository.Opacity.Primary.Medium),
     override val colorBgDefaultFocus: OudsColorKeyToken = OudsLightDarkColorKeyToken(OudsColorKeyToken.Repository.Opacity.Primary.Lower, OudsColorKeyToken.Repository.Opacity.Primary.High),
diff --git a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeCheckboxTokens.kt b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeCheckboxTokens.kt
index 7d06df6f27..0aa40168ee 100644
--- a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeCheckboxTokens.kt
+++ b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeCheckboxTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Wireframe brand tokens version 2.3.0
+// Wireframe brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.wireframe.tokens.components
@@ -29,7 +29,6 @@ internal data class WireframeCheckboxTokens(
     override val borderWidthUnselectedFocus: OudsBorderKeyToken.Width = OudsBorderKeyToken.Width.Medium,
     override val borderWidthUnselectedHover: OudsBorderKeyToken.Width = OudsBorderKeyToken.Width.Medium,
     override val borderWidthUnselectedPressed: OudsBorderKeyToken.Width = OudsBorderKeyToken.Width.Medium,
-    override val sizeIndicator: OudsSizeKeyToken.Icon = OudsSizeKeyToken.Icon.WithLabel.Large.SizeExtraSmall,
     override val sizeMaxHeight: OudsSizeKeyToken = OudsSizeKeyToken.MinInteractiveArea,
     override val sizeMinHeight: OudsSizeKeyToken = OudsSizeKeyToken.MinInteractiveArea,
     override val sizeMinWidth: OudsSizeKeyToken = OudsSizeKeyToken.MinInteractiveArea
diff --git a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeChipTokens.kt b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeChipTokens.kt
index fea87939c1..cc21030edc 100644
--- a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeChipTokens.kt
+++ b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeChipTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Wireframe brand tokens version 2.3.0
+// Wireframe brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.wireframe.tokens.components
diff --git a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeControlItemTokens.kt b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeControlItemTokens.kt
index c35e8895b0..e2b1e744a8 100644
--- a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeControlItemTokens.kt
+++ b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeControlItemTokens.kt
@@ -10,19 +10,70 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Wireframe brand tokens version 2.3.0
+// Wireframe brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.wireframe.tokens.components
 
 import com.orange.ouds.theme.tokens.OudsBorderKeyToken
 import com.orange.ouds.theme.tokens.OudsColorKeyToken
+import com.orange.ouds.theme.tokens.OudsOpacityKeyToken
 import com.orange.ouds.theme.tokens.OudsSizeKeyToken
 import com.orange.ouds.theme.tokens.OudsSpaceKeyToken
 import com.orange.ouds.theme.tokens.components.OudsControlItemTokens
 import com.orange.ouds.tokens.raw.OudsDimensionRawTokens
+import com.orange.ouds.tokens.raw.OudsFontRawTokens
 
 internal data class WireframeControlItemTokens(
+    override val borderRadiusCurrentIndicator: OudsBorderKeyToken.Radius = OudsBorderKeyToken.Radius.Default,
+    override val borderRadiusDefault: OudsBorderKeyToken.Radius = OudsBorderKeyToken.Radius.Default,
+    override val borderRadiusMedia: OudsBorderKeyToken.Radius = OudsBorderKeyToken.Radius.Default,
+    override val borderRadiusMediaRoundedCorner: OudsBorderKeyToken.Radius = OudsBorderKeyToken.Radius.Small,
+    override val borderRadiusRounded: OudsBorderKeyToken.Radius = OudsBorderKeyToken.Radius.Default,
+    override val borderWidthCurrentPage: OudsBorderKeyToken.Width = OudsBorderKeyToken.Width.Medium,
+    override val borderWidthDefault: OudsBorderKeyToken.Width = OudsBorderKeyToken.Width.Default,
+    override val colorBadgeSafetyArea: OudsColorKeyToken = OudsColorKeyToken.Background.Primary,
+    override val colorBgCurrentDisabled: OudsColorKeyToken = OudsColorKeyToken.Action.Disabled,
+    override val colorBgCurrentEnabled: OudsColorKeyToken = OudsColorKeyToken.Action.Selected,
+    override val colorBgCurrentFocus: OudsColorKeyToken = OudsColorKeyToken.Action.Focus,
+    override val colorBgCurrentHover: OudsColorKeyToken = OudsColorKeyToken.Action.Hover,
+    override val colorBgCurrentPressed: OudsColorKeyToken = OudsColorKeyToken.Action.Pressed,
+    override val colorContentCurrentDisabled: OudsColorKeyToken = OudsColorKeyToken.Content.OnAction.Disabled,
+    override val colorContentCurrentEnabled: OudsColorKeyToken = OudsColorKeyToken.Content.OnAction.Selected,
+    override val colorContentCurrentFocus: OudsColorKeyToken = OudsColorKeyToken.Content.OnAction.Focus,
+    override val colorContentCurrentHover: OudsColorKeyToken = OudsColorKeyToken.Content.OnAction.Hover,
+    override val colorContentCurrentPressed: OudsColorKeyToken = OudsColorKeyToken.Content.OnAction.Pressed,
+    override val fontLetterSpacingAvatarInitialXlarge: Float = OudsFontRawTokens.FontLetterSpacing450,
+    override val fontLineHeightAvatarInitialXlarge: Int = OudsFontRawTokens.FontLineHeight650,
+    override val fontSizeAvatarInitialXlarge: Int = OudsFontRawTokens.FontSize450,
+    override val opacityCurrentDivider: OudsOpacityKeyToken = OudsOpacityKeyToken.Invisible,
+    override val opacityCurrentIndicator: OudsOpacityKeyToken = OudsOpacityKeyToken.Invisible,
+    override val sizeAssetLarge: Float = OudsDimensionRawTokens.Dimension500,
+    override val sizeAssetMedium: OudsSizeKeyToken.Icon = OudsSizeKeyToken.Icon.WithLabel.Large.SizeMedium,
+    override val sizeAssetSmall: OudsSizeKeyToken.Icon = OudsSizeKeyToken.Icon.WithLabel.Large.SizeSmall,
+    override val sizeAssetXlarge: Float = OudsDimensionRawTokens.Dimension700,
+    override val sizeControlIndicator: OudsSizeKeyToken.Icon = OudsSizeKeyToken.Icon.WithLabel.Large.SizeExtraSmall,
+    override val sizeCurrentIndicatorWidth: Float = OudsDimensionRawTokens.Dimension50,
+    override val sizeFlagHeight: OudsSizeKeyToken.Icon = OudsSizeKeyToken.Icon.WithLabel.Large.SizeExtraSmall,
+    override val sizeMaxWidth: Float = OudsDimensionRawTokens.Dimension4000,
+    override val sizeMinHeightCompact: OudsSizeKeyToken = OudsSizeKeyToken.MinInteractiveArea,
+    override val sizeMinHeightDefault: Float = OudsDimensionRawTokens.Dimension750,
+    override val sizeMinWidth: Float = OudsDimensionRawTokens.Dimension2000,
+    override val spaceColumnGap: OudsSpaceKeyToken.ColumnGap = OudsSpaceKeyToken.ColumnGap.Medium,
+    override val spacePaddingBlockBottomSlot: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.ThreeExtraSmall,
+    override val spacePaddingBlockDensityCompact: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.ExtraSmall,
+    override val spacePaddingBlockDensityCompactBottomExpandContainer: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.TwoExtraLarge,
+    override val spacePaddingBlockDensityCompactTopAlignmentTopCounterweight: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.ExtraSmall,
+    override val spacePaddingBlockDensityCompactTopAlignmentTopTextContainer: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.None,
+    override val spacePaddingBlockDensityDefault: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.Medium,
+    override val spacePaddingBlockDensityDefaultBottomExpandContainer: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.ThreeExtraLarge,
+    override val spacePaddingBlockDensityDefaultTopAlignmentTopCounterweight: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.Small,
+    override val spacePaddingBlockDensityDefaultTopAlignmentTopTextContainer: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.FourExtraSmall,
+    override val spacePaddingBlockTopHelperText: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.ExtraSmall,
+    override val spacePaddingInline: OudsSpaceKeyToken.PaddingInline = OudsSpaceKeyToken.PaddingInline.Large,
+    override val spaceRowGap: OudsSpaceKeyToken.RowGap = OudsSpaceKeyToken.RowGap.None,
+
+    // TODO Keep the following tokens until the new control items are implemented, then remove them.
     override val borderRadius: OudsBorderKeyToken.Radius = OudsBorderKeyToken.Radius.None,
     override val borderRadiusItemOnly: OudsBorderKeyToken.Radius = OudsBorderKeyToken.Radius.Default,
     override val colorBgFocus: OudsColorKeyToken = OudsColorKeyToken.Action.Support.Focus,
@@ -31,16 +82,8 @@ internal data class WireframeControlItemTokens(
     override val colorBgPressed: OudsColorKeyToken = OudsColorKeyToken.Action.Support.Pressed,
     override val colorContentLoader: OudsColorKeyToken = OudsColorKeyToken.Action.Loading,
     override val sizeErrorIcon: OudsSizeKeyToken.Icon = OudsSizeKeyToken.Icon.WithLabel.Large.SizeSmall,
-    override val sizeIcon: OudsSizeKeyToken.Icon = OudsSizeKeyToken.Icon.WithLabel.Large.SizeMedium,
     override val sizeLoader: OudsSizeKeyToken.Icon = OudsSizeKeyToken.Icon.WithLabel.Large.SizeSmall,
     override val sizeMaxHeightAssetsContainer: Float = OudsDimensionRawTokens.Dimension1200,
-    override val sizeMaxWidth: Float = OudsDimensionRawTokens.Dimension4000,
-    override val sizeMinHeight: Float = OudsDimensionRawTokens.Dimension650,
-    override val sizeMinWidth: Float = OudsDimensionRawTokens.Dimension2000,
-    override val spaceColumnGap: OudsSpaceKeyToken.ColumnGap = OudsSpaceKeyToken.ColumnGap.Medium,
     override val spacePaddingBlockDefault: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.Medium,
-    override val spacePaddingBlockTopErrorText: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.ExtraSmall,
-    override val spacePaddingInline: OudsSpaceKeyToken.PaddingInline = OudsSpaceKeyToken.PaddingInline.Large,
-    override val spacePaddingInlineErrorIcon: OudsSpaceKeyToken.PaddingInline = OudsSpaceKeyToken.PaddingInline.FourExtraSmall,
-    override val spaceRowGap: OudsSpaceKeyToken.RowGap = OudsSpaceKeyToken.RowGap.None
+    override val spacePaddingInlineErrorIcon: OudsSpaceKeyToken.PaddingInline = OudsSpaceKeyToken.PaddingInline.FourExtraSmall
 ) : OudsControlItemTokens
diff --git a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeDividerTokens.kt b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeDividerTokens.kt
index ce0d8a11a9..b3917b439c 100644
--- a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeDividerTokens.kt
+++ b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeDividerTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Wireframe brand tokens version 2.3.0
+// Wireframe brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.wireframe.tokens.components
diff --git a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeIconTokens.kt b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeIconTokens.kt
index 325751c7ca..74043ce692 100644
--- a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeIconTokens.kt
+++ b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeIconTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Wireframe brand tokens version 2.3.0
+// Wireframe brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.wireframe.tokens.components
@@ -20,7 +20,8 @@ import com.orange.ouds.theme.tokens.OudsLightDarkColorKeyToken
 import com.orange.ouds.theme.tokens.components.OudsIconTokens
 
 internal data class WireframeIconTokens(
-    override val colorContentDefault: OudsColorKeyToken = OudsLightDarkColorKeyToken(OudsColorKeyToken.Repository.Neutral.Emphasized.Black, OudsColorKeyToken.Repository.Neutral.Muted.Lower),
     override val colorContentStatusWarningExternalShape: OudsColorKeyToken = OudsLightDarkColorKeyToken(OudsColorKeyToken.Repository.Warning.Medium, OudsColorKeyToken.Repository.Warning.Low),
-    override val colorContentStatusWarningInternalShape: OudsColorKeyToken = OudsLightDarkColorKeyToken(OudsColorKeyToken.Repository.Warning.High, OudsColorKeyToken.Opacity.Transparent)
+    override val colorContentStatusWarningInternalShape: OudsColorKeyToken = OudsLightDarkColorKeyToken(OudsColorKeyToken.Repository.Warning.High, OudsColorKeyToken.Opacity.Transparent),
+    override val colorContentStatusWarningInverseExternalShape: OudsColorKeyToken = OudsLightDarkColorKeyToken(OudsColorKeyToken.Repository.Warning.Low, OudsColorKeyToken.Repository.Warning.Medium),
+    override val colorContentStatusWarningInverseInternalShape: OudsColorKeyToken = OudsLightDarkColorKeyToken(OudsColorKeyToken.Opacity.Transparent, OudsColorKeyToken.Repository.Warning.High)
 ) : OudsIconTokens
diff --git a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeInputTagTokens.kt b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeInputTagTokens.kt
index ad261d226e..63ba72b45e 100644
--- a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeInputTagTokens.kt
+++ b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeInputTagTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Wireframe brand tokens version 2.3.0
+// Wireframe brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.wireframe.tokens.components
diff --git a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeLinkMonoTokens.kt b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeLinkMonoTokens.kt
index c5b19ac37e..e6d5007e9c 100644
--- a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeLinkMonoTokens.kt
+++ b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeLinkMonoTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Wireframe brand tokens version 2.3.0
+// Wireframe brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.wireframe.tokens.components
diff --git a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeLinkTokens.kt b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeLinkTokens.kt
index 349cc23784..9fd1e627c9 100644
--- a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeLinkTokens.kt
+++ b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeLinkTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Wireframe brand tokens version 2.3.0
+// Wireframe brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.wireframe.tokens.components
diff --git a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframePinCodeInputTokens.kt b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframePinCodeInputTokens.kt
index bca6127b2d..a0737d1fc4 100644
--- a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframePinCodeInputTokens.kt
+++ b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframePinCodeInputTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Wireframe brand tokens version 2.3.0
+// Wireframe brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.wireframe.tokens.components
diff --git a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeRadioButtonTokens.kt b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeRadioButtonTokens.kt
index 67562dd3a9..39909ae769 100644
--- a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeRadioButtonTokens.kt
+++ b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeRadioButtonTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Wireframe brand tokens version 2.3.0
+// Wireframe brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.wireframe.tokens.components
@@ -29,7 +29,6 @@ internal data class WireframeRadioButtonTokens(
     override val borderWidthUnselectedFocus: OudsBorderKeyToken.Width = OudsBorderKeyToken.Width.Medium,
     override val borderWidthUnselectedHover: OudsBorderKeyToken.Width = OudsBorderKeyToken.Width.Medium,
     override val borderWidthUnselectedPressed: OudsBorderKeyToken.Width = OudsBorderKeyToken.Width.Medium,
-    override val sizeIndicator: OudsSizeKeyToken.Icon = OudsSizeKeyToken.Icon.WithLabel.Large.SizeExtraSmall,
     override val sizeMaxHeight: OudsSizeKeyToken = OudsSizeKeyToken.MinInteractiveArea,
     override val sizeMinHeight: OudsSizeKeyToken = OudsSizeKeyToken.MinInteractiveArea,
     override val sizeMinWidth: OudsSizeKeyToken = OudsSizeKeyToken.MinInteractiveArea
diff --git a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeSwitchTokens.kt b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeSwitchTokens.kt
index 39286acae4..0e99041bee 100644
--- a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeSwitchTokens.kt
+++ b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeSwitchTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Wireframe brand tokens version 2.3.0
+// Wireframe brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.wireframe.tokens.components
diff --git a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeTagTokens.kt b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeTagTokens.kt
index 2f93d95fff..b231158bf6 100644
--- a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeTagTokens.kt
+++ b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeTagTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Wireframe brand tokens version 2.3.0
+// Wireframe brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.wireframe.tokens.components
@@ -28,8 +28,8 @@ internal data class WireframeTagTokens(
     override val sizeMinHeightDefault: Float = OudsDimensionRawTokens.Dimension400,
     override val sizeMinHeightInteractiveArea: OudsSizeKeyToken = OudsSizeKeyToken.MinInteractiveArea,
     override val sizeMinHeightSmall: Float = OudsDimensionRawTokens.Dimension300,
-    override val sizeMinWidthDefault: Float = OudsDimensionRawTokens.Dimension600,
-    override val sizeMinWidthSmall: Float = OudsDimensionRawTokens.Dimension550,
+    override val sizeMinWidthDefault: Float = OudsDimensionRawTokens.Dimension400,
+    override val sizeMinWidthSmall: Float = OudsDimensionRawTokens.Dimension300,
     override val spaceColumnGapDefault: OudsSpaceKeyToken.ColumnGap = OudsSpaceKeyToken.ColumnGap.TwoExtraSmall,
     override val spaceColumnGapSmall: OudsSpaceKeyToken.ColumnGap = OudsSpaceKeyToken.ColumnGap.TwoExtraSmall,
     override val spaceInsetBulletDefault: Float = OudsDimensionRawTokens.DimensionOutOfSystem75,
diff --git a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeTextAreaTokens.kt b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeTextAreaTokens.kt
index 5622786810..64cc598f98 100644
--- a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeTextAreaTokens.kt
+++ b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeTextAreaTokens.kt
@@ -10,13 +10,13 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Wireframe brand tokens version 2.3.0
+// Wireframe brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.wireframe.tokens.components
 
-import com.orange.ouds.theme.tokens.components.OudsTextAreaTokens
 import com.orange.ouds.theme.tokens.OudsSpaceKeyToken
+import com.orange.ouds.theme.tokens.components.OudsTextAreaTokens
 import com.orange.ouds.tokens.raw.OudsDimensionRawTokens
 
 internal data class WireframeTextAreaTokens(
@@ -24,5 +24,6 @@ internal data class WireframeTextAreaTokens(
     override val sizeMaxHeightInput: Float = OudsDimensionRawTokens.Dimension2500,
     override val sizeMaxWidth: Float = OudsDimensionRawTokens.Dimension6000,
     override val sizeMinHeightInput: Float = OudsDimensionRawTokens.Dimension900,
-    override val spacePaddingBlock: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.Small
+    override val spacePaddingBlock: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.Small,
+    override val spacePaddingBlockTopEmpty: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.Medium
 ) : OudsTextAreaTokens
diff --git a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeTextInputTokens.kt b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeTextInputTokens.kt
index 79856ab8f6..abd90fcaa2 100644
--- a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeTextInputTokens.kt
+++ b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/components/WireframeTextInputTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Wireframe brand tokens version 2.3.0
+// Wireframe brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.wireframe.tokens.components
@@ -40,6 +40,8 @@ internal data class WireframeTextInputTokens(
     override val sizeVerticalDividerHeight: Float = OudsDimensionRawTokens.Dimension250,
     override val spaceColumnGapDefault: OudsSpaceKeyToken.ColumnGap = OudsSpaceKeyToken.ColumnGap.Medium,
     override val spaceColumnGapInlineText: OudsSpaceKeyToken.ColumnGap = OudsSpaceKeyToken.ColumnGap.ExtraSmall,
+    override val spaceColumnGapLabelAsterisk: OudsSpaceKeyToken.ColumnGap = OudsSpaceKeyToken.ColumnGap.TwoExtraSmall,
+    override val spaceColumnGapLabelSmallAsterisk: Float = OudsDimensionRawTokens.DimensionOutOfSystem75,
     override val spaceColumnGapTrailingErrorAction: OudsSpaceKeyToken.ColumnGap = OudsSpaceKeyToken.ColumnGap.ExtraSmall,
     override val spacePaddingBlockDefault: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.TwoExtraSmall,
     override val spacePaddingBlockTopHelperText: OudsSpaceKeyToken.PaddingBlock = OudsSpaceKeyToken.PaddingBlock.ExtraSmall,
diff --git a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/raw/WireframeColorRawTokens.kt b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/raw/WireframeColorRawTokens.kt
index 916f65e09a..cbe5de7482 100644
--- a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/raw/WireframeColorRawTokens.kt
+++ b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/raw/WireframeColorRawTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Wireframe core tokens version 1.3.0
+// Wireframe core tokens version 1.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.wireframe.tokens.raw
@@ -78,8 +78,7 @@ object WireframeColorRawTokens {
   val ColorOpacityBlack880 = Color(0xe005052e)
   val ColorOpacityBlack920 = Color(0xeb05052e)
   val ColorOpacityBlack960 = Color(0xf505052e)
-  val ColorOpacityGrayDark800800 = Color(0xcc181c26)
-  val ColorOpacityGrayLight80800 = Color(0xccf7f8fa)
+  val ColorOpacityGrayDark880800 = Color(0xcc101319)
   val ColorOpacityRoyalBlue0 = Color(0x002055e5)
   val ColorOpacityRoyalBlue40 = Color(0x0a2055e5)
   val ColorOpacityRoyalBlue80 = Color(0x142055e5)
diff --git a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeBorderSemanticTokens.kt b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeBorderSemanticTokens.kt
index df3682746e..8e2390bcac 100644
--- a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeBorderSemanticTokens.kt
+++ b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeBorderSemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Wireframe brand tokens version 2.3.0
+// Wireframe brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.wireframe.tokens.semantic
@@ -24,15 +24,15 @@ internal data class WireframeBorderSemanticTokens(
     override val radiusMedium: Float = OudsBorderRawTokens.BorderRadius200,
     override val radiusNone: Float = OudsBorderRawTokens.BorderRadius0,
     override val radiusPill: Float = OudsBorderRawTokens.BorderRadius9999,
-    override val radiusSmall: Float = OudsBorderRawTokens.BorderRadius100,
+    override val radiusSmall: Float = OudsBorderRawTokens.BorderRadius75,
     override val styleDefault: String = OudsBorderRawTokens.BorderStyleSolid,
     override val styleDrag: String = OudsBorderRawTokens.BorderStyleDashed,
-    override val widthDefault: Float = OudsBorderRawTokens.BorderWidth25,
+    override val widthDefault: Float = OudsBorderRawTokens.BorderWidth50,
     override val widthFocus: Float = OudsBorderRawTokens.BorderWidth125,
     override val widthFocusInset: Float = OudsBorderRawTokens.BorderWidth50,
     override val widthMedium: Float = OudsBorderRawTokens.BorderWidth75,
     override val widthNone: Float = OudsBorderRawTokens.BorderWidth0,
     override val widthThick: Float = OudsBorderRawTokens.BorderWidth100,
     override val widthThicker: Float = OudsBorderRawTokens.BorderWidth150,
-    override val widthThin: Float = OudsBorderRawTokens.BorderWidth50
+    override val widthThin: Float = OudsBorderRawTokens.BorderWidth25
 ) : OudsBorderSemanticTokens
diff --git a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeColorActionSemanticTokens.kt b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeColorActionSemanticTokens.kt
index 614769595f..85b13bf578 100644
--- a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeColorActionSemanticTokens.kt
+++ b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeColorActionSemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Wireframe brand tokens version 2.3.0
+// Wireframe brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.wireframe.tokens.semantic
diff --git a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeColorAlwaysSemanticTokens.kt b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeColorAlwaysSemanticTokens.kt
index 171fc36767..37e3e6ee68 100644
--- a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeColorAlwaysSemanticTokens.kt
+++ b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeColorAlwaysSemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Wireframe brand tokens version 2.3.0
+// Wireframe brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.wireframe.tokens.semantic
diff --git a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeColorBgSemanticTokens.kt b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeColorBgSemanticTokens.kt
index 0893da7a8e..e907fbc7fb 100644
--- a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeColorBgSemanticTokens.kt
+++ b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeColorBgSemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Wireframe brand tokens version 2.3.0
+// Wireframe brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.wireframe.tokens.semantic
diff --git a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeColorBorderSemanticTokens.kt b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeColorBorderSemanticTokens.kt
index f6c7591147..24fbdaccb9 100644
--- a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeColorBorderSemanticTokens.kt
+++ b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeColorBorderSemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Wireframe brand tokens version 2.3.0
+// Wireframe brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.wireframe.tokens.semantic
@@ -29,12 +29,12 @@ internal data class WireframeColorBorderSemanticTokens(
     override val borderBrandTertiaryLight: Color = Color.Unspecified,
     override val borderDefaultDark: Color = WireframeColorRawTokens.ColorOpacityWhite200,
     override val borderDefaultLight: Color = WireframeColorRawTokens.ColorOpacityBlack200,
-    override val borderEmphasizedDark: Color = WireframeColorRawTokens.ColorOpacityWhite920,
+    override val borderEmphasizedDark: Color = WireframeColorRawTokens.ColorFunctionalGrayLight160,
     override val borderEmphasizedLight: Color = WireframeColorRawTokens.ColorFunctionalGrayDark960,
-    override val borderFocusDark: Color = WireframeColorRawTokens.ColorFunctionalGrayLight160,
+    override val borderFocusDark: Color = WireframeColorRawTokens.ColorRoyalBlue100,
     override val borderFocusInsetDark: Color = WireframeColorRawTokens.ColorFunctionalGrayDark880,
     override val borderFocusInsetLight: Color = OudsColorRawTokens.ColorFunctionalWhite,
-    override val borderFocusLight: Color = WireframeColorRawTokens.ColorFunctionalGrayDark960,
+    override val borderFocusLight: Color = WireframeColorRawTokens.ColorRoyalBlue900,
     override val borderMinimalDark: Color = WireframeColorRawTokens.ColorOpacityWhite40,
     override val borderMinimalLight: Color = WireframeColorRawTokens.ColorOpacityBlack40,
     override val borderMutedDark: Color = WireframeColorRawTokens.ColorOpacityWhite80,
diff --git a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeColorContentSemanticTokens.kt b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeColorContentSemanticTokens.kt
index c13b14ea59..f8ba276636 100644
--- a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeColorContentSemanticTokens.kt
+++ b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeColorContentSemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Wireframe brand tokens version 2.3.0
+// Wireframe brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.wireframe.tokens.semantic
@@ -81,6 +81,14 @@ internal data class WireframeColorContentSemanticTokens(
     override val contentStatusAccentLight: Color = WireframeColorRawTokens.ColorRustyRed600,
     override val contentStatusInfoDark: Color = OudsColorRawTokens.ColorFunctionalDodgerBlue300,
     override val contentStatusInfoLight: Color = OudsColorRawTokens.ColorFunctionalDodgerBlue700,
+    override val contentStatusInverseInfoDark: Color = OudsColorRawTokens.ColorFunctionalDodgerBlue700,
+    override val contentStatusInverseInfoLight: Color = OudsColorRawTokens.ColorFunctionalDodgerBlue300,
+    override val contentStatusInverseNegativeDark: Color = OudsColorRawTokens.ColorFunctionalScarlet600,
+    override val contentStatusInverseNegativeLight: Color = OudsColorRawTokens.ColorFunctionalScarlet300,
+    override val contentStatusInversePositiveDark: Color = OudsColorRawTokens.ColorFunctionalMalachite750,
+    override val contentStatusInversePositiveLight: Color = OudsColorRawTokens.ColorFunctionalMalachite300,
+    override val contentStatusInverseWarningDark: Color = OudsColorRawTokens.ColorFunctionalSun750,
+    override val contentStatusInverseWarningLight: Color = OudsColorRawTokens.ColorFunctionalSun300,
     override val contentStatusNegativeDark: Color = OudsColorRawTokens.ColorFunctionalScarlet300,
     override val contentStatusNegativeLight: Color = OudsColorRawTokens.ColorFunctionalScarlet600,
     override val contentStatusPositiveDark: Color = OudsColorRawTokens.ColorFunctionalMalachite300,
diff --git a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeColorModeSemanticTokens.kt b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeColorModeSemanticTokens.kt
index b10570de75..a8281b846e 100644
--- a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeColorModeSemanticTokens.kt
+++ b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeColorModeSemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Wireframe brand tokens version 2.3.0
+// Wireframe brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.wireframe.tokens.semantic
diff --git a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeColorOpacitySemanticTokens.kt b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeColorOpacitySemanticTokens.kt
index 619625fc50..de0b523749 100644
--- a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeColorOpacitySemanticTokens.kt
+++ b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeColorOpacitySemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Wireframe brand tokens version 2.3.0
+// Wireframe brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.wireframe.tokens.semantic
diff --git a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeColorOverlaySemanticTokens.kt b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeColorOverlaySemanticTokens.kt
index 9a699702ea..1cec0c5bd2 100644
--- a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeColorOverlaySemanticTokens.kt
+++ b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeColorOverlaySemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Wireframe brand tokens version 2.3.0
+// Wireframe brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.wireframe.tokens.semantic
@@ -21,12 +21,14 @@ import com.orange.ouds.theme.tokens.semantic.OudsColorOverlaySemanticTokens
 import com.orange.ouds.tokens.raw.OudsColorRawTokens
 
 internal data class WireframeColorOverlaySemanticTokens(
+    override val overlayBackdropDark: Color = WireframeColorRawTokens.ColorOpacityBlack680,
+    override val overlayBackdropLight: Color = WireframeColorRawTokens.ColorOpacityBlack680,
     override val overlayDragDark: Color = WireframeColorRawTokens.ColorOpacityWhite80,
     override val overlayDragLight: Color = WireframeColorRawTokens.ColorOpacityBlack40,
     override val overlayDropdownDark: Color = WireframeColorRawTokens.ColorFunctionalGrayDark560,
     override val overlayDropdownLight: Color = OudsColorRawTokens.ColorFunctionalWhite,
-    override val overlayModalDark: Color = WireframeColorRawTokens.ColorFunctionalGrayDark720,
-    override val overlayModalLight: Color = OudsColorRawTokens.ColorFunctionalWhite,
+    override val overlayModalSheetDark: Color = WireframeColorRawTokens.ColorFunctionalGrayDark720,
+    override val overlayModalSheetLight: Color = OudsColorRawTokens.ColorFunctionalWhite,
     override val overlayTooltipDark: Color = WireframeColorRawTokens.ColorFunctionalGrayDark560,
     override val overlayTooltipLight: Color = WireframeColorRawTokens.ColorFunctionalGrayDark720
 ) : OudsColorOverlaySemanticTokens
diff --git a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeColorRepositorySemanticTokens.kt b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeColorRepositorySemanticTokens.kt
index a9d818c269..0e85761d0f 100644
--- a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeColorRepositorySemanticTokens.kt
+++ b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeColorRepositorySemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Wireframe brand tokens version 2.3.0
+// Wireframe brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.wireframe.tokens.semantic
@@ -110,7 +110,8 @@ internal data class WireframeColorRepositorySemanticTokens(
     override val repositoryPrimaryLowest: Color = WireframeColorRawTokens.ColorRoyalBlue100,
     override val repositoryPrimaryMedium: Color = WireframeColorRawTokens.ColorRoyalBlue600,
     override val repositorySecondaryHigh: Color = WireframeColorRawTokens.ColorRustyRed700,
-    override val repositorySecondaryHigher: Color = WireframeColorRawTokens.ColorRustyRed800,
+    override val repositorySecondaryHigherHigh: Color = WireframeColorRawTokens.ColorRustyRed800,
+    override val repositorySecondaryHigherLow: Color = WireframeColorRawTokens.ColorRustyRed800,
     override val repositorySecondaryHighest: Color = Color.Unspecified,
     override val repositorySecondaryLow: Color = WireframeColorRawTokens.ColorRustyRed400,
     override val repositorySecondaryLower: Color = WireframeColorRawTokens.ColorRustyRed300,
diff --git a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeColorSurfaceSemanticTokens.kt b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeColorSurfaceSemanticTokens.kt
index 53ea540f82..39c041791e 100644
--- a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeColorSurfaceSemanticTokens.kt
+++ b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeColorSurfaceSemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Wireframe brand tokens version 2.3.0
+// Wireframe brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.wireframe.tokens.semantic
diff --git a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeEffectSemanticTokens.kt b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeEffectSemanticTokens.kt
index 82eab89b61..7247192108 100644
--- a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeEffectSemanticTokens.kt
+++ b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeEffectSemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Wireframe brand tokens version 2.3.0
+// Wireframe brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.wireframe.tokens.semantic
@@ -19,5 +19,5 @@ import com.orange.ouds.theme.tokens.semantic.OudsEffectSemanticTokens
 import com.orange.ouds.tokens.raw.OudsEffectRawTokens
 
 internal data class WireframeEffectSemanticTokens(
-    override val blurDrag: Int = OudsEffectRawTokens.EffectBlur320
+    override val blurDrag: Int = OudsEffectRawTokens.EffectBlur480
 ) : OudsEffectSemanticTokens
diff --git a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeFontSemanticTokens.kt b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeFontSemanticTokens.kt
index fdbab285c9..0218756926 100644
--- a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeFontSemanticTokens.kt
+++ b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeFontSemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Wireframe brand tokens version 2.3.0
+// Wireframe brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.wireframe.tokens.semantic
diff --git a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeGridSemanticTokens.kt b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeGridSemanticTokens.kt
index 4c5ed8c35d..f5b8d043da 100644
--- a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeGridSemanticTokens.kt
+++ b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeGridSemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Wireframe brand tokens version 2.3.0
+// Wireframe brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.wireframe.tokens.semantic
@@ -19,7 +19,7 @@ import com.orange.ouds.theme.tokens.semantic.OudsGridSemanticTokens
 import com.orange.ouds.tokens.raw.OudsGridRawTokens
 
 internal data class WireframeGridSemanticTokens(
-    override val compactColumnGap: Int = OudsGridRawTokens.GridColumnGap100,
+    override val compactColumnGap: Int = OudsGridRawTokens.GridColumnGap200,
     override val compactMargin: Int = OudsGridRawTokens.GridMargin300,
     override val compactMaxWidth: Int = OudsGridRawTokens.GridMaxWidthCompact,
     override val compactMinWidth: Int = OudsGridRawTokens.GridMinWidthCompact,
diff --git a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeOpacitySemanticTokens.kt b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeOpacitySemanticTokens.kt
index 6232683f27..c4a9a71b8a 100644
--- a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeOpacitySemanticTokens.kt
+++ b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeOpacitySemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Wireframe brand tokens version 2.3.0
+// Wireframe brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.wireframe.tokens.semantic
diff --git a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeSizeSemanticTokens.kt b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeSizeSemanticTokens.kt
index b2c214f22a..9ee84d8a0f 100644
--- a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeSizeSemanticTokens.kt
+++ b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeSizeSemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Wireframe brand tokens version 2.3.0
+// Wireframe brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.wireframe.tokens.semantic
@@ -73,7 +73,7 @@ internal data class WireframeSizeSemanticTokens(
     override val iconWithLabelLargeSizeLarge: Float = OudsDimensionRawTokens.Dimension400,
     override val iconWithLabelLargeSizeMedium: Float = OudsDimensionRawTokens.Dimension350,
     override val iconWithLabelLargeSizeSmall: Float = OudsDimensionRawTokens.Dimension300,
-    override val iconWithLabelLargeSizeXlarge: Float = OudsDimensionRawTokens.Dimension550,
+    override val iconWithLabelLargeSizeXlarge: Float = OudsDimensionRawTokens.Dimension450,
     override val iconWithLabelLargeSizeXsmall: Float = OudsDimensionRawTokens.Dimension250,
     override val iconWithLabelMediumSizeLarge: Float = OudsDimensionRawTokens.Dimension300,
     override val iconWithLabelMediumSizeMedium: Float = OudsDimensionRawTokens.Dimension250,
@@ -83,36 +83,37 @@ internal data class WireframeSizeSemanticTokens(
     override val iconWithLabelSmallSizeMedium: Float = OudsDimensionRawTokens.Dimension200,
     override val iconWithLabelSmallSizeSmall: Float = OudsDimensionRawTokens.Dimension150,
     override val iconWithLabelSmallSizeXsmall: Float = OudsDimensionRawTokens.DimensionOutOfSystem250,
-    override val iconWithLabelXlargeSizeLarge: Float = OudsDimensionRawTokens.Dimension550,
-    override val iconWithLabelXlargeSizeMedium: Float = OudsDimensionRawTokens.Dimension500,
+    override val iconWithLabelXlargeSizeLarge: Float = OudsDimensionRawTokens.Dimension500,
+    override val iconWithLabelXlargeSizeMedium: Float = OudsDimensionRawTokens.Dimension450,
     override val iconWithLabelXlargeSizeSmall: Float = OudsDimensionRawTokens.Dimension400,
-    override val maxWidthTypeBodyLargeMobile: Float = OudsDimensionRawTokens.Dimension6000,
-    override val maxWidthTypeBodyLargeTablet: Float = OudsDimensionRawTokens.Dimension6000,
-    override val maxWidthTypeBodyMediumMobile: Float = OudsDimensionRawTokens.Dimension6000,
-    override val maxWidthTypeBodyMediumTablet: Float = OudsDimensionRawTokens.Dimension6000,
-    override val maxWidthTypeBodySmallMobile: Float = OudsDimensionRawTokens.Dimension6000,
-    override val maxWidthTypeBodySmallTablet: Float = OudsDimensionRawTokens.Dimension6000,
-    override val maxWidthTypeDisplayLargeMobile: Float = OudsDimensionRawTokens.Dimension9000,
-    override val maxWidthTypeDisplayLargeTablet: Float = OudsDimensionRawTokens.Dimension9000,
-    override val maxWidthTypeDisplayMediumMobile: Float = OudsDimensionRawTokens.Dimension9000,
-    override val maxWidthTypeDisplayMediumTablet: Float = OudsDimensionRawTokens.Dimension9000,
-    override val maxWidthTypeDisplaySmallMobile: Float = OudsDimensionRawTokens.Dimension9000,
-    override val maxWidthTypeDisplaySmallTablet: Float = OudsDimensionRawTokens.Dimension9000,
-    override val maxWidthTypeHeadingLargeMobile: Float = OudsDimensionRawTokens.Dimension7000,
-    override val maxWidthTypeHeadingLargeTablet: Float = OudsDimensionRawTokens.Dimension9000,
-    override val maxWidthTypeHeadingMediumMobile: Float = OudsDimensionRawTokens.Dimension7000,
-    override val maxWidthTypeHeadingMediumTablet: Float = OudsDimensionRawTokens.Dimension7000,
-    override val maxWidthTypeHeadingSmallMobile: Float = OudsDimensionRawTokens.Dimension6000,
-    override val maxWidthTypeHeadingSmallTablet: Float = OudsDimensionRawTokens.Dimension7000,
-    override val maxWidthTypeHeadingXlargeMobile: Float = OudsDimensionRawTokens.Dimension7000,
-    override val maxWidthTypeHeadingXlargeTablet: Float = OudsDimensionRawTokens.Dimension9000,
-    override val maxWidthTypeLabelLargeMobile: Float = OudsDimensionRawTokens.Dimension6000,
-    override val maxWidthTypeLabelLargeTablet: Float = OudsDimensionRawTokens.Dimension6000,
-    override val maxWidthTypeLabelMediumMobile: Float = OudsDimensionRawTokens.Dimension6000,
-    override val maxWidthTypeLabelMediumTablet: Float = OudsDimensionRawTokens.Dimension6000,
-    override val maxWidthTypeLabelSmallMobile: Float = OudsDimensionRawTokens.Dimension6000,
-    override val maxWidthTypeLabelSmallTablet: Float = OudsDimensionRawTokens.Dimension6000,
-    override val maxWidthTypeLabelXlargeMobile: Float = OudsDimensionRawTokens.Dimension6000,
-    override val maxWidthTypeLabelXlargeTablet: Float = OudsDimensionRawTokens.Dimension6000,
+    override val iconWithLabelXlargeSizeXsmall: Float = OudsDimensionRawTokens.Dimension350,
+    override val maxWidthBodyLargeMobile: Float = OudsDimensionRawTokens.Dimension6000,
+    override val maxWidthBodyLargeTablet: Float = OudsDimensionRawTokens.Dimension6000,
+    override val maxWidthBodyMediumMobile: Float = OudsDimensionRawTokens.Dimension6000,
+    override val maxWidthBodyMediumTablet: Float = OudsDimensionRawTokens.Dimension6000,
+    override val maxWidthBodySmallMobile: Float = OudsDimensionRawTokens.Dimension6000,
+    override val maxWidthBodySmallTablet: Float = OudsDimensionRawTokens.Dimension6000,
+    override val maxWidthDisplayLargeMobile: Float = OudsDimensionRawTokens.Dimension9000,
+    override val maxWidthDisplayLargeTablet: Float = OudsDimensionRawTokens.Dimension9000,
+    override val maxWidthDisplayMediumMobile: Float = OudsDimensionRawTokens.Dimension9000,
+    override val maxWidthDisplayMediumTablet: Float = OudsDimensionRawTokens.Dimension9000,
+    override val maxWidthDisplaySmallMobile: Float = OudsDimensionRawTokens.Dimension9000,
+    override val maxWidthDisplaySmallTablet: Float = OudsDimensionRawTokens.Dimension9000,
+    override val maxWidthHeadingLargeMobile: Float = OudsDimensionRawTokens.Dimension7000,
+    override val maxWidthHeadingLargeTablet: Float = OudsDimensionRawTokens.Dimension9000,
+    override val maxWidthHeadingMediumMobile: Float = OudsDimensionRawTokens.Dimension7000,
+    override val maxWidthHeadingMediumTablet: Float = OudsDimensionRawTokens.Dimension7000,
+    override val maxWidthHeadingSmallMobile: Float = OudsDimensionRawTokens.Dimension6000,
+    override val maxWidthHeadingSmallTablet: Float = OudsDimensionRawTokens.Dimension7000,
+    override val maxWidthHeadingXlargeMobile: Float = OudsDimensionRawTokens.Dimension7000,
+    override val maxWidthHeadingXlargeTablet: Float = OudsDimensionRawTokens.Dimension9000,
+    override val maxWidthLabelLargeMobile: Float = OudsDimensionRawTokens.Dimension6000,
+    override val maxWidthLabelLargeTablet: Float = OudsDimensionRawTokens.Dimension6000,
+    override val maxWidthLabelMediumMobile: Float = OudsDimensionRawTokens.Dimension6000,
+    override val maxWidthLabelMediumTablet: Float = OudsDimensionRawTokens.Dimension6000,
+    override val maxWidthLabelSmallMobile: Float = OudsDimensionRawTokens.Dimension6000,
+    override val maxWidthLabelSmallTablet: Float = OudsDimensionRawTokens.Dimension6000,
+    override val maxWidthLabelXlargeMobile: Float = OudsDimensionRawTokens.Dimension6000,
+    override val maxWidthLabelXlargeTablet: Float = OudsDimensionRawTokens.Dimension6000,
     override val minInteractiveArea: Float = OudsDimensionRawTokens.Dimension600
 ) : OudsSizeSemanticTokens
diff --git a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeSpaceSemanticTokens.kt b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeSpaceSemanticTokens.kt
index 1a0e243679..0e748c513c 100644
--- a/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeSpaceSemanticTokens.kt
+++ b/theme-wireframe/src/main/java/com/orange/ouds/theme/wireframe/tokens/semantic/WireframeSpaceSemanticTokens.kt
@@ -10,7 +10,7 @@
 // Software description: Android library of reusable graphical components
 //
 
-// Wireframe brand tokens version 2.3.0
+// Wireframe brand tokens version 2.4.0
 // Generated by Tokenator
 
 package com.orange.ouds.theme.wireframe.tokens.semantic