diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 6ddfcc9d..21599fcb 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -340,6 +340,7 @@
     <inspection_tool class="JDBCExecuteWithNonConstantString" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="JDBCPrepareStatementWithNonConstantString" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="JUnit5Converter" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="JavaCollectionWithNullableTypeArgument" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="JavaDoc" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="TOP_LEVEL_CLASS_OPTIONS">
         <value>
@@ -500,6 +501,12 @@
     <inspection_tool class="ModuleWithTooManyClasses" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="limit" value="100" />
     </inspection_tool>
+    <inspection_tool class="MultiplatformPreviewAnnotationInFunctionWithParameters" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="MultiplatformPreviewMultipleParameterProviders" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
     <inspection_tool class="MultipleDeclaration" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="ignoreForLoopDeclarations" value="true" />
     </inspection_tool>
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index 47a649c4..37f7094d 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -37,6 +37,7 @@ dependencies {
     api(Voyager.navigator)
     implementation(Kotlin.reflect)
     implementation(compose.desktop.currentOs)
+    implementation(compose.materialIconsExtended)
     implementation(Material3.Desktop.lib)
     testImplementation(Kotest.runnerJUnit5)
 }
diff --git a/core/src/main/kotlin/io/spine/chords/core/table/Table.kt b/core/src/main/kotlin/io/spine/chords/core/table/Table.kt
index 21d042ec..bd829cbe 100644
--- a/core/src/main/kotlin/io/spine/chords/core/table/Table.kt
+++ b/core/src/main/kotlin/io/spine/chords/core/table/Table.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025, TeamDev. All rights reserved.
+ * Copyright 2026, TeamDev. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -54,7 +54,10 @@ import androidx.compose.foundation.rememberScrollbarAdapter
 import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.ArrowDropDown
+import androidx.compose.material.icons.filled.ArrowDropUp
 import androidx.compose.material.icons.filled.MoreVert
+import androidx.compose.material.icons.filled.UnfoldMore
 import androidx.compose.material3.Divider
 import androidx.compose.material3.DropdownMenu
 import androidx.compose.material3.DropdownMenuItem
@@ -71,10 +74,19 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment.Companion.CenterEnd
 import androidx.compose.ui.Alignment.Companion.CenterHorizontally
 import androidx.compose.ui.Alignment.Companion.CenterVertically
+import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.input.pointer.PointerEventType.Companion.Enter
+import androidx.compose.ui.input.pointer.PointerEventType.Companion.Exit
+import androidx.compose.ui.input.pointer.PointerIcon.Companion.Hand
+import androidx.compose.ui.input.pointer.onPointerEvent
+import androidx.compose.ui.input.pointer.pointerHoverIcon
 import androidx.compose.ui.unit.dp
 import io.spine.chords.core.Component
+import io.spine.chords.core.table.TableSortingDirection.ASCENDING
+import io.spine.chords.core.table.TableSortingDirection.DESCENDING
 
 /**
  * A list of entities in a tabular format.
@@ -84,6 +96,64 @@ import io.spine.chords.core.Component
  * Users can customize row behavior and style, specify column
  * configurations for displaying the data, and visual appearance of a table.
  *
+ * Example:
+ * ```kotlin
+ * class UsersTable : Table<User>() {
+ *
+ *     init {
+ *         defaultComparator = compareBy(User::name)
+ *         columns = listOf(
+ *             TableColumn(name = "Name") { user ->
+ *                 Text(user.name)
+ *             },
+ *             TableColumn(name = "Email") { user ->
+ *                 Text(user.email)
+ *             }
+ *         )
+ *     }
+ *
+ *     override fun extractEntityId(entity: User): Any = entity.id
+ *
+ *     @Composable
+ *     override fun ColumnScope.EmptyTableContent() {
+ *         Text("No users")
+ *     }
+ * }
+ * ```
+ *
+ * Example with column sorting:
+ * ```kotlin
+ * class UsersTable : Table<User>() {
+ *
+ *     init {
+ *         columns = listOf(
+ *             TableColumn(
+ *                 name = "Name",
+ *                 sorting = TableColumnSorting(compareBy(User::name))
+ *             ) { user ->
+ *                 Text(user.name)
+ *             },
+ *             TableColumn(
+ *                 name = "Created",
+ *                 sorting = TableColumnSorting(
+ *                     comparator = compareBy(User::createdAt),
+ *                     initialDirection = DESCENDING
+ *                 )
+ *             ) { user ->
+ *                 Text(user.createdAt.toString())
+ *             }
+ *         )
+ *     }
+ *
+ *     override fun extractEntityId(entity: User): Any = entity.id
+ *
+ *     @Composable
+ *     override fun ColumnScope.EmptyTableContent() {
+ *         Text("No users")
+ *     }
+ * }
+ * ```
+ *
  * @param E The type of entities represented in the table.
  */
 public abstract class Table<E> : Component() {
@@ -103,9 +173,9 @@ public abstract class Table<E> : Component() {
     )
 
     /**
-     * A callback which is invoked whenever selected entity value is changed.
+     * A callback that is invoked whenever the selected entity value is changed.
      *
-     * The parameter of the lambda receives the new selected entity value.
+     * The parameter of the lambda receives the newly selected entity value.
      */
     public var onSelect: ((E) -> Unit)? = null
 
@@ -132,11 +202,19 @@ public abstract class Table<E> : Component() {
     protected var rowActions: RowActionsConfig<E>? by mutableStateOf(null)
 
     /**
-     * Defines the sorting logic for the entities displayed in the table.
+     * Defines the default sorting logic for the entities displayed in the table.
      *
-     * By default, entities are displayed in their original order.
+     * This comparator is applied when the user has not selected a sortable header,
+     * if one is available.
+     *
+     * By default, the entities are displayed in their original order.
+     */
+    protected var defaultComparator: Comparator<E> by mutableStateOf(Comparator { _, _ -> 0 })
+
+    /**
+     * Stores the current interactive sorting state for the table.
      */
-    protected var sortBy: Comparator<E> by mutableStateOf(Comparator { _, _ -> 0 })
+    protected var sortingState: TableSortingState<E> by mutableStateOf(TableSortingState())
 
     /**
      * The padding applied to the entire content of the table.
@@ -184,7 +262,7 @@ public abstract class Table<E> : Component() {
 
     @Composable
     override fun content() {
-        val sortedEntities = entities.sortedWith(sortBy)
+        val sortedEntities = sortedEntities()
         val tableColumns = columns.toMutableList()
         if (rowActions != null) {
             tableColumns.add(rowActionsColumn(rowActions!!))
@@ -194,7 +272,10 @@ public abstract class Table<E> : Component() {
                 .padding(contentPadding),
             verticalArrangement = Center,
         ) {
-            HeaderTableRow(tableColumns)
+            HeaderTableRow(
+                columns = tableColumns,
+                sortingState = sortingState
+            )
             if (entities.isNotEmpty()) {
                 ContentList(sortedEntities, tableColumns)
             } else {
@@ -203,6 +284,15 @@ public abstract class Table<E> : Component() {
         }
     }
 
+    /**
+     * Resolves the list of entities to render, according to the current sorting configuration.
+     *
+     * @return The list of entities in the order that should be rendered.
+     */
+    private fun sortedEntities(): List<E> {
+        return entities.sortedWith(sortingState.activeComparator(defaultComparator))
+    }
+
     /**
      * Displays the table content without a header.
      *
@@ -285,6 +375,10 @@ public abstract class Table<E> : Component() {
  *   meaning that if all columns have this `weight` value, their width is equal.
  * @param padding The padding values of each cell's content in this column.
  *   By default, no padding is applied.
+ * @param columnKey A stable identifier of the column used to keep track of the sorting state.
+ *   By default, the column [name] is used.
+ * @param sorting Optional sorting configuration for this column.
+ *   If `null`, the header is rendered without interactive sorting support.
  * @param cellContent A callback that specifies what element to display
  *   inside each cell of this column.
  */
@@ -293,9 +387,147 @@ public data class TableColumn<E>(
     val horizontalArrangement: Horizontal = Center,
     val weight: Float = 1F,
     val padding: PaddingValues = PaddingValues(),
+    val columnKey: Any = name,
+    val sorting: TableColumnSorting<E>? = null,
     val cellContent: @Composable (E) -> Unit
 )
 
+/**
+ * Defines sorting rules for a table column.
+ *
+ * @param comparator The comparator used as the base sorting logic for this column.
+ * @param initialDirection The direction applied the first time the column is activated.
+ */
+public data class TableColumnSorting<E>(
+    val comparator: Comparator<E>,
+    val initialDirection: TableSortingDirection = ASCENDING
+)
+
+/**
+ * Sorting direction used by the table.
+ */
+public enum class TableSortingDirection {
+
+    /**
+     * Sorts values from lower to higher according to the column comparator.
+     */
+    ASCENDING,
+
+    /**
+     * Sorts values from higher to lower according to the column comparator.
+     */
+    DESCENDING;
+
+    /**
+     * Returns the opposite sorting direction.
+     *
+     * @return The reversed sorting direction.
+     */
+    public fun reverse(): TableSortingDirection {
+        return when (this) {
+            ASCENDING -> DESCENDING
+            DESCENDING -> ASCENDING
+        }
+    }
+
+    /**
+     * Applies this direction to the given comparator.
+     *
+     * @param comparator The comparator to adjust.
+     * @return The original comparator for [ASCENDING] or the reversed comparator
+     *   for [DESCENDING].
+     */
+    internal fun <T> applyTo(comparator: Comparator<T>): Comparator<T> {
+        return when (this) {
+            ASCENDING -> comparator
+            DESCENDING -> comparator.reversed()
+        }
+    }
+}
+
+/**
+ * A concrete sorting selection currently applied to the table.
+ *
+ * @param columnKey The key of the active column.
+ * @param direction The selected sorting direction.
+ * @param sorting The sorting definition associated with the column.
+ */
+public data class TableSorting<E>(
+    val columnKey: Any,
+    val direction: TableSortingDirection,
+    val sorting: TableColumnSorting<E>
+) {
+    /**
+     * Produces a comparator for the current column and direction.
+     *
+     * @return The comparator that should be applied to table entities.
+     */
+    internal fun comparator(): Comparator<E> {
+        return direction.applyTo(sorting.comparator)
+    }
+}
+
+/**
+ * Holds interactive sorting state for a [Table].
+ *
+ * @param initialSorting The initial sorting state, if any.
+ */
+public class TableSortingState<E>(
+    initialSorting: TableSorting<E>? = null
+) {
+
+    /**
+     * The currently active sorting state.
+     */
+    public var currentSorting: TableSorting<E>? by mutableStateOf(initialSorting)
+        private set
+
+    /**
+     * Applies sorting for the given column or toggles the direction if the column is already sorted.
+     *
+     * If the column is not sortable, the state remains unchanged.
+     */
+    public fun toggle(column: TableColumn<E>) {
+        val columnSorting = column.sorting ?: return
+        val nextDirection = if (currentSorting?.columnKey == column.columnKey) {
+            currentSorting!!.direction.reverse()
+        } else {
+            columnSorting.initialDirection
+        }
+        currentSorting = TableSorting(column.columnKey, nextDirection, columnSorting)
+    }
+
+    /**
+     * Returns `true` when the given column is the current sorting target.
+     *
+     * @param column The column to check.
+     * @return `true` if the column is active; otherwise `false`.
+     */
+    public fun isActive(column: TableColumn<E>): Boolean {
+        return currentSorting?.columnKey == column.columnKey
+    }
+
+    /**
+     * Returns the current sorting direction for the given column.
+     *
+     * @param column The column whose direction should be resolved.
+     * @return The active direction for the column, or `null` if the column is not active.
+     */
+    internal fun directionFor(column: TableColumn<E>): TableSortingDirection? {
+        return currentSorting?.takeIf { it.columnKey == column.columnKey }?.direction
+    }
+
+    /**
+     * Returns the comparator that should currently be applied to table entities.
+     *
+     * @param fallback The default comparator to use when no interactive sort is active.
+     * @return The active column comparator or the fallback comparator.
+     */
+    internal fun activeComparator(fallback: Comparator<E>): Comparator<E> {
+        return currentSorting?.comparator() ?: fallback
+    }
+}
+
 /**
  * Configuration object for row actions in a table.
  *
@@ -375,18 +607,92 @@ private fun VerticalScrollBar(
 /**
  * Table row with headers.
  *
+ * NOTE: the Pointer Hover API used in this method is experimental
+ * in the current version of Compose (1.5.12).
+ *
  * @param columns A list of column configuration objects
  *   with information about headers.
+ * @param sortingState The current interactive sorting state of the table.
  */
+@OptIn(ExperimentalComposeUiApi::class)
 @Composable
 private fun <E> HeaderTableRow(
     columns: List<TableColumn<E>>,
+    sortingState: TableSortingState<E>,
+) {
+    TableRow(
+        columns = columns,
+        cellModifier = { column ->
+            if (column.sorting != null) {
+                Modifier
+                    .pointerHoverIcon(Hand)
+                    .clickable(
+                        interactionSource = MutableInteractionSource(),
+                        indication = null,
+                    ) {
+                        sortingState.toggle(column)
+                    }
+            } else {
+                Modifier
+            }
+        }
+    ) { column ->
+        HeaderCell(
+            column = column,
+            sortingState = sortingState
+        )
+    }
+}
+
+/**
+ * Displays a single table header cell.
+ *
+ * NOTE: the Pointer Hover API used in this method is experimental
+ * in the current version of Compose (1.5.12).
+ *
+ * @param column The column whose header content should be displayed.
+ * @param sortingState The current interactive sorting state of the table.
+ */
+@OptIn(ExperimentalComposeUiApi::class)
+@Composable
+private fun <E> HeaderCell(
+    column: TableColumn<E>,
+    sortingState: TableSortingState<E>
 ) {
-    TableRow(columns = columns) { column ->
+    val isSortable = column.sorting != null
+    var isHovered by remember { mutableStateOf(false) }
+    Row(
+        modifier = Modifier
+            .fillMaxWidth()
+            .onPointerEvent(Enter) { isHovered = true }
+            .onPointerEvent(Exit) { isHovered = false },
+        horizontalArrangement = column.horizontalArrangement,
+        verticalAlignment = CenterVertically
+    ) {
         Text(
             text = column.name,
             style = typography.titleMedium
         )
+        val direction = if (isSortable) {
+            sortingState.directionFor(column)
+        } else {
+            null
+        }
+        if (isSortable) {
+            Icon(
+                imageVector = when (direction) {
+                    ASCENDING -> Icons.Default.ArrowDropUp
+                    DESCENDING -> Icons.Default.ArrowDropDown
+                    null -> Icons.Default.UnfoldMore
+                },
+                contentDescription = null,
+                modifier = Modifier
+                    .padding(start = 4.dp)
+                    .size(18.dp)
+                    .alpha(if (direction != null || isHovered) 1f else 0f),
+                tint = colorScheme.onSurfaceVariant
+            )
+        }
     }
 }
 
@@ -421,6 +727,8 @@ private fun <E> ContentTableRow(
  *
  * @param columns A list of columns from which the row consists.
  * @param modifier The [Modifier] to be applied to this row.
+ * @param cellModifier A callback that provides an additional [Modifier]
+ *   for each individual cell.
  * @param cellContent A callback that specifies what element to display
  *   inside each cell of this column.
  */
@@ -428,6 +736,7 @@ private fun <E> ContentTableRow(
 private fun <E> TableRow(
     columns: List<TableColumn<E>>,
     modifier: Modifier = Modifier,
+    cellModifier: (TableColumn<E>) -> Modifier = { Modifier },
     cellContent: @Composable (TableColumn<E>) -> Unit
 ) {
     Row(
@@ -444,6 +753,7 @@ private fun <E> TableRow(
                 modifier = Modifier
                     .weight(column.weight)
                     .fillMaxHeight()
+                    .then(cellModifier(column))
                     .padding(column.padding),
                 horizontalArrangement = column.horizontalArrangement,
                 verticalAlignment = CenterVertically
diff --git a/dependencies.md b/dependencies.md
index 64836e57..177ebd26 100644
--- a/dependencies.md
+++ b/dependencies.md
@@ -1,6 +1,6 @@
 
 
-# Dependencies of `io.spine.chords:spine-chords-client:2.0.0-SNAPSHOT.81`
+# Dependencies of `io.spine.chords:spine-chords-client:2.0.0-SNAPSHOT.82`
 
 ## Runtime
 1.  **Group** : cafe.adriel.voyager. **Name** : voyager-core. **Version** : 1.0.1.**No license information found**
@@ -121,7 +121,7 @@
      * **Project URL:** [https://github.com/JetBrains/compose-jb](https://github.com/JetBrains/compose-jb)
      * **License:** [The Apache Software License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt)
 
-1.  **Group** : org.jetbrains.compose.desktop. **Name** : desktop-jvm-windows-x64. **Version** : 1.5.12.**No license information found**
+1.  **Group** : org.jetbrains.compose.desktop. **Name** : desktop-jvm-macos-x64. **Version** : 1.5.12.**No license information found**
 1.  **Group** : org.jetbrains.compose.foundation. **Name** : foundation. **Version** : 1.5.12.**No license information found**
 1.  **Group** : org.jetbrains.compose.foundation. **Name** : foundation-desktop. **Version** : 1.5.12.
      * **Project URL:** [https://github.com/JetBrains/compose-jb](https://github.com/JetBrains/compose-jb)
@@ -142,6 +142,11 @@
      * **Project URL:** [https://github.com/JetBrains/compose-jb](https://github.com/JetBrains/compose-jb)
      * **License:** [The Apache Software License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt)
 
+1.  **Group** : org.jetbrains.compose.material. **Name** : material-icons-extended. **Version** : 1.5.12.**No license information found**
+1.  **Group** : org.jetbrains.compose.material. **Name** : material-icons-extended-desktop. **Version** : 1.5.12.
+     * **Project URL:** [https://github.com/JetBrains/compose-jb](https://github.com/JetBrains/compose-jb)
+     * **License:** [The Apache Software License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt)
+
 1.  **Group** : org.jetbrains.compose.material. **Name** : material-ripple. **Version** : 1.5.12.**No license information found**
 1.  **Group** : org.jetbrains.compose.material. **Name** : material-ripple-desktop. **Version** : 1.5.12.
      * **Project URL:** [https://github.com/JetBrains/compose-jb](https://github.com/JetBrains/compose-jb)
@@ -244,7 +249,7 @@
      * **Project URL:** [https://www.github.com/JetBrains/skiko](https://www.github.com/JetBrains/skiko)
      * **License:** [The Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
 
-1.  **Group** : org.jetbrains.skiko. **Name** : skiko-awt-runtime-windows-x64. **Version** : 0.7.85.4.
+1.  **Group** : org.jetbrains.skiko. **Name** : skiko-awt-runtime-macos-x64. **Version** : 0.7.85.4.
      * **Project URL:** [https://www.github.com/JetBrains/skiko](https://www.github.com/JetBrains/skiko)
      * **License:** [The Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
 
@@ -774,7 +779,7 @@
      * **Project URL:** [https://github.com/JetBrains/compose-jb](https://github.com/JetBrains/compose-jb)
      * **License:** [The Apache Software License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt)
 
-1.  **Group** : org.jetbrains.compose.desktop. **Name** : desktop-jvm-windows-x64. **Version** : 1.5.12.**No license information found**
+1.  **Group** : org.jetbrains.compose.desktop. **Name** : desktop-jvm-macos-x64. **Version** : 1.5.12.**No license information found**
 1.  **Group** : org.jetbrains.compose.foundation. **Name** : foundation. **Version** : 1.5.12.**No license information found**
 1.  **Group** : org.jetbrains.compose.foundation. **Name** : foundation-desktop. **Version** : 1.5.12.
      * **Project URL:** [https://github.com/JetBrains/compose-jb](https://github.com/JetBrains/compose-jb)
@@ -795,6 +800,11 @@
      * **Project URL:** [https://github.com/JetBrains/compose-jb](https://github.com/JetBrains/compose-jb)
      * **License:** [The Apache Software License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt)
 
+1.  **Group** : org.jetbrains.compose.material. **Name** : material-icons-extended. **Version** : 1.5.12.**No license information found**
+1.  **Group** : org.jetbrains.compose.material. **Name** : material-icons-extended-desktop. **Version** : 1.5.12.
+     * **Project URL:** [https://github.com/JetBrains/compose-jb](https://github.com/JetBrains/compose-jb)
+     * **License:** [The Apache Software License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt)
+
 1.  **Group** : org.jetbrains.compose.material. **Name** : material-ripple. **Version** : 1.5.12.**No license information found**
 1.  **Group** : org.jetbrains.compose.material. **Name** : material-ripple-desktop. **Version** : 1.5.12.
      * **Project URL:** [https://github.com/JetBrains/compose-jb](https://github.com/JetBrains/compose-jb)
@@ -1020,7 +1030,7 @@
      * **Project URL:** [https://www.github.com/JetBrains/skiko](https://www.github.com/JetBrains/skiko)
      * **License:** [The Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
 
-1.  **Group** : org.jetbrains.skiko. **Name** : skiko-awt-runtime-windows-x64. **Version** : 0.7.85.4.
+1.  **Group** : org.jetbrains.skiko. **Name** : skiko-awt-runtime-macos-x64. **Version** : 0.7.85.4.
      * **Project URL:** [https://www.github.com/JetBrains/skiko](https://www.github.com/JetBrains/skiko)
      * **License:** [The Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
 
@@ -1094,12 +1104,12 @@
 
 The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
-This report was generated on **Mon May 19 05:01:25 EEST 2025** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
+This report was generated on **Tue Apr 14 15:50:11 EEST 2026** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
 
 
 
 
-# Dependencies of `io.spine.chords:spine-chords-codegen-tests:2.0.0-SNAPSHOT.81`
+# Dependencies of `io.spine.chords:spine-chords-codegen-tests:2.0.0-SNAPSHOT.82`
 
 ## Runtime
 1.  **Group** : com.google.android. **Name** : annotations. **Version** : 4.1.1.4.
@@ -1953,12 +1963,12 @@ This report was generated on **Mon May 19 05:01:25 EEST 2025** using [Gradle-Lic
 
 The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
-This report was generated on **Mon May 19 05:01:27 EEST 2025** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
+This report was generated on **Tue Apr 14 15:50:13 EEST 2026** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
 
 
 
 
-# Dependencies of `io.spine.chords:spine-chords-core:2.0.0-SNAPSHOT.81`
+# Dependencies of `io.spine.chords:spine-chords-core:2.0.0-SNAPSHOT.82`
 
 ## Runtime
 1.  **Group** : cafe.adriel.voyager. **Name** : voyager-core. **Version** : 1.0.1.
@@ -2036,7 +2046,7 @@ This report was generated on **Mon May 19 05:01:27 EEST 2025** using [Gradle-Lic
      * **Project URL:** [https://github.com/JetBrains/compose-jb](https://github.com/JetBrains/compose-jb)
      * **License:** [The Apache Software License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt)
 
-1.  **Group** : org.jetbrains.compose.desktop. **Name** : desktop-jvm-windows-x64. **Version** : 1.5.12.**No license information found**
+1.  **Group** : org.jetbrains.compose.desktop. **Name** : desktop-jvm-macos-x64. **Version** : 1.5.12.**No license information found**
 1.  **Group** : org.jetbrains.compose.foundation. **Name** : foundation. **Version** : 1.5.12.**No license information found**
 1.  **Group** : org.jetbrains.compose.foundation. **Name** : foundation-desktop. **Version** : 1.5.12.
      * **Project URL:** [https://github.com/JetBrains/compose-jb](https://github.com/JetBrains/compose-jb)
@@ -2057,6 +2067,11 @@ This report was generated on **Mon May 19 05:01:27 EEST 2025** using [Gradle-Lic
      * **Project URL:** [https://github.com/JetBrains/compose-jb](https://github.com/JetBrains/compose-jb)
      * **License:** [The Apache Software License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt)
 
+1.  **Group** : org.jetbrains.compose.material. **Name** : material-icons-extended. **Version** : 1.5.12.**No license information found**
+1.  **Group** : org.jetbrains.compose.material. **Name** : material-icons-extended-desktop. **Version** : 1.5.12.
+     * **Project URL:** [https://github.com/JetBrains/compose-jb](https://github.com/JetBrains/compose-jb)
+     * **License:** [The Apache Software License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt)
+
 1.  **Group** : org.jetbrains.compose.material. **Name** : material-ripple. **Version** : 1.5.12.**No license information found**
 1.  **Group** : org.jetbrains.compose.material. **Name** : material-ripple-desktop. **Version** : 1.5.12.
      * **Project URL:** [https://github.com/JetBrains/compose-jb](https://github.com/JetBrains/compose-jb)
@@ -2158,7 +2173,7 @@ This report was generated on **Mon May 19 05:01:27 EEST 2025** using [Gradle-Lic
      * **Project URL:** [https://www.github.com/JetBrains/skiko](https://www.github.com/JetBrains/skiko)
      * **License:** [The Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
 
-1.  **Group** : org.jetbrains.skiko. **Name** : skiko-awt-runtime-windows-x64. **Version** : 0.7.85.4.
+1.  **Group** : org.jetbrains.skiko. **Name** : skiko-awt-runtime-macos-x64. **Version** : 0.7.85.4.
      * **Project URL:** [https://www.github.com/JetBrains/skiko](https://www.github.com/JetBrains/skiko)
      * **License:** [The Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
 
@@ -2663,7 +2678,7 @@ This report was generated on **Mon May 19 05:01:27 EEST 2025** using [Gradle-Lic
      * **Project URL:** [https://github.com/JetBrains/compose-jb](https://github.com/JetBrains/compose-jb)
      * **License:** [The Apache Software License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt)
 
-1.  **Group** : org.jetbrains.compose.desktop. **Name** : desktop-jvm-windows-x64. **Version** : 1.5.12.**No license information found**
+1.  **Group** : org.jetbrains.compose.desktop. **Name** : desktop-jvm-macos-x64. **Version** : 1.5.12.**No license information found**
 1.  **Group** : org.jetbrains.compose.foundation. **Name** : foundation. **Version** : 1.5.12.**No license information found**
 1.  **Group** : org.jetbrains.compose.foundation. **Name** : foundation-desktop. **Version** : 1.5.12.
      * **Project URL:** [https://github.com/JetBrains/compose-jb](https://github.com/JetBrains/compose-jb)
@@ -2684,6 +2699,11 @@ This report was generated on **Mon May 19 05:01:27 EEST 2025** using [Gradle-Lic
      * **Project URL:** [https://github.com/JetBrains/compose-jb](https://github.com/JetBrains/compose-jb)
      * **License:** [The Apache Software License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt)
 
+1.  **Group** : org.jetbrains.compose.material. **Name** : material-icons-extended. **Version** : 1.5.12.**No license information found**
+1.  **Group** : org.jetbrains.compose.material. **Name** : material-icons-extended-desktop. **Version** : 1.5.12.
+     * **Project URL:** [https://github.com/JetBrains/compose-jb](https://github.com/JetBrains/compose-jb)
+     * **License:** [The Apache Software License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt)
+
 1.  **Group** : org.jetbrains.compose.material. **Name** : material-ripple. **Version** : 1.5.12.**No license information found**
 1.  **Group** : org.jetbrains.compose.material. **Name** : material-ripple-desktop. **Version** : 1.5.12.
      * **Project URL:** [https://github.com/JetBrains/compose-jb](https://github.com/JetBrains/compose-jb)
@@ -2908,7 +2928,7 @@ This report was generated on **Mon May 19 05:01:27 EEST 2025** using [Gradle-Lic
      * **Project URL:** [https://www.github.com/JetBrains/skiko](https://www.github.com/JetBrains/skiko)
      * **License:** [The Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
 
-1.  **Group** : org.jetbrains.skiko. **Name** : skiko-awt-runtime-windows-x64. **Version** : 0.7.85.4.
+1.  **Group** : org.jetbrains.skiko. **Name** : skiko-awt-runtime-macos-x64. **Version** : 0.7.85.4.
      * **Project URL:** [https://www.github.com/JetBrains/skiko](https://www.github.com/JetBrains/skiko)
      * **License:** [The Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
 
@@ -2982,12 +3002,12 @@ This report was generated on **Mon May 19 05:01:27 EEST 2025** using [Gradle-Lic
 
 The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
-This report was generated on **Mon May 19 05:01:30 EEST 2025** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
+This report was generated on **Tue Apr 14 15:50:14 EEST 2026** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
 
 
 
 
-# Dependencies of `io.spine.chords:spine-chords-proto:2.0.0-SNAPSHOT.81`
+# Dependencies of `io.spine.chords:spine-chords-proto:2.0.0-SNAPSHOT.82`
 
 ## Runtime
 1.  **Group** : cafe.adriel.voyager. **Name** : voyager-core. **Version** : 1.0.1.**No license information found**
@@ -3076,7 +3096,7 @@ This report was generated on **Mon May 19 05:01:30 EEST 2025** using [Gradle-Lic
      * **Project URL:** [https://github.com/JetBrains/compose-jb](https://github.com/JetBrains/compose-jb)
      * **License:** [The Apache Software License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt)
 
-1.  **Group** : org.jetbrains.compose.desktop. **Name** : desktop-jvm-windows-x64. **Version** : 1.5.12.**No license information found**
+1.  **Group** : org.jetbrains.compose.desktop. **Name** : desktop-jvm-macos-x64. **Version** : 1.5.12.**No license information found**
 1.  **Group** : org.jetbrains.compose.foundation. **Name** : foundation. **Version** : 1.5.12.**No license information found**
 1.  **Group** : org.jetbrains.compose.foundation. **Name** : foundation-desktop. **Version** : 1.5.12.
      * **Project URL:** [https://github.com/JetBrains/compose-jb](https://github.com/JetBrains/compose-jb)
@@ -3097,6 +3117,11 @@ This report was generated on **Mon May 19 05:01:30 EEST 2025** using [Gradle-Lic
      * **Project URL:** [https://github.com/JetBrains/compose-jb](https://github.com/JetBrains/compose-jb)
      * **License:** [The Apache Software License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt)
 
+1.  **Group** : org.jetbrains.compose.material. **Name** : material-icons-extended. **Version** : 1.5.12.**No license information found**
+1.  **Group** : org.jetbrains.compose.material. **Name** : material-icons-extended-desktop. **Version** : 1.5.12.
+     * **Project URL:** [https://github.com/JetBrains/compose-jb](https://github.com/JetBrains/compose-jb)
+     * **License:** [The Apache Software License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt)
+
 1.  **Group** : org.jetbrains.compose.material. **Name** : material-ripple. **Version** : 1.5.12.**No license information found**
 1.  **Group** : org.jetbrains.compose.material. **Name** : material-ripple-desktop. **Version** : 1.5.12.
      * **Project URL:** [https://github.com/JetBrains/compose-jb](https://github.com/JetBrains/compose-jb)
@@ -3195,7 +3220,7 @@ This report was generated on **Mon May 19 05:01:30 EEST 2025** using [Gradle-Lic
      * **Project URL:** [https://www.github.com/JetBrains/skiko](https://www.github.com/JetBrains/skiko)
      * **License:** [The Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
 
-1.  **Group** : org.jetbrains.skiko. **Name** : skiko-awt-runtime-windows-x64. **Version** : 0.7.85.4.
+1.  **Group** : org.jetbrains.skiko. **Name** : skiko-awt-runtime-macos-x64. **Version** : 0.7.85.4.
      * **Project URL:** [https://www.github.com/JetBrains/skiko](https://www.github.com/JetBrains/skiko)
      * **License:** [The Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
 
@@ -3694,7 +3719,7 @@ This report was generated on **Mon May 19 05:01:30 EEST 2025** using [Gradle-Lic
      * **Project URL:** [https://github.com/JetBrains/compose-jb](https://github.com/JetBrains/compose-jb)
      * **License:** [The Apache Software License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt)
 
-1.  **Group** : org.jetbrains.compose.desktop. **Name** : desktop-jvm-windows-x64. **Version** : 1.5.12.**No license information found**
+1.  **Group** : org.jetbrains.compose.desktop. **Name** : desktop-jvm-macos-x64. **Version** : 1.5.12.**No license information found**
 1.  **Group** : org.jetbrains.compose.foundation. **Name** : foundation. **Version** : 1.5.12.**No license information found**
 1.  **Group** : org.jetbrains.compose.foundation. **Name** : foundation-desktop. **Version** : 1.5.12.
      * **Project URL:** [https://github.com/JetBrains/compose-jb](https://github.com/JetBrains/compose-jb)
@@ -3715,6 +3740,11 @@ This report was generated on **Mon May 19 05:01:30 EEST 2025** using [Gradle-Lic
      * **Project URL:** [https://github.com/JetBrains/compose-jb](https://github.com/JetBrains/compose-jb)
      * **License:** [The Apache Software License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt)
 
+1.  **Group** : org.jetbrains.compose.material. **Name** : material-icons-extended. **Version** : 1.5.12.**No license information found**
+1.  **Group** : org.jetbrains.compose.material. **Name** : material-icons-extended-desktop. **Version** : 1.5.12.
+     * **Project URL:** [https://github.com/JetBrains/compose-jb](https://github.com/JetBrains/compose-jb)
+     * **License:** [The Apache Software License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt)
+
 1.  **Group** : org.jetbrains.compose.material. **Name** : material-ripple. **Version** : 1.5.12.**No license information found**
 1.  **Group** : org.jetbrains.compose.material. **Name** : material-ripple-desktop. **Version** : 1.5.12.
      * **Project URL:** [https://github.com/JetBrains/compose-jb](https://github.com/JetBrains/compose-jb)
@@ -3936,7 +3966,7 @@ This report was generated on **Mon May 19 05:01:30 EEST 2025** using [Gradle-Lic
      * **Project URL:** [https://www.github.com/JetBrains/skiko](https://www.github.com/JetBrains/skiko)
      * **License:** [The Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
 
-1.  **Group** : org.jetbrains.skiko. **Name** : skiko-awt-runtime-windows-x64. **Version** : 0.7.85.4.
+1.  **Group** : org.jetbrains.skiko. **Name** : skiko-awt-runtime-macos-x64. **Version** : 0.7.85.4.
      * **Project URL:** [https://www.github.com/JetBrains/skiko](https://www.github.com/JetBrains/skiko)
      * **License:** [The Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
 
@@ -4010,12 +4040,12 @@ This report was generated on **Mon May 19 05:01:30 EEST 2025** using [Gradle-Lic
 
 The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
-This report was generated on **Mon May 19 05:01:33 EEST 2025** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
+This report was generated on **Tue Apr 14 15:50:15 EEST 2026** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
 
 
 
 
-# Dependencies of `io.spine.chords:spine-chords-proto-values:2.0.0-SNAPSHOT.81`
+# Dependencies of `io.spine.chords:spine-chords-proto-values:2.0.0-SNAPSHOT.82`
 
 ## Runtime
 1.  **Group** : com.google.code.findbugs. **Name** : jsr305. **Version** : 3.0.2.
@@ -4809,12 +4839,12 @@ This report was generated on **Mon May 19 05:01:33 EEST 2025** using [Gradle-Lic
 
 The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
-This report was generated on **Mon May 19 05:01:35 EEST 2025** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
+This report was generated on **Tue Apr 14 15:50:16 EEST 2026** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
 
 
 
 
-# Dependencies of `io.spine.chords:spine-chords-runtime:2.0.0-SNAPSHOT.81`
+# Dependencies of `io.spine.chords:spine-chords-runtime:2.0.0-SNAPSHOT.82`
 
 ## Runtime
 1.  **Group** : com.google.code.findbugs. **Name** : jsr305. **Version** : 3.0.2.
@@ -5578,4 +5608,4 @@ This report was generated on **Mon May 19 05:01:35 EEST 2025** using [Gradle-Lic
 
 The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
-This report was generated on **Mon May 19 05:01:37 EEST 2025** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
\ No newline at end of file
+This report was generated on **Tue Apr 14 15:50:17 EEST 2026** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 7522c9e2..0e5d1594 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@ all modules and does not describe the project structure per-subproject.
  -->
 <groupId>io.spine.chords</groupId>
 <artifactId>Chords</artifactId>
-<version>2.0.0-SNAPSHOT.81</version>
+<version>2.0.0-SNAPSHOT.82</version>
 
 <inceptionYear>2015</inceptionYear>
 
@@ -79,7 +79,13 @@ all modules and does not describe the project structure per-subproject.
   </dependency>
   <dependency>
     <groupId>org.jetbrains.compose.desktop</groupId>
-    <artifactId>desktop-jvm-windows-x64</artifactId>
+    <artifactId>desktop-jvm-macos-x64</artifactId>
+    <version>1.5.12</version>
+    <scope>compile</scope>
+  </dependency>
+  <dependency>
+    <groupId>org.jetbrains.compose.material</groupId>
+    <artifactId>material-icons-extended</artifactId>
     <version>1.5.12</version>
     <scope>compile</scope>
   </dependency>
diff --git a/version.gradle.kts b/version.gradle.kts
index 84c69ec7..d5e36a8b 100644
--- a/version.gradle.kts
+++ b/version.gradle.kts
@@ -27,4 +27,4 @@
 /**
  * The version of all Chords libraries.
  */
-val chordsVersion: String by extra("2.0.0-SNAPSHOT.81")
+val chordsVersion: String by extra("2.0.0-SNAPSHOT.82")