diff --git a/app/src/main/java/com/agileburo/anytype/di/feature/PageDI.kt b/app/src/main/java/com/agileburo/anytype/di/feature/PageDI.kt
index 9a2601f49f..4e9169c320 100644
--- a/app/src/main/java/com/agileburo/anytype/di/feature/PageDI.kt
+++ b/app/src/main/java/com/agileburo/anytype/di/feature/PageDI.kt
@@ -41,7 +41,8 @@ class PageModule {
         interceptEvents: InterceptEvents,
         updateCheckbox: UpdateCheckbox,
         unlinkBlocks: UnlinkBlocks,
-        duplicateBlock: DuplicateBlock
+        duplicateBlock: DuplicateBlock,
+        updateTextStyle: UpdateTextStyle
     ): PageViewModelFactory = PageViewModelFactory(
         openPage = openPage,
         closePage = closePage,
@@ -50,7 +51,8 @@ class PageModule {
         interceptEvents = interceptEvents,
         updateCheckbox = updateCheckbox,
         unlinkBlocks = unlinkBlocks,
-        duplicateBlock = duplicateBlock
+        duplicateBlock = duplicateBlock,
+        updateTextStyle = updateTextStyle
     )
 
     @Provides
@@ -125,4 +127,12 @@ class PageModule {
     ): DuplicateBlock = DuplicateBlock(
         repo = repo
     )
+
+    @Provides
+    @PerScreen
+    fun provideUpdateTextStyleUseCase(
+        repo: BlockRepository
+    ): UpdateTextStyle = UpdateTextStyle(
+        repo = repo
+    )
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/agileburo/anytype/ui/page/PageFragment.kt b/app/src/main/java/com/agileburo/anytype/ui/page/PageFragment.kt
index e0d97549e3..2e5aa33992 100644
--- a/app/src/main/java/com/agileburo/anytype/ui/page/PageFragment.kt
+++ b/app/src/main/java/com/agileburo/anytype/ui/page/PageFragment.kt
@@ -20,6 +20,7 @@ import com.agileburo.anytype.core_ui.tools.OutsideClickDetector
 import com.agileburo.anytype.core_ui.widgets.toolbar.ActionToolbarWidget.ActionConfig.ACTION_DELETE
 import com.agileburo.anytype.core_ui.widgets.toolbar.ActionToolbarWidget.ActionConfig.ACTION_DUPLICATE
 import com.agileburo.anytype.core_ui.widgets.toolbar.ColorToolbarWidget
+import com.agileburo.anytype.core_ui.widgets.toolbar.OptionToolbarWidget
 import com.agileburo.anytype.core_ui.widgets.toolbar.OptionToolbarWidget.Option
 import com.agileburo.anytype.core_ui.widgets.toolbar.OptionToolbarWidget.OptionConfig.OPTION_LIST_BULLETED_LIST
 import com.agileburo.anytype.core_ui.widgets.toolbar.OptionToolbarWidget.OptionConfig.OPTION_LIST_CHECKBOX
@@ -113,6 +114,11 @@ class PageFragment : NavigationFragment(R.layout.fragment_page) {
             .onEach { vm.onHideKeyboardClicked() }
             .launchIn(lifecycleScope)
 
+        toolbar
+            .turnIntoClicks()
+            .onEach { vm.onTurnIntoToolbarToggleClicked() }
+            .launchIn(lifecycleScope)
+
         toolbar
             .addButtonClicks()
             .onEach { vm.onAddBlockToolbarClicked() }
@@ -151,27 +157,10 @@ class PageFragment : NavigationFragment(R.layout.fragment_page) {
         optionToolbar
             .optionClicks()
             .onEach { option ->
-                when (option) {
-                    is Option.Text -> {
-                        when (option.type) {
-                            OPTION_TEXT_TEXT -> vm.onAddTextBlockClicked(Text.Style.P)
-                            OPTION_TEXT_HEADER_ONE -> vm.onAddTextBlockClicked(Text.Style.H1)
-                            OPTION_TEXT_HEADER_TWO -> vm.onAddTextBlockClicked(Text.Style.H2)
-                            OPTION_TEXT_HEADER_THREE -> vm.onAddTextBlockClicked(Text.Style.H3)
-                            OPTION_TEXT_HIGHLIGHTED -> vm.onAddTextBlockClicked(Text.Style.QUOTE)
-                            OPTION_LIST_BULLETED_LIST -> vm.onAddTextBlockClicked(Text.Style.BULLET)
-                            OPTION_LIST_CHECKBOX -> vm.onAddTextBlockClicked(Text.Style.CHECKBOX)
-                            else -> toast(NOT_IMPLEMENTED_MESSAGE)
-                        }
-                    }
-                    is Option.List -> {
-                        when (option.type) {
-                            OPTION_LIST_BULLETED_LIST -> vm.onAddTextBlockClicked(Text.Style.BULLET)
-                            OPTION_LIST_CHECKBOX -> vm.onAddTextBlockClicked(Text.Style.CHECKBOX)
-                            else -> toast(NOT_IMPLEMENTED_MESSAGE)
-                        }
-                    }
-                }
+                if (optionToolbar.state == OptionToolbarWidget.State.ADD_BLOCK)
+                    handleAddBlockToolbarOptionClicked(option)
+                else if (optionToolbar.state == OptionToolbarWidget.State.TURN_INTO)
+                    handleTurnIntoToolbarOptionClicked(option)
             }
             .launchIn(lifecycleScope)
 
@@ -189,6 +178,50 @@ class PageFragment : NavigationFragment(R.layout.fragment_page) {
         fab.clicks().onEach { toast(NOT_IMPLEMENTED_MESSAGE) }.launchIn(lifecycleScope)
     }
 
+    private fun handleAddBlockToolbarOptionClicked(option: Option) {
+        when (option) {
+            is Option.Text -> {
+                when (option.type) {
+                    OPTION_TEXT_TEXT -> vm.onAddTextBlockClicked(Text.Style.P)
+                    OPTION_TEXT_HEADER_ONE -> vm.onAddTextBlockClicked(Text.Style.H1)
+                    OPTION_TEXT_HEADER_TWO -> vm.onAddTextBlockClicked(Text.Style.H2)
+                    OPTION_TEXT_HEADER_THREE -> vm.onAddTextBlockClicked(Text.Style.H3)
+                    OPTION_TEXT_HIGHLIGHTED -> vm.onAddTextBlockClicked(Text.Style.QUOTE)
+                    else -> toast(NOT_IMPLEMENTED_MESSAGE)
+                }
+            }
+            is Option.List -> {
+                when (option.type) {
+                    OPTION_LIST_BULLETED_LIST -> vm.onAddTextBlockClicked(Text.Style.BULLET)
+                    OPTION_LIST_CHECKBOX -> vm.onAddTextBlockClicked(Text.Style.CHECKBOX)
+                    else -> toast(NOT_IMPLEMENTED_MESSAGE)
+                }
+            }
+        }
+    }
+
+    private fun handleTurnIntoToolbarOptionClicked(option: Option) {
+        when (option) {
+            is Option.Text -> {
+                when (option.type) {
+                    OPTION_TEXT_TEXT -> vm.onTurnIntoStyleClicked(Text.Style.P)
+                    OPTION_TEXT_HEADER_ONE -> vm.onTurnIntoStyleClicked(Text.Style.H1)
+                    OPTION_TEXT_HEADER_TWO -> vm.onTurnIntoStyleClicked(Text.Style.H2)
+                    OPTION_TEXT_HEADER_THREE -> vm.onTurnIntoStyleClicked(Text.Style.H3)
+                    OPTION_TEXT_HIGHLIGHTED -> vm.onTurnIntoStyleClicked(Text.Style.QUOTE)
+                    else -> toast(NOT_IMPLEMENTED_MESSAGE)
+                }
+            }
+            is Option.List -> {
+                when (option.type) {
+                    OPTION_LIST_BULLETED_LIST -> vm.onTurnIntoStyleClicked(Text.Style.BULLET)
+                    OPTION_LIST_CHECKBOX -> vm.onTurnIntoStyleClicked(Text.Style.CHECKBOX)
+                    else -> toast(NOT_IMPLEMENTED_MESSAGE)
+                }
+            }
+        }
+    }
+
     private fun showColorToolbar() {
         colorToolbar.layoutParams = LinearLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT)
         colorToolbar.visible()
@@ -240,6 +273,7 @@ class PageFragment : NavigationFragment(R.layout.fragment_page) {
         Timber.d("Rendering new control panel state:\n$state")
         markupToolbar.setState(state.markupToolbar)
         toolbar.setState(state.blockToolbar)
+        state.focus?.let { toolbar.setTurnIntoTarget(it.type) }
         with(state.colorToolbar) {
             if (isVisible) {
                 hideKeyboard()
@@ -250,15 +284,31 @@ class PageFragment : NavigationFragment(R.layout.fragment_page) {
             } else
                 hideColorToolbar()
         }
-        with(state.addBlockToolbar) {
+        state.addBlockToolbar.apply {
             if (isVisible) {
+                optionToolbar.state = OptionToolbarWidget.State.ADD_BLOCK
                 hideKeyboard()
                 lifecycleScope.launch {
                     delay(300)
                     showOptionToolbar()
                 }
-            } else
-                hideOptionToolbar()
+            } else {
+                if (!state.turnIntoToolbar.isVisible)
+                    hideOptionToolbar()
+            }
+        }
+        state.turnIntoToolbar.apply {
+            if (isVisible) {
+                optionToolbar.state = OptionToolbarWidget.State.TURN_INTO
+                hideKeyboard()
+                lifecycleScope.launch {
+                    delay(300)
+                    optionToolbar.show()
+                }
+            } else {
+                if (!state.addBlockToolbar.isVisible)
+                    hideOptionToolbar()
+            }
         }
         with(state.actionToolbar) {
             if (isVisible) {
diff --git a/core-ui/src/main/java/com/agileburo/anytype/core_ui/features/page/BlockAdapter.kt b/core-ui/src/main/java/com/agileburo/anytype/core_ui/features/page/BlockAdapter.kt
index b03eb9c0f8..7e73de1e1b 100644
--- a/core-ui/src/main/java/com/agileburo/anytype/core_ui/features/page/BlockAdapter.kt
+++ b/core-ui/src/main/java/com/agileburo/anytype/core_ui/features/page/BlockAdapter.kt
@@ -362,13 +362,13 @@ class BlockAdapter(
         if (holder is BlockViewHolder.TextHolder) {
             holder.enableEnterKeyDetector(
                 onEndLineEnterClicked = {
-                    onEndLineEnterClicked(blocks[position].id)
+                    onEndLineEnterClicked(blocks[holder.adapterPosition].id)
                 },
                 onSplitLineEnterClicked = {
-                    onSplitLineEnterClicked(blocks[position].id)
+                    onSplitLineEnterClicked(blocks[holder.adapterPosition].id)
                 }
             )
-            holder.enableBackspaceDetector { onEmptyBlockBackspaceClicked(blocks[position].id) }
+            holder.enableBackspaceDetector { onEmptyBlockBackspaceClicked(blocks[holder.adapterPosition].id) }
         }
     }
 
@@ -382,6 +382,7 @@ class BlockAdapter(
         }
     }
 
+
     @Deprecated(
         level = DeprecationLevel.WARNING,
         message = "Consider RecyclerView's AsyncListDiffer instead. Or implement it with Kotlin coroutines."
diff --git a/core-ui/src/main/java/com/agileburo/anytype/core_ui/features/page/BlockViewHolder.kt b/core-ui/src/main/java/com/agileburo/anytype/core_ui/features/page/BlockViewHolder.kt
index 328003db79..f5b51a2e3b 100644
--- a/core-ui/src/main/java/com/agileburo/anytype/core_ui/features/page/BlockViewHolder.kt
+++ b/core-ui/src/main/java/com/agileburo/anytype/core_ui/features/page/BlockViewHolder.kt
@@ -76,6 +76,7 @@ sealed class BlockViewHolder(view: View) : RecyclerView.ViewHolder(view) {
                 BackspaceKeyDetector {
                     if (content.text.toString().isEmpty()) {
                         content.clearTextWatchers()
+                        content.setOnKeyListener(null)
                         onEmptyBlockBackspaceClicked()
                     }
                 }
diff --git a/core-ui/src/main/java/com/agileburo/anytype/core_ui/state/ControlPanelState.kt b/core-ui/src/main/java/com/agileburo/anytype/core_ui/state/ControlPanelState.kt
index 3c02b62167..a860701d73 100644
--- a/core-ui/src/main/java/com/agileburo/anytype/core_ui/state/ControlPanelState.kt
+++ b/core-ui/src/main/java/com/agileburo/anytype/core_ui/state/ControlPanelState.kt
@@ -9,10 +9,12 @@ package com.agileburo.anytype.core_ui.state
  * @property colorToolbar color toolbar state
  * @property addBlockToolbar add-block toolbar state
  * @property actionToolbar action-toolbar state
+ * @property turnIntoToolbar turn-into tolbar state
  */
 data class ControlPanelState(
     val focus: Focus? = null,
     val blockToolbar: Toolbar.Block,
+    val turnIntoToolbar: Toolbar.TurnInto,
     val markupToolbar: Toolbar.Markup,
     val colorToolbar: Toolbar.Color,
     val addBlockToolbar: Toolbar.AddBlock,
@@ -79,18 +81,25 @@ data class ControlPanelState(
         ) : Toolbar()
 
         /**
-         * TODO
+         * Turn-into (converting one block into another) toolbar state.
          */
         data class TurnInto(
-            val isVisible: Boolean
-        )
+            override val isVisible: Boolean
+        ) : Toolbar()
     }
 
     /**
      * Block currently associated with this panel.
      * @property id id of the focused block
      */
-    data class Focus(val id: String)
+    data class Focus(
+        val id: String,
+        val type: Type
+    ) {
+        enum class Type {
+            P, H1, H2, H3, H4, TITLE, QUOTE, CODE_SNIPPET, BULLET, NUMBERED, TOGGLE, CHECKBOX
+        }
+    }
 
     companion object {
 
@@ -106,6 +115,9 @@ data class ControlPanelState(
                 isVisible = false,
                 selectedAction = null
             ),
+            turnIntoToolbar = Toolbar.TurnInto(
+                isVisible = false
+            ),
             colorToolbar = Toolbar.Color(
                 isVisible = false
             ),
diff --git a/core-ui/src/main/java/com/agileburo/anytype/core_ui/widgets/toolbar/BlockToolbarWidget.kt b/core-ui/src/main/java/com/agileburo/anytype/core_ui/widgets/toolbar/BlockToolbarWidget.kt
index 06f9ef556e..ef5b3dd6c1 100644
--- a/core-ui/src/main/java/com/agileburo/anytype/core_ui/widgets/toolbar/BlockToolbarWidget.kt
+++ b/core-ui/src/main/java/com/agileburo/anytype/core_ui/widgets/toolbar/BlockToolbarWidget.kt
@@ -5,12 +5,13 @@ import android.util.AttributeSet
 import android.view.LayoutInflater
 import androidx.constraintlayout.widget.ConstraintLayout
 import com.agileburo.anytype.core_ui.R
+import com.agileburo.anytype.core_ui.extensions.color
 import com.agileburo.anytype.core_ui.extensions.invisible
 import com.agileburo.anytype.core_ui.extensions.visible
 import com.agileburo.anytype.core_ui.reactive.clicks
 import com.agileburo.anytype.core_ui.state.ControlPanelState
-import com.agileburo.anytype.core_ui.state.ControlPanelState.Toolbar.Block.Action.ADD
-import com.agileburo.anytype.core_ui.state.ControlPanelState.Toolbar.Block.Action.BLOCK_ACTION
+import com.agileburo.anytype.core_ui.state.ControlPanelState.Focus
+import com.agileburo.anytype.core_ui.state.ControlPanelState.Toolbar.Block.Action.*
 import kotlinx.android.synthetic.main.widget_block_toolbar.view.*
 
 class BlockToolbarWidget : ConstraintLayout {
@@ -39,10 +40,48 @@ class BlockToolbarWidget : ConstraintLayout {
     fun keyboardClicks() = keyboard.clicks()
     fun addButtonClicks() = add.clicks()
     fun actionClicks() = actions.clicks()
+    fun turnIntoClicks() = turnIntoToggle.clicks()
 
     fun setState(state: ControlPanelState.Toolbar.Block) {
         if (state.isVisible) visible() else invisible()
         add.isSelected = state.selectedAction == ADD
         actions.isSelected = state.selectedAction == BLOCK_ACTION
+        turnIntoToggle.isSelected = state.selectedAction == TURN_INTO
+        arrow.isSelected = state.selectedAction == TURN_INTO
+    }
+
+    fun setTurnIntoTarget(
+        target: Focus.Type
+    ) {
+        when (target) {
+            Focus.Type.P -> {
+                turnIntoToggle.setImageResource(R.drawable.ic_block_toolbar_turn_into_paragraph)
+            }
+            Focus.Type.H1 -> {
+                turnIntoToggle.setImageResource(R.drawable.ic_block_toolbar_turn_into_header_one)
+            }
+            Focus.Type.H2 -> {
+                turnIntoToggle.setImageResource(R.drawable.ic_block_toolbar_turn_into_header_two)
+            }
+            Focus.Type.H3 -> {
+                turnIntoToggle.setImageResource(R.drawable.ic_block_toolbar_turn_into_header_three)
+            }
+            Focus.Type.CHECKBOX -> {
+                turnIntoToggle.setImageResource(R.drawable.ic_block_toolbar_turn_into_checkbox)
+            }
+            Focus.Type.BULLET -> {
+                turnIntoToggle.setImageResource(R.drawable.ic_block_toolbar_turn_into_bulleted)
+            }
+            Focus.Type.QUOTE -> {
+                turnIntoToggle.setImageResource(R.drawable.ic_block_toolbar_turn_into_highlight)
+            }
+        }
+
+        val color = if (turnIntoToggle.isSelected)
+            context.color(R.color.toolbar_block_turn_into_toggle_selected)
+        else
+            context.color(R.color.toolbar_block_turn_into_toggle_default)
+
+        turnIntoToggle.setColorFilter(color)
     }
 }
\ No newline at end of file
diff --git a/core-ui/src/main/java/com/agileburo/anytype/core_ui/widgets/toolbar/OptionToolbarWidget.kt b/core-ui/src/main/java/com/agileburo/anytype/core_ui/widgets/toolbar/OptionToolbarWidget.kt
index cf069a0187..bcc8c95dcd 100644
--- a/core-ui/src/main/java/com/agileburo/anytype/core_ui/widgets/toolbar/OptionToolbarWidget.kt
+++ b/core-ui/src/main/java/com/agileburo/anytype/core_ui/widgets/toolbar/OptionToolbarWidget.kt
@@ -13,6 +13,8 @@ import com.agileburo.anytype.core_ui.R
 import com.agileburo.anytype.core_ui.common.ViewType
 import com.agileburo.anytype.core_ui.extensions.color
 import com.agileburo.anytype.core_ui.extensions.drawable
+import com.agileburo.anytype.core_ui.extensions.invisible
+import com.agileburo.anytype.core_ui.extensions.visible
 import com.agileburo.anytype.core_ui.layout.SpacingItemDecoration
 import com.agileburo.anytype.core_ui.widgets.toolbar.OptionToolbarWidget.*
 import com.agileburo.anytype.core_ui.widgets.toolbar.OptionToolbarWidget.OptionAdapter.Companion.LIST_TYPE
@@ -51,6 +53,7 @@ import kotlinx.android.synthetic.main.widget_bottom_detail_toolbar.view.*
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.channels.sendBlocking
 import kotlinx.coroutines.flow.consumeAsFlow
+import kotlin.properties.Delegates
 
 /**
  * This toolbar widget provides user with different types of options
@@ -63,6 +66,21 @@ import kotlinx.coroutines.flow.consumeAsFlow
  */
 class OptionToolbarWidget : LinearLayout {
 
+    var state: State by Delegates.observable(State.INIT) { _, old, new ->
+        if (new != old)
+            when (new) {
+                State.TURN_INTO -> {
+                    header.setText(R.string.option_toolbar_header_turn_into)
+                }
+                State.ADD_BLOCK -> {
+                    header.setText(R.string.option_toolbar_header_add_block)
+                }
+                State.INIT -> {
+                    header.text = ""
+                }
+            }
+    }
+
     private val channel = Channel<Option>()
 
     constructor(
@@ -81,7 +99,6 @@ class OptionToolbarWidget : LinearLayout {
     ) : super(context, attrs, defStyleAttr) {
         setup()
         setupRecycler()
-        header.text = "Add block"
     }
 
     private fun setup() {
@@ -90,6 +107,21 @@ class OptionToolbarWidget : LinearLayout {
         setBackgroundResource(R.color.default_bottom_detail_toolbar_background_color)
     }
 
+    fun show() {
+        if (visibility != View.VISIBLE) {
+            layoutParams = LayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT,
+                ViewGroup.LayoutParams.WRAP_CONTENT
+            )
+            visible()
+        }
+    }
+
+    fun hide() {
+        layoutParams = LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 0)
+        invisible()
+    }
+
     private fun setupRecycler() {
 
         val options = listOf(
@@ -738,5 +770,7 @@ class OptionToolbarWidget : LinearLayout {
         const val SECTION_OTHER = 4
     }
 
+    enum class State { INIT, TURN_INTO, ADD_BLOCK }
+
     fun optionClicks() = channel.consumeAsFlow()
 }
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/ic_block_toolbar_turn_into_arrow.xml b/core-ui/src/main/res/drawable/ic_block_toolbar_turn_into_arrow.xml
new file mode 100644
index 0000000000..6d92b75102
--- /dev/null
+++ b/core-ui/src/main/res/drawable/ic_block_toolbar_turn_into_arrow.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="8dp"
+    android:height="8dp"
+    android:viewportWidth="8"
+    android:viewportHeight="8">
+    <path
+        android:fillColor="#ACA996"
+        android:fillType="evenOdd"
+        android:pathData="M0.21967,2.21967C0.51256,1.92678 0.98744,1.92678 1.28033,2.21967L3.89393,4.83327C3.95251,4.89185 4.04749,4.89185 4.10607,4.83327L6.71967,2.21967C7.01256,1.92678 7.48744,1.92678 7.78033,2.21967C8.07322,2.51256 8.07322,2.98744 7.78033,3.28033L4.10607,6.95459C4.04749,7.01317 3.95251,7.01317 3.89393,6.95459L0.21967,3.28033C-0.07322,2.98744 -0.07322,2.51256 0.21967,2.21967Z" />
+</vector>
diff --git a/core-ui/src/main/res/drawable/ic_block_toolbar_turn_into_arrow_selected.xml b/core-ui/src/main/res/drawable/ic_block_toolbar_turn_into_arrow_selected.xml
new file mode 100644
index 0000000000..ef4b8e0f6f
--- /dev/null
+++ b/core-ui/src/main/res/drawable/ic_block_toolbar_turn_into_arrow_selected.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="8dp"
+    android:height="8dp"
+    android:viewportWidth="8"
+    android:viewportHeight="8">
+    <path
+        android:fillColor="#2C2B27"
+        android:fillType="evenOdd"
+        android:pathData="M0.21967,2.21967C0.51256,1.92678 0.98744,1.92678 1.28033,2.21967L3.89393,4.83327C3.95251,4.89185 4.04749,4.89185 4.10607,4.83327L6.71967,2.21967C7.01256,1.92678 7.48744,1.92678 7.78033,2.21967C8.07322,2.51256 8.07322,2.98744 7.78033,3.28033L4.10607,6.95459C4.04749,7.01317 3.95251,7.01317 3.89393,6.95459L0.21967,3.28033C-0.07322,2.98744 -0.07322,2.51256 0.21967,2.21967Z" />
+</vector>
diff --git a/core-ui/src/main/res/drawable/ic_block_toolbar_turn_into_arrow_selector.xml b/core-ui/src/main/res/drawable/ic_block_toolbar_turn_into_arrow_selector.xml
new file mode 100644
index 0000000000..d084f72b57
--- /dev/null
+++ b/core-ui/src/main/res/drawable/ic_block_toolbar_turn_into_arrow_selector.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/ic_block_toolbar_turn_into_arrow" android:state_selected="false" />
+    <item android:drawable="@drawable/ic_block_toolbar_turn_into_arrow_selected" android:state_selected="true" />
+</selector>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/ic_block_toolbar_turn_into_bulleted.xml b/core-ui/src/main/res/drawable/ic_block_toolbar_turn_into_bulleted.xml
new file mode 100644
index 0000000000..02a0ad105d
--- /dev/null
+++ b/core-ui/src/main/res/drawable/ic_block_toolbar_turn_into_bulleted.xml
@@ -0,0 +1,24 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#ACA996"
+        android:pathData="M8.9158,4.978h12v2h-12z" />
+    <path
+        android:fillColor="#ACA996"
+        android:pathData="M8.9158,10.978h12v2h-12z" />
+    <path
+        android:fillColor="#ACA996"
+        android:pathData="M8.9158,16.978h12v2h-12z" />
+    <path
+        android:fillColor="#ACA996"
+        android:pathData="M5.0403,13.978C6.1448,13.978 7.0403,13.0826 7.0403,11.978C7.0403,10.8735 6.1448,9.978 5.0403,9.978C3.9357,9.978 3.0403,10.8735 3.0403,11.978C3.0403,13.0826 3.9357,13.978 5.0403,13.978Z" />
+    <path
+        android:fillColor="#ACA996"
+        android:pathData="M5.0403,19.978C6.1448,19.978 7.0403,19.0826 7.0403,17.978C7.0403,16.8735 6.1448,15.978 5.0403,15.978C3.9357,15.978 3.0403,16.8735 3.0403,17.978C3.0403,19.0826 3.9357,19.978 5.0403,19.978Z" />
+    <path
+        android:fillColor="#ACA996"
+        android:pathData="M5.0403,7.978C6.1448,7.978 7.0403,7.0826 7.0403,5.978C7.0403,4.8735 6.1448,3.978 5.0403,3.978C3.9357,3.978 3.0403,4.8735 3.0403,5.978C3.0403,7.0826 3.9357,7.978 5.0403,7.978Z" />
+</vector>
diff --git a/core-ui/src/main/res/drawable/ic_block_toolbar_turn_into_checkbox.xml b/core-ui/src/main/res/drawable/ic_block_toolbar_turn_into_checkbox.xml
new file mode 100644
index 0000000000..dd83270386
--- /dev/null
+++ b/core-ui/src/main/res/drawable/ic_block_toolbar_turn_into_checkbox.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFB522"
+        android:fillType="evenOdd"
+        android:pathData="M16.9572,9.4572L10.5001,15.9143L7.043,12.4572L8.4572,11.043L10.5001,13.0859L15.543,8.043L16.9572,9.4572Z" />
+    <path
+        android:fillColor="#FFB522"
+        android:fillType="evenOdd"
+        android:pathData="M12,21C16.9706,21 21,16.9706 21,12C21,7.0294 16.9706,3 12,3C7.0294,3 3,7.0294 3,12C3,16.9706 7.0294,21 12,21ZM12,23C18.0751,23 23,18.0751 23,12C23,5.9249 18.0751,1 12,1C5.9249,1 1,5.9249 1,12C1,18.0751 5.9249,23 12,23Z" />
+</vector>
diff --git a/core-ui/src/main/res/drawable/ic_block_toolbar_turn_into_header_one.xml b/core-ui/src/main/res/drawable/ic_block_toolbar_turn_into_header_one.xml
new file mode 100644
index 0000000000..b4a8a960cd
--- /dev/null
+++ b/core-ui/src/main/res/drawable/ic_block_toolbar_turn_into_header_one.xml
@@ -0,0 +1,19 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#ECD91B"
+        android:fillType="evenOdd"
+        android:pathData="M19.8893,12.2378L18,13.5664V11.6364L20.1498,10H22V20H19.8893V12.2378Z" />
+    <path
+        android:fillColor="#ECD91B"
+        android:pathData="M3,10H13V12.5H3V10Z" />
+    <path
+        android:fillColor="#ECD91B"
+        android:pathData="M2,4h3.3v16h-3.3z" />
+    <path
+        android:fillColor="#ECD91B"
+        android:pathData="M14.9952,4H11.7V20H14.9952V4Z" />
+</vector>
diff --git a/core-ui/src/main/res/drawable/ic_block_toolbar_turn_into_header_three.xml b/core-ui/src/main/res/drawable/ic_block_toolbar_turn_into_header_three.xml
new file mode 100644
index 0000000000..72e0cfd17c
--- /dev/null
+++ b/core-ui/src/main/res/drawable/ic_block_toolbar_turn_into_header_three.xml
@@ -0,0 +1,19 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#ECD91B"
+        android:pathData="M4,11h6v2h-6z" />
+    <path
+        android:fillColor="#ECD91B"
+        android:pathData="M3,6h2.5v12h-2.5z" />
+    <path
+        android:fillColor="#ECD91B"
+        android:pathData="M10,6h2.5v12h-2.5z" />
+    <path
+        android:fillColor="#ECD91B"
+        android:fillType="evenOdd"
+        android:pathData="M18.0233,18C15.5437,18 14.3107,16.7399 14.2158,14.7752H16.1941C16.2889,15.7101 16.7632,16.3876 17.942,16.3876C19.0395,16.3876 19.5544,15.8592 19.5544,14.992C19.5544,14.0571 19.0395,13.5964 17.9962,13.5964H17.2374V12.133H17.942C18.9717,12.133 19.4189,11.6723 19.4189,10.8458C19.4189,10.1548 18.9853,9.6399 18.0775,9.6399C17.1561,9.6399 16.587,10.1819 16.4786,11.1032H14.541C14.5952,10.2225 14.934,9.4502 15.5437,8.8946C16.1399,8.3527 17.0206,8.0275 18.1181,8.0275C19.1885,8.0275 20.0151,8.2985 20.5977,8.7727C21.1803,9.2469 21.492,9.8973 21.492,10.6561C21.492,11.7401 20.8687,12.4175 19.8931,12.7563C21.0313,13.0137 21.7765,13.7861 21.7765,15.0326C21.7765,16.8618 20.3945,18 18.0233,18Z" />
+</vector>
diff --git a/core-ui/src/main/res/drawable/ic_block_toolbar_turn_into_header_two.xml b/core-ui/src/main/res/drawable/ic_block_toolbar_turn_into_header_two.xml
new file mode 100644
index 0000000000..d7cd5f0f9a
--- /dev/null
+++ b/core-ui/src/main/res/drawable/ic_block_toolbar_turn_into_header_two.xml
@@ -0,0 +1,19 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#ECD91B"
+        android:fillType="evenOdd"
+        android:pathData="M15,18.6414L18.3963,14.8207C19.2907,13.8138 19.8611,12.9448 19.8611,12.0483C19.8611,11.2207 19.4463,10.7103 18.6296,10.7103C17.8,10.7103 17.2944,11.2069 17.1519,12.5172H15.2463C15.35,10.2138 16.6333,9 18.7204,9C19.7444,9 20.5481,9.3172 21.1056,9.8276C21.637,10.3655 21.9352,11.1103 21.9352,11.9931C21.9352,13.3034 21.2222,14.3793 20.1463,15.4828L18.3963,17.3034H22V19H15V18.6414Z" />
+    <path
+        android:fillColor="#ECD91B"
+        android:pathData="M4,10.6h8v2.4h-8z" />
+    <path
+        android:fillColor="#ECD91B"
+        android:pathData="M2,5h2.9v14h-2.9z" />
+    <path
+        android:fillColor="#ECD91B"
+        android:pathData="M10.1404,5h2.9v14h-2.9z" />
+</vector>
diff --git a/core-ui/src/main/res/drawable/ic_block_toolbar_turn_into_highlight.xml b/core-ui/src/main/res/drawable/ic_block_toolbar_turn_into_highlight.xml
new file mode 100644
index 0000000000..f55c8ad870
--- /dev/null
+++ b/core-ui/src/main/res/drawable/ic_block_toolbar_turn_into_highlight.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#ECD91B"
+        android:pathData="M8,5h12v2h-12z" />
+    <path
+        android:fillColor="#ECD91B"
+        android:pathData="M8,11h12v2h-12z" />
+    <path
+        android:fillColor="#ECD91B"
+        android:pathData="M8,17h12v2h-12z" />
+    <path
+        android:fillColor="#ECD91B"
+        android:pathData="M3,3h1v18h-1z" />
+</vector>
diff --git a/core-ui/src/main/res/drawable/ic_block_toolbar_turn_into_numbered.xml b/core-ui/src/main/res/drawable/ic_block_toolbar_turn_into_numbered.xml
new file mode 100644
index 0000000000..454005b2a4
--- /dev/null
+++ b/core-ui/src/main/res/drawable/ic_block_toolbar_turn_into_numbered.xml
@@ -0,0 +1,23 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFB522"
+        android:fillType="evenOdd"
+        android:pathData="M3.0403,20.8354L5.265,18.4833C5.8509,17.8634 6.2245,17.3284 6.2245,16.7765C6.2245,16.267 5.9528,15.9528 5.4179,15.9528C4.8744,15.9528 4.5433,16.2585 4.4499,17.0652H3.2016C3.2696,15.6471 4.1102,14.8999 5.4773,14.8999C6.1481,14.8999 6.6746,15.0952 7.0397,15.4094C7.3879,15.7405 7.5832,16.1991 7.5832,16.7425C7.5832,17.5492 7.1161,18.2115 6.4114,18.8909L5.265,20.0117H7.6256V21.0562H3.0403V20.8354Z" />
+    <path
+        android:fillColor="#FFB522"
+        android:pathData="M10.0525,4.978h11.9688v2h-11.9688z" />
+    <path
+        android:fillColor="#FFB522"
+        android:pathData="M10.0525,16.978h11.9688v2h-11.9688z" />
+    <path
+        android:fillColor="#FFB522"
+        android:pathData="M10.0525,10.978h9v2h-9z" />
+    <path
+        android:fillColor="#FFB522"
+        android:fillType="evenOdd"
+        android:pathData="M4.9582,4.3164L3.7383,5.1157V3.9546L5.1265,2.9702H6.3212V8.9858H4.9582V4.3164Z" />
+</vector>
diff --git a/core-ui/src/main/res/drawable/ic_block_toolbar_turn_into_paragraph.xml b/core-ui/src/main/res/drawable/ic_block_toolbar_turn_into_paragraph.xml
new file mode 100644
index 0000000000..3aeb7cbeb6
--- /dev/null
+++ b/core-ui/src/main/res/drawable/ic_block_toolbar_turn_into_paragraph.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#ACA996"
+        android:fillType="evenOdd"
+        android:pathData="M18.125,4H6.125V5.6976H11.125V20H13.125V5.6976H18.125V4Z" />
+</vector>
diff --git a/core-ui/src/main/res/drawable/ic_block_toolbar_turn_into_paragraph_selected.xml b/core-ui/src/main/res/drawable/ic_block_toolbar_turn_into_paragraph_selected.xml
new file mode 100644
index 0000000000..c718669334
--- /dev/null
+++ b/core-ui/src/main/res/drawable/ic_block_toolbar_turn_into_paragraph_selected.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#2C2B27"
+        android:fillType="evenOdd"
+        android:pathData="M18.125,4H6.125V5.6976H11.125V20H13.125V5.6976H18.125V4Z" />
+</vector>
diff --git a/core-ui/src/main/res/layout/widget_block_toolbar.xml b/core-ui/src/main/res/layout/widget_block_toolbar.xml
index 5c7a1f4c09..76b0fddf30 100644
--- a/core-ui/src/main/res/layout/widget_block_toolbar.xml
+++ b/core-ui/src/main/res/layout/widget_block_toolbar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/main"
     android:layout_width="match_parent"
@@ -19,6 +19,26 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <ImageView
+        android:id="@+id/turnIntoToggle"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_marginStart="16dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/add"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ImageView
+        android:id="@+id/arrow"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="2dp"
+        android:background="@drawable/ic_block_toolbar_turn_into_arrow_selector"
+        android:contentDescription="@string/content_description_turn_into_arrow"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/turnIntoToggle"
+        app:layout_constraintTop_toTopOf="parent" />
+
     <ImageView
         android:id="@+id/keyboard"
         android:layout_width="wrap_content"
@@ -61,4 +81,4 @@
         app:layout_constraintEnd_toStartOf="@+id/actions"
         app:layout_constraintTop_toTopOf="parent" />
 
-</merge>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/core-ui/src/main/res/values/colors.xml b/core-ui/src/main/res/values/colors.xml
index ae84086818..bdeda845e8 100644
--- a/core-ui/src/main/res/values/colors.xml
+++ b/core-ui/src/main/res/values/colors.xml
@@ -10,6 +10,9 @@
     <color name="chapter_yellow">#ECD91B</color>
     <color name="default_toolbar_option_stroke_color">#DFDDD0</color>
 
+    <color name="toolbar_block_turn_into_toggle_selected">#2C2B27</color>
+    <color name="toolbar_block_turn_into_toggle_default">#ACA996</color>
+
     <color name="toolbar_section_text">#ECD91B</color>
     <color name="toolbar_section_list">#FFB522</color>
     <color name="toolbar_section_tool">#2AA7EE</color>
diff --git a/core-ui/src/main/res/values/strings.xml b/core-ui/src/main/res/values/strings.xml
index 57e807c946..3c071d43e7 100644
--- a/core-ui/src/main/res/values/strings.xml
+++ b/core-ui/src/main/res/values/strings.xml
@@ -22,7 +22,10 @@
     <string name="content_description_avatar_image">Avatar image</string>
     <string name="content_description_bookmark_image">Bookmark image</string>
     <string name="content_description_toggle_icon">Toggle icon</string>
+    <string name="content_description_turn_into_arrow">Turn into arrow</string>
 
+    <string name="option_toolbar_header_turn_into">Turn into</string>
+    <string name="option_toolbar_header_add_block">Add block</string>
     <string name="option_text_text">Text</string>
     <string name="option_text_header_one">Header 1</string>
     <string name="option_text_header_two">Header 2</string>
diff --git a/data/src/main/java/com/agileburo/anytype/data/auth/mapper/MapperExtension.kt b/data/src/main/java/com/agileburo/anytype/data/auth/mapper/MapperExtension.kt
index 6050c46470..b52a95813c 100644
--- a/data/src/main/java/com/agileburo/anytype/data/auth/mapper/MapperExtension.kt
+++ b/data/src/main/java/com/agileburo/anytype/data/auth/mapper/MapperExtension.kt
@@ -194,6 +194,12 @@ fun Command.UpdateText.toEntity(): CommandEntity.UpdateText {
     )
 }
 
+fun Command.UpdateStyle.toEntity(): CommandEntity.UpdateStyle = CommandEntity.UpdateStyle(
+    context = context,
+    target = target,
+    style = BlockEntity.Content.Text.Style.valueOf(style.name)
+)
+
 fun Command.UpdateCheckbox.toEntity(): CommandEntity.UpdateCheckbox = CommandEntity.UpdateCheckbox(
     context = context,
     target = target,
@@ -264,6 +270,16 @@ fun EventEntity.toDomain(): Event {
                 target = target
             )
         }
+        is EventEntity.Command.GranularChange -> {
+            Event.Command.GranularChange(
+                id = id,
+                text = text,
+                style = if (style != null)
+                    Block.Content.Text.Style.valueOf(style.name)
+                else
+                    null
+            )
+        }
     }
 }
 
diff --git a/data/src/main/java/com/agileburo/anytype/data/auth/model/CommandEntity.kt b/data/src/main/java/com/agileburo/anytype/data/auth/model/CommandEntity.kt
index b2a65f9799..9f2b7a86bb 100644
--- a/data/src/main/java/com/agileburo/anytype/data/auth/model/CommandEntity.kt
+++ b/data/src/main/java/com/agileburo/anytype/data/auth/model/CommandEntity.kt
@@ -12,6 +12,12 @@ class CommandEntity {
         val marks: List<BlockEntity.Content.Text.Mark>
     )
 
+    data class UpdateStyle(
+        val context: String,
+        val target: String,
+        val style: BlockEntity.Content.Text.Style
+    )
+
     class UpdateCheckbox(
         val context: String,
         val target: String,
diff --git a/data/src/main/java/com/agileburo/anytype/data/auth/model/EventEntity.kt b/data/src/main/java/com/agileburo/anytype/data/auth/model/EventEntity.kt
index 8ba95df189..ea4d120a1e 100644
--- a/data/src/main/java/com/agileburo/anytype/data/auth/model/EventEntity.kt
+++ b/data/src/main/java/com/agileburo/anytype/data/auth/model/EventEntity.kt
@@ -18,6 +18,12 @@ sealed class EventEntity {
             val text: String
         ) : Command()
 
+        data class GranularChange(
+            val id: String,
+            val text: String? = null,
+            val style: BlockEntity.Content.Text.Style? = null
+        ) : Command()
+
         data class UpdateStructure(
             val context: String,
             val id: String,
diff --git a/data/src/main/java/com/agileburo/anytype/data/auth/repo/block/BlockDataRepository.kt b/data/src/main/java/com/agileburo/anytype/data/auth/repo/block/BlockDataRepository.kt
index 616b86c171..a8e64e5b7a 100644
--- a/data/src/main/java/com/agileburo/anytype/data/auth/repo/block/BlockDataRepository.kt
+++ b/data/src/main/java/com/agileburo/anytype/data/auth/repo/block/BlockDataRepository.kt
@@ -41,6 +41,10 @@ class BlockDataRepository(
         factory.remote.updateText(command.toEntity())
     }
 
+    override suspend fun updateTextStyle(command: Command.UpdateStyle) {
+        factory.remote.updateTextStyle(command.toEntity())
+    }
+
     override suspend fun updateCheckbox(command: Command.UpdateCheckbox) {
         factory.remote.updateCheckbox(command.toEntity())
     }
diff --git a/data/src/main/java/com/agileburo/anytype/data/auth/repo/block/BlockDataStore.kt b/data/src/main/java/com/agileburo/anytype/data/auth/repo/block/BlockDataStore.kt
index fb57b17050..306361595d 100644
--- a/data/src/main/java/com/agileburo/anytype/data/auth/repo/block/BlockDataStore.kt
+++ b/data/src/main/java/com/agileburo/anytype/data/auth/repo/block/BlockDataStore.kt
@@ -10,6 +10,7 @@ import kotlinx.coroutines.flow.Flow
 interface BlockDataStore {
     suspend fun create(command: CommandEntity.Create)
     suspend fun updateText(command: CommandEntity.UpdateText)
+    suspend fun updateTextStyle(command: CommandEntity.UpdateStyle)
     suspend fun updateCheckbox(command: CommandEntity.UpdateCheckbox)
     suspend fun dnd(command: CommandEntity.Dnd)
     suspend fun duplicate(command: CommandEntity.Duplicate): Id
diff --git a/data/src/main/java/com/agileburo/anytype/data/auth/repo/block/BlockRemote.kt b/data/src/main/java/com/agileburo/anytype/data/auth/repo/block/BlockRemote.kt
index 41e65f21ae..c42398a8b1 100644
--- a/data/src/main/java/com/agileburo/anytype/data/auth/repo/block/BlockRemote.kt
+++ b/data/src/main/java/com/agileburo/anytype/data/auth/repo/block/BlockRemote.kt
@@ -10,6 +10,7 @@ import kotlinx.coroutines.flow.Flow
 interface BlockRemote {
     suspend fun create(command: CommandEntity.Create)
     suspend fun updateText(command: CommandEntity.UpdateText)
+    suspend fun updateTextStyle(command: CommandEntity.UpdateStyle)
     suspend fun updateCheckbox(command: CommandEntity.UpdateCheckbox)
     suspend fun dnd(command: CommandEntity.Dnd)
     suspend fun duplicate(command: CommandEntity.Duplicate): Id
diff --git a/data/src/main/java/com/agileburo/anytype/data/auth/repo/block/BlockRemoteDataStore.kt b/data/src/main/java/com/agileburo/anytype/data/auth/repo/block/BlockRemoteDataStore.kt
index 84f4e3ab43..11722a8cba 100644
--- a/data/src/main/java/com/agileburo/anytype/data/auth/repo/block/BlockRemoteDataStore.kt
+++ b/data/src/main/java/com/agileburo/anytype/data/auth/repo/block/BlockRemoteDataStore.kt
@@ -31,6 +31,10 @@ class BlockRemoteDataStore(private val remote: BlockRemote) : BlockDataStore {
         remote.updateText(command)
     }
 
+    override suspend fun updateTextStyle(command: CommandEntity.UpdateStyle) {
+        remote.updateTextStyle(command)
+    }
+
     override suspend fun updateCheckbox(command: CommandEntity.UpdateCheckbox) {
         remote.updateCheckbox(command)
     }
diff --git a/domain/src/main/java/com/agileburo/anytype/domain/block/interactor/UpdateTextStyle.kt b/domain/src/main/java/com/agileburo/anytype/domain/block/interactor/UpdateTextStyle.kt
new file mode 100644
index 0000000000..367d872816
--- /dev/null
+++ b/domain/src/main/java/com/agileburo/anytype/domain/block/interactor/UpdateTextStyle.kt
@@ -0,0 +1,41 @@
+package com.agileburo.anytype.domain.block.interactor
+
+import com.agileburo.anytype.domain.base.BaseUseCase
+import com.agileburo.anytype.domain.base.Either
+import com.agileburo.anytype.domain.block.model.Block.Content.Text
+import com.agileburo.anytype.domain.block.model.Command
+import com.agileburo.anytype.domain.block.repo.BlockRepository
+import com.agileburo.anytype.domain.common.Id
+
+/**
+ * Use-case for udpating a block's text style
+ */
+class UpdateTextStyle(
+    private val repo: BlockRepository
+) : BaseUseCase<Unit, UpdateTextStyle.Params>() {
+
+    override suspend fun run(params: Params) = try {
+        repo.updateTextStyle(
+            command = Command.UpdateStyle(
+                style = params.style,
+                context = params.context,
+                target = params.target
+            )
+        ).let {
+            Either.Right(it)
+        }
+    } catch (t: Throwable) {
+        Either.Left(t)
+    }
+
+    /**
+     * @property context context id
+     * @property target id of the target block, whose style we need to update.
+     * @property style new style for the target block.
+     */
+    data class Params(
+        val context: Id,
+        val target: Id,
+        val style: Text.Style
+    )
+}
\ No newline at end of file
diff --git a/domain/src/main/java/com/agileburo/anytype/domain/block/model/Command.kt b/domain/src/main/java/com/agileburo/anytype/domain/block/model/Command.kt
index c4badb3b43..90892c6a39 100644
--- a/domain/src/main/java/com/agileburo/anytype/domain/block/model/Command.kt
+++ b/domain/src/main/java/com/agileburo/anytype/domain/block/model/Command.kt
@@ -28,6 +28,18 @@ sealed class Command {
         val isChecked: Boolean
     )
 
+    /**
+     * Command for updating style for one textual block.
+     * @property context context id
+     * @property target id of the target block, whose style we need to update.
+     * @property style new style for the target block.
+     */
+    data class UpdateStyle(
+        val context: Id,
+        val target: Id,
+        val style: Block.Content.Text.Style
+    )
+
     /**
      * Command for creating a block
      * @property contextId id of the context of the block (i.e. page, dashboard or something else)
diff --git a/domain/src/main/java/com/agileburo/anytype/domain/block/repo/BlockRepository.kt b/domain/src/main/java/com/agileburo/anytype/domain/block/repo/BlockRepository.kt
index be2d38e58b..0ef6d1666d 100644
--- a/domain/src/main/java/com/agileburo/anytype/domain/block/repo/BlockRepository.kt
+++ b/domain/src/main/java/com/agileburo/anytype/domain/block/repo/BlockRepository.kt
@@ -13,6 +13,7 @@ interface BlockRepository {
     suspend fun unlink(command: Command.Unlink)
     suspend fun create(command: Command.Create)
     suspend fun updateText(command: Command.UpdateText)
+    suspend fun updateTextStyle(command: Command.UpdateStyle)
     suspend fun updateCheckbox(command: Command.UpdateCheckbox)
     suspend fun getConfig(): Config
     suspend fun createPage(parentId: String): Id
diff --git a/domain/src/main/java/com/agileburo/anytype/domain/event/model/Event.kt b/domain/src/main/java/com/agileburo/anytype/domain/event/model/Event.kt
index 59c23a63df..a86f32e56b 100644
--- a/domain/src/main/java/com/agileburo/anytype/domain/event/model/Event.kt
+++ b/domain/src/main/java/com/agileburo/anytype/domain/event/model/Event.kt
@@ -1,6 +1,7 @@
 package com.agileburo.anytype.domain.event.model
 
 import com.agileburo.anytype.domain.block.model.Block
+import com.agileburo.anytype.domain.block.model.Block.Content.Text
 import com.agileburo.anytype.domain.common.Id
 
 sealed class Event {
@@ -25,6 +26,18 @@ sealed class Event {
             val text: String
         ) : Command()
 
+        /**
+         * Command to update block's text content.
+         * @property id id of the target block
+         * @property text new text (considered updated if not null)
+         * @property style new style (considered updated if not null)
+         */
+        data class GranularChange(
+            val id: Id,
+            val text: String? = null,
+            val style: Text.Style? = null
+        ) : Command()
+
         /**
          * Command to update a block structure.
          * @property context context id for this command (i.e page id, dashboard id, etc.)
diff --git a/domain/src/main/java/com/agileburo/anytype/domain/ext/BlockExt.kt b/domain/src/main/java/com/agileburo/anytype/domain/ext/BlockExt.kt
index 6898986145..efa0c87d4a 100644
--- a/domain/src/main/java/com/agileburo/anytype/domain/ext/BlockExt.kt
+++ b/domain/src/main/java/com/agileburo/anytype/domain/ext/BlockExt.kt
@@ -29,3 +29,15 @@ fun Map<String, List<Block>>.asRender(anchor: String): List<Block> {
     }
     return result
 }
+
+/**
+ * Tries to get block's content text style if possible.
+ * @return block's text style
+ * @throws UnsupportedOperationException if this block has no text content.
+ */
+fun Block.textStyle(): Block.Content.Text.Style {
+    if (content is Block.Content.Text)
+        return content.style
+    else
+        throw UnsupportedOperationException("Wrong block content type: ${content.javaClass}")
+}
diff --git a/gradle.properties b/gradle.properties
index 81062b246d..77748dbf1b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,6 +15,7 @@ org.gradle.jvmargs=-Xmx1536m
 # Android operating system, and which are packaged with your app's APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
+android.enableR8=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
diff --git a/middleware/src/main/java/com/agileburo/anytype/middleware/MapperExtension.kt b/middleware/src/main/java/com/agileburo/anytype/middleware/MapperExtension.kt
index b5d422c412..788a1b1fe6 100644
--- a/middleware/src/main/java/com/agileburo/anytype/middleware/MapperExtension.kt
+++ b/middleware/src/main/java/com/agileburo/anytype/middleware/MapperExtension.kt
@@ -153,19 +153,7 @@ fun Block.text(): BlockEntity.Content.Text = BlockEntity.Content.Text(
             }
         )
     },
-    style = when (text.style) {
-        Block.Content.Text.Style.Paragraph -> BlockEntity.Content.Text.Style.P
-        Block.Content.Text.Style.Header1 -> BlockEntity.Content.Text.Style.H1
-        Block.Content.Text.Style.Header2 -> BlockEntity.Content.Text.Style.H2
-        Block.Content.Text.Style.Header3 -> BlockEntity.Content.Text.Style.H3
-        Block.Content.Text.Style.Title -> BlockEntity.Content.Text.Style.TITLE
-        Block.Content.Text.Style.Quote -> BlockEntity.Content.Text.Style.QUOTE
-        Block.Content.Text.Style.Marked -> BlockEntity.Content.Text.Style.BULLET
-        Block.Content.Text.Style.Numbered -> BlockEntity.Content.Text.Style.NUMBERED
-        Block.Content.Text.Style.Toggle -> BlockEntity.Content.Text.Style.TOGGLE
-        Block.Content.Text.Style.Checkbox -> BlockEntity.Content.Text.Style.CHECKBOX
-        else -> throw IllegalStateException("Unexpected text style: ${text.style}")
-    },
+    style = text.style.entity(),
     isChecked = text.checked
 )
 
@@ -231,4 +219,18 @@ fun List<Block>.blocks(): List<BlockEntity> = mapNotNull { block ->
             null
         }
     }
+}
+
+fun Block.Content.Text.Style.entity(): BlockEntity.Content.Text.Style = when (this) {
+    Block.Content.Text.Style.Paragraph -> BlockEntity.Content.Text.Style.P
+    Block.Content.Text.Style.Header1 -> BlockEntity.Content.Text.Style.H1
+    Block.Content.Text.Style.Header2 -> BlockEntity.Content.Text.Style.H2
+    Block.Content.Text.Style.Header3 -> BlockEntity.Content.Text.Style.H3
+    Block.Content.Text.Style.Title -> BlockEntity.Content.Text.Style.TITLE
+    Block.Content.Text.Style.Quote -> BlockEntity.Content.Text.Style.QUOTE
+    Block.Content.Text.Style.Marked -> BlockEntity.Content.Text.Style.BULLET
+    Block.Content.Text.Style.Numbered -> BlockEntity.Content.Text.Style.NUMBERED
+    Block.Content.Text.Style.Toggle -> BlockEntity.Content.Text.Style.TOGGLE
+    Block.Content.Text.Style.Checkbox -> BlockEntity.Content.Text.Style.CHECKBOX
+    else -> throw IllegalStateException("Unexpected text style: $this")
 }
\ No newline at end of file
diff --git a/middleware/src/main/java/com/agileburo/anytype/middleware/block/BlockMiddleware.kt b/middleware/src/main/java/com/agileburo/anytype/middleware/block/BlockMiddleware.kt
index caab28dc1a..ba8dbe5101 100644
--- a/middleware/src/main/java/com/agileburo/anytype/middleware/block/BlockMiddleware.kt
+++ b/middleware/src/main/java/com/agileburo/anytype/middleware/block/BlockMiddleware.kt
@@ -333,6 +333,10 @@ class BlockMiddleware(
         )
     }
 
+    override suspend fun updateTextStyle(command: CommandEntity.UpdateStyle) {
+        middleware.updateTextStyle(command)
+    }
+
     override suspend fun updateCheckbox(command: CommandEntity.UpdateCheckbox) {
         middleware.updateCheckbox(
             command.context,
diff --git a/middleware/src/main/java/com/agileburo/anytype/middleware/interactor/Middleware.java b/middleware/src/main/java/com/agileburo/anytype/middleware/interactor/Middleware.java
index e517705069..658d8b75fb 100644
--- a/middleware/src/main/java/com/agileburo/anytype/middleware/interactor/Middleware.java
+++ b/middleware/src/main/java/com/agileburo/anytype/middleware/interactor/Middleware.java
@@ -212,6 +212,59 @@ public class Middleware {
         service.blockSetTextChecked(request);
     }
 
+    public void updateTextStyle(CommandEntity.UpdateStyle command) throws Exception {
+
+        Models.Block.Content.Text.Style style = null;
+
+        switch (command.getStyle()) {
+            case P:
+                style = Models.Block.Content.Text.Style.Paragraph;
+                break;
+            case H1:
+                style = Models.Block.Content.Text.Style.Header1;
+                break;
+            case H2:
+                style = Models.Block.Content.Text.Style.Header2;
+                break;
+            case H3:
+                style = Models.Block.Content.Text.Style.Header3;
+                break;
+            case H4:
+                style = Models.Block.Content.Text.Style.Header4;
+                break;
+            case TITLE:
+                style = Models.Block.Content.Text.Style.Title;
+                break;
+            case QUOTE:
+                style = Models.Block.Content.Text.Style.Quote;
+                break;
+            case CODE_SNIPPET:
+                style = Models.Block.Content.Text.Style.Code;
+                break;
+            case BULLET:
+                style = Models.Block.Content.Text.Style.Marked;
+                break;
+            case CHECKBOX:
+                style = Models.Block.Content.Text.Style.Checkbox;
+                break;
+            case NUMBERED:
+                style = Models.Block.Content.Text.Style.Numbered;
+                break;
+            case TOGGLE:
+                style = Models.Block.Content.Text.Style.Toggle;
+                break;
+        }
+
+        Block.Set.Text.Style.Request request = Block.Set.Text.Style.Request
+                .newBuilder()
+                .setStyle(style)
+                .setBlockId(command.getTarget())
+                .setContextId(command.getContext())
+                .build();
+
+        service.blockSetTextStyle(request);
+    }
+
     public void createBlock(
             String contextId,
             String targetId,
@@ -254,7 +307,7 @@ public class Middleware {
                 case TITLE:
                     contentModel = Models.Block.Content.Text
                             .newBuilder()
-                            .setStyle(Models.Block.Content.Text.Style.Header4)
+                            .setStyle(Models.Block.Content.Text.Style.Title)
                             .build();
                     break;
                 case QUOTE:
diff --git a/middleware/src/main/java/com/agileburo/anytype/middleware/interactor/MiddlewareEventChannel.kt b/middleware/src/main/java/com/agileburo/anytype/middleware/interactor/MiddlewareEventChannel.kt
index 971a0dcd6c..544882547e 100644
--- a/middleware/src/main/java/com/agileburo/anytype/middleware/interactor/MiddlewareEventChannel.kt
+++ b/middleware/src/main/java/com/agileburo/anytype/middleware/interactor/MiddlewareEventChannel.kt
@@ -5,6 +5,7 @@ import com.agileburo.anytype.data.auth.event.EventRemoteChannel
 import com.agileburo.anytype.data.auth.model.EventEntity
 import com.agileburo.anytype.middleware.EventProxy
 import com.agileburo.anytype.middleware.blocks
+import com.agileburo.anytype.middleware.entity
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.map
@@ -48,9 +49,15 @@ class MiddlewareEventChannel(
                         )
                     }
                     Events.Event.Message.ValueCase.BLOCKSETTEXT -> {
-                        EventEntity.Command.UpdateBlockText(
+                        EventEntity.Command.GranularChange(
                             id = event.blockSetText.id,
-                            text = event.blockSetText.text.value
+                            text = if (event.blockSetText.hasText())
+                                event.blockSetText.text.value
+                            else null,
+                            style = if (event.blockSetText.hasStyle())
+                                event.blockSetText.style.value.entity()
+                            else
+                                null
                         )
                     }
                     Events.Event.Message.ValueCase.BLOCKDELETE -> {
diff --git a/middleware/src/main/java/com/agileburo/anytype/middleware/service/DefaultMiddlewareService.java b/middleware/src/main/java/com/agileburo/anytype/middleware/service/DefaultMiddlewareService.java
index 76ec3cd73d..5750bca40d 100644
--- a/middleware/src/main/java/com/agileburo/anytype/middleware/service/DefaultMiddlewareService.java
+++ b/middleware/src/main/java/com/agileburo/anytype/middleware/service/DefaultMiddlewareService.java
@@ -142,6 +142,17 @@ public class DefaultMiddlewareService implements MiddlewareService {
         }
     }
 
+    @Override
+    public Block.Set.Text.Style.Response blockSetTextStyle(Block.Set.Text.Style.Request request) throws Exception {
+        byte[] encoded = Lib.blockSetTextStyle(request.toByteArray());
+        Block.Set.Text.Style.Response response = Block.Set.Text.Style.Response.parseFrom(encoded);
+        if (response.getError() != null && response.getError().getCode() != Block.Set.Text.Style.Response.Error.Code.NULL) {
+            throw new Exception(response.getError().getDescription());
+        } else {
+            return response;
+        }
+    }
+
     @Override
     public BlockList.Move.Response blockListMove(BlockList.Move.Request request) throws Exception {
         byte[] encoded = Lib.blockListMove(request.toByteArray());
diff --git a/middleware/src/main/java/com/agileburo/anytype/middleware/service/MiddlewareService.java b/middleware/src/main/java/com/agileburo/anytype/middleware/service/MiddlewareService.java
index ac1a31a4b5..93ecce746e 100644
--- a/middleware/src/main/java/com/agileburo/anytype/middleware/service/MiddlewareService.java
+++ b/middleware/src/main/java/com/agileburo/anytype/middleware/service/MiddlewareService.java
@@ -35,6 +35,8 @@ public interface MiddlewareService {
 
     Block.Set.Text.Checked.Response blockSetTextChecked(Block.Set.Text.Checked.Request request) throws Exception;
 
+    Block.Set.Text.Style.Response blockSetTextStyle(Block.Set.Text.Style.Request request) throws Exception;
+
     BlockList.Move.Response blockListMove(BlockList.Move.Request request) throws Exception;
 
     Block.Unlink.Response blockUnlink(Block.Unlink.Request request) throws Exception;
diff --git a/presentation/src/main/java/com/agileburo/anytype/presentation/page/PageViewModel.kt b/presentation/src/main/java/com/agileburo/anytype/presentation/page/PageViewModel.kt
index 08108e4dfe..36ae4a768b 100644
--- a/presentation/src/main/java/com/agileburo/anytype/presentation/page/PageViewModel.kt
+++ b/presentation/src/main/java/com/agileburo/anytype/presentation/page/PageViewModel.kt
@@ -20,6 +20,7 @@ import com.agileburo.anytype.domain.event.model.Event
 import com.agileburo.anytype.domain.ext.addMark
 import com.agileburo.anytype.domain.ext.asMap
 import com.agileburo.anytype.domain.ext.asRender
+import com.agileburo.anytype.domain.ext.textStyle
 import com.agileburo.anytype.domain.page.ClosePage
 import com.agileburo.anytype.domain.page.OpenPage
 import com.agileburo.anytype.presentation.common.StateReducer
@@ -42,7 +43,8 @@ class PageViewModel(
     private val interceptEvents: InterceptEvents,
     private val updateCheckbox: UpdateCheckbox,
     private val unlinkBlocks: UnlinkBlocks,
-    private val duplicateBlock: DuplicateBlock
+    private val duplicateBlock: DuplicateBlock,
+    private val updateTextStyle: UpdateTextStyle
 ) : ViewStateViewModel<PageViewModel.ViewState>(),
     SupportNavigation<EventWrapper<AppNavigation.Command>> {
 
@@ -131,6 +133,18 @@ class PageViewModel(
                 is Event.Command.DeleteBlock -> {
                     blocks = blocks.filter { it.id != event.target }
                 }
+                is Event.Command.GranularChange -> {
+                    blocks = blocks.map { block ->
+                        if (block.id == event.id)
+                            block.copy(
+                                content = block.content.asText().copy(
+                                    style = event.style ?: block.textStyle()
+                                )
+                            )
+                        else
+                            block
+                    }
+                }
             }
         }
 
@@ -199,22 +213,19 @@ class PageViewModel(
 
     private fun processRendering() {
         viewModelScope.launch {
-            renderings
-                .onEach { Timber.d("New rendering: $it") }
-                .withLatestFrom(focusChanges) { models, focus ->
-                    models.asMap().asRender(pageId).mapNotNull { block ->
-                        when {
-                            block.content is Block.Content.Text -> {
-                                block.toView(focused = block.id == focus)
-                            }
-                            block.content is Block.Content.Image -> {
-                                block.toView()
-                            }
-                            else -> null
+            renderings.withLatestFrom(focusChanges) { models, focus ->
+                models.asMap().asRender(pageId).mapNotNull { block ->
+                    when {
+                        block.content is Block.Content.Text -> {
+                            block.toView(focused = block.id == focus)
                         }
+                        block.content is Block.Content.Image -> {
+                            block.toView()
+                        }
+                        else -> null
                     }
                 }
-                .collect { dispatchToUI(it) }
+            }.collect { dispatchToUI(it) }
         }
     }
 
@@ -298,7 +309,12 @@ class PageViewModel(
         Timber.d("Focus changed ($hasFocus): $id")
         if (hasFocus) {
             viewModelScope.launch { focusChannel.send(id) }
-            controlPanelInteractor.onEvent(ControlPanelMachine.Event.OnFocusChanged(id))
+            controlPanelInteractor.onEvent(
+                ControlPanelMachine.Event.OnFocusChanged(
+                    id = id,
+                    style = blocks.first { it.id == id }.textStyle()
+                )
+            )
         }
     }
 
@@ -399,7 +415,7 @@ class PageViewModel(
     }
 
     fun onAddTextBlockClicked(style: Block.Content.Text.Style) {
-        controlPanelInteractor.onEvent(ControlPanelMachine.Event.OnOptionSelected)
+        controlPanelInteractor.onEvent(ControlPanelMachine.Event.OnAddBlockToolbarOptionSelected)
         createBlock.invoke(
             viewModelScope, CreateBlock.Params(
                 contextId = pageId,
@@ -433,13 +449,33 @@ class PageViewModel(
     }
 
     fun onAddBlockToolbarClicked() {
-        controlPanelInteractor.onEvent(ControlPanelMachine.Event.OnAddBlockToolbarClicked)
+        controlPanelInteractor.onEvent(ControlPanelMachine.Event.OnAddBlockToolbarToggleClicked)
     }
 
     fun onActionToolbarClicked() {
         controlPanelInteractor.onEvent(ControlPanelMachine.Event.OnActionToolbarClicked)
     }
 
+    fun onTurnIntoToolbarToggleClicked() {
+        controlPanelInteractor.onEvent(ControlPanelMachine.Event.OnTurnIntoToolbarToggleClicked)
+    }
+
+    fun onTurnIntoStyleClicked(style: Block.Content.Text.Style) {
+        updateTextStyle.invoke(
+            scope = viewModelScope,
+            params = UpdateTextStyle.Params(
+                context = pageId,
+                target = focusChannel.value,
+                style = style
+            )
+        ) { result ->
+            result.either(
+                fnL = { Timber.e(it, "Error while updating text style") },
+                fnR = { Timber.d("Text style succesfully updated") }
+            )
+        }
+    }
+
     fun onOutsideClicked() {
         blocks.first { it.id == pageId }.let { page ->
             if (page.children.isNotEmpty()) {
@@ -532,14 +568,24 @@ class PageViewModel(
             object OnMarkupToolbarColorClicked : Event()
 
             /**
-             * Represents an event when user selected a add-block-option on [Toolbar.AddBlock] toolbar.
+             * Represents an event when user toggled [Toolbar.AddBlock] toolbar button on [Toolbar.Block].
              */
-            object OnAddBlockToolbarClicked : Event()
+            object OnAddBlockToolbarToggleClicked : Event()
+
+            /**
+             * Represents an event when user toggled [Toolbar.TurnInto] toolbar button on [Toolbar.Block]
+             */
+            object OnTurnIntoToolbarToggleClicked : Event()
 
             /**
              * Represents an event when user selected any of the options on [Toolbar.AddBlock] toolbar.
              */
-            object OnOptionSelected : Event()
+            object OnAddBlockToolbarOptionSelected : Event()
+
+            /**
+             * Represents an event when user selected any of the options on [Toolbar.TurnInto] toolbar.
+             */
+            object OnTurnIntoToolbarOptionSelected : Event()
 
             /**
              * Represents an event when user selected a text color on [Toolbar.Color] toolbar.
@@ -561,7 +607,8 @@ class PageViewModel(
              * @property id id of the focused block
              */
             data class OnFocusChanged(
-                val id: String
+                val id: String,
+                val style: Block.Content.Text.Style
             ) : Event()
         }
 
@@ -620,7 +667,7 @@ class PageViewModel(
                         selectedAction = null
                     )
                 )
-                is Event.OnAddBlockToolbarClicked -> state.copy(
+                is Event.OnAddBlockToolbarToggleClicked -> state.copy(
                     addBlockToolbar = state.addBlockToolbar.copy(
                         isVisible = !state.addBlockToolbar.isVisible
                     ),
@@ -632,12 +679,40 @@ class PageViewModel(
                     ),
                     actionToolbar = state.actionToolbar.copy(
                         isVisible = false
+                    ),
+                    turnIntoToolbar = state.turnIntoToolbar.copy(
+                        isVisible = false
                     )
                 )
-                is Event.OnOptionSelected -> state.copy(
+                is Event.OnTurnIntoToolbarToggleClicked -> state.copy(
+                    turnIntoToolbar = state.turnIntoToolbar.copy(
+                        isVisible = !state.turnIntoToolbar.isVisible
+                    ),
+                    blockToolbar = state.blockToolbar.copy(
+                        selectedAction = if (!state.turnIntoToolbar.isVisible)
+                            Toolbar.Block.Action.TURN_INTO
+                        else
+                            null
+                    ),
                     addBlockToolbar = state.addBlockToolbar.copy(
                         isVisible = false
                     ),
+                    actionToolbar = state.actionToolbar.copy(
+                        isVisible = false
+                    )
+                )
+                is Event.OnAddBlockToolbarOptionSelected -> state.copy(
+                    addBlockToolbar = state.addBlockToolbar.copy(
+                        isVisible = false
+                    ),
+                    blockToolbar = state.blockToolbar.copy(
+                        selectedAction = null
+                    )
+                )
+                is Event.OnTurnIntoToolbarOptionSelected -> state.copy(
+                    turnIntoToolbar = state.turnIntoToolbar.copy(
+                        isVisible = false
+                    ),
                     blockToolbar = state.blockToolbar.copy(
                         selectedAction = null
                     )
@@ -649,6 +724,9 @@ class PageViewModel(
                     addBlockToolbar = state.addBlockToolbar.copy(
                         isVisible = false
                     ),
+                    turnIntoToolbar = state.turnIntoToolbar.copy(
+                        isVisible = false
+                    ),
                     actionToolbar = state.actionToolbar.copy(
                         isVisible = !state.actionToolbar.isVisible
                     ),
@@ -663,13 +741,45 @@ class PageViewModel(
                     if (state.isNotVisible())
                         state.copy(
                             blockToolbar = state.blockToolbar.copy(
-                                isVisible = true
+                                isVisible = true,
+                                selectedAction = null
                             ),
-                            focus = ControlPanelState.Focus(event.id)
+                            turnIntoToolbar = state.turnIntoToolbar.copy(
+                                isVisible = false
+                            ),
+                            addBlockToolbar = state.addBlockToolbar.copy(
+                                isVisible = false
+                            ),
+                            actionToolbar = state.actionToolbar.copy(
+                                isVisible = false
+                            ),
+                            focus = ControlPanelState.Focus(
+                                id = event.id,
+                                type = ControlPanelState.Focus.Type.valueOf(
+                                    value = event.style.name
+                                )
+                            )
                         )
                     else {
                         state.copy(
-                            focus = ControlPanelState.Focus(event.id)
+                            blockToolbar = state.blockToolbar.copy(
+                                selectedAction = null
+                            ),
+                            focus = ControlPanelState.Focus(
+                                id = event.id,
+                                type = ControlPanelState.Focus.Type.valueOf(
+                                    value = event.style.name
+                                )
+                            ),
+                            addBlockToolbar = state.addBlockToolbar.copy(
+                                isVisible = false
+                            ),
+                            actionToolbar = state.actionToolbar.copy(
+                                isVisible = false
+                            ),
+                            turnIntoToolbar = state.turnIntoToolbar.copy(
+                                isVisible = false
+                            )
                         )
                     }
                 }
diff --git a/presentation/src/main/java/com/agileburo/anytype/presentation/page/PageViewModelFactory.kt b/presentation/src/main/java/com/agileburo/anytype/presentation/page/PageViewModelFactory.kt
index 2730026839..186ae90229 100644
--- a/presentation/src/main/java/com/agileburo/anytype/presentation/page/PageViewModelFactory.kt
+++ b/presentation/src/main/java/com/agileburo/anytype/presentation/page/PageViewModelFactory.kt
@@ -15,7 +15,8 @@ class PageViewModelFactory(
     private val interceptEvents: InterceptEvents,
     private val updateCheckbox: UpdateCheckbox,
     private val unlinkBlocks: UnlinkBlocks,
-    private val duplicateBlock: DuplicateBlock
+    private val duplicateBlock: DuplicateBlock,
+    private val updateTextStyle: UpdateTextStyle
 ) : ViewModelProvider.Factory {
 
     @Suppress("UNCHECKED_CAST")
@@ -28,7 +29,8 @@ class PageViewModelFactory(
             interceptEvents = interceptEvents,
             updateCheckbox = updateCheckbox,
             duplicateBlock = duplicateBlock,
-            unlinkBlocks = unlinkBlocks
+            unlinkBlocks = unlinkBlocks,
+            updateTextStyle = updateTextStyle
         ) as T
     }
 }
\ No newline at end of file
diff --git a/presentation/src/test/java/com/agileburo/anytype/presentation/page/ControlPanelStateReducerTest.kt b/presentation/src/test/java/com/agileburo/anytype/presentation/page/ControlPanelStateReducerTest.kt
index 33b6aa5650..402db1fa79 100644
--- a/presentation/src/test/java/com/agileburo/anytype/presentation/page/ControlPanelStateReducerTest.kt
+++ b/presentation/src/test/java/com/agileburo/anytype/presentation/page/ControlPanelStateReducerTest.kt
@@ -2,6 +2,7 @@ package com.agileburo.anytype.presentation.page
 
 import MockDataFactory
 import com.agileburo.anytype.core_ui.state.ControlPanelState
+import com.agileburo.anytype.domain.block.model.Block
 import com.agileburo.anytype.presentation.page.PageViewModel.ControlPanelMachine
 import com.agileburo.anytype.presentation.util.CoroutinesTestRule
 import kotlinx.coroutines.test.runBlockingTest
@@ -18,12 +19,13 @@ class ControlPanelStateReducerTest {
     private val reducer = ControlPanelMachine.Reducer()
 
     @Test
-    fun `state should have visibile block toolbar and focus from the event`() = runBlockingTest {
+    fun `state should have visible block toolbar and focus from the event`() = runBlockingTest {
 
         val given = ControlPanelState.init()
 
         val event = ControlPanelMachine.Event.OnFocusChanged(
-            id = MockDataFactory.randomUuid()
+            id = MockDataFactory.randomUuid(),
+            style = Block.Content.Text.Style.P
         )
 
         val actual = reducer.reduce(
@@ -33,7 +35,8 @@ class ControlPanelStateReducerTest {
 
         val expected = given.copy(
             focus = ControlPanelState.Focus(
-                id = event.id
+                id = event.id,
+                type = ControlPanelState.Focus.Type.P
             ),
             blockToolbar = ControlPanelState.Toolbar.Block(
                 isVisible = true
@@ -50,13 +53,19 @@ class ControlPanelStateReducerTest {
     fun `state should have only focus changed`() = runBlockingTest {
 
         val given = ControlPanelState(
-            focus = ControlPanelState.Focus(id = MockDataFactory.randomUuid()),
+            focus = ControlPanelState.Focus(
+                id = MockDataFactory.randomUuid(),
+                type = ControlPanelState.Focus.Type.P
+            ),
             blockToolbar = ControlPanelState.Toolbar.Block(
                 isVisible = true
             ),
             addBlockToolbar = ControlPanelState.Toolbar.AddBlock(
                 isVisible = false
             ),
+            turnIntoToolbar = ControlPanelState.Toolbar.TurnInto(
+                isVisible = false
+            ),
             colorToolbar = ControlPanelState.Toolbar.Color(
                 isVisible = false
             ),
@@ -69,7 +78,8 @@ class ControlPanelStateReducerTest {
         )
 
         val event = ControlPanelMachine.Event.OnFocusChanged(
-            id = MockDataFactory.randomUuid()
+            id = MockDataFactory.randomUuid(),
+            style = Block.Content.Text.Style.P
         )
 
         val actual = reducer.reduce(
@@ -78,7 +88,10 @@ class ControlPanelStateReducerTest {
         )
 
         val expected = given.copy(
-            focus = ControlPanelState.Focus(event.id)
+            focus = ControlPanelState.Focus(
+                id = event.id,
+                type = ControlPanelState.Focus.Type.P
+            )
         )
 
         assertEquals(
@@ -91,13 +104,19 @@ class ControlPanelStateReducerTest {
     fun `should return to initial state when focus is cleared`() = runBlockingTest {
 
         val given = ControlPanelState(
-            focus = ControlPanelState.Focus(id = MockDataFactory.randomUuid()),
+            focus = ControlPanelState.Focus(
+                id = MockDataFactory.randomUuid(),
+                type = ControlPanelState.Focus.Type.P
+            ),
             blockToolbar = ControlPanelState.Toolbar.Block(
                 isVisible = true
             ),
             addBlockToolbar = ControlPanelState.Toolbar.AddBlock(
                 isVisible = false
             ),
+            turnIntoToolbar = ControlPanelState.Toolbar.TurnInto(
+                isVisible = false
+            ),
             colorToolbar = ControlPanelState.Toolbar.Color(
                 isVisible = false
             ),
@@ -123,4 +142,407 @@ class ControlPanelStateReducerTest {
             actual = actual
         )
     }
+
+    @Test
+    fun `should show add-block toolbar and hide turn-into toolbar on add-block-toolbar-toggle-clicked event`() =
+        runBlockingTest {
+
+            val given = ControlPanelState(
+                focus = ControlPanelState.Focus(
+                    id = MockDataFactory.randomUuid(),
+                    type = ControlPanelState.Focus.Type.H1
+                ),
+                blockToolbar = ControlPanelState.Toolbar.Block(
+                    isVisible = true,
+                    selectedAction = ControlPanelState.Toolbar.Block.Action.TURN_INTO
+                ),
+                addBlockToolbar = ControlPanelState.Toolbar.AddBlock(
+                    isVisible = false
+                ),
+                turnIntoToolbar = ControlPanelState.Toolbar.TurnInto(
+                    isVisible = true
+                ),
+                colorToolbar = ControlPanelState.Toolbar.Color(
+                    isVisible = false
+                ),
+                actionToolbar = ControlPanelState.Toolbar.BlockAction(
+                    isVisible = false
+                ),
+                markupToolbar = ControlPanelState.Toolbar.Markup(
+                    isVisible = false
+                )
+            )
+
+            val event = ControlPanelMachine.Event.OnAddBlockToolbarToggleClicked
+
+            val actual = reducer.reduce(
+                state = given,
+                event = event
+            )
+
+            val expected = given.copy(
+                addBlockToolbar = ControlPanelState.Toolbar.AddBlock(
+                    isVisible = true
+                ),
+                turnIntoToolbar = ControlPanelState.Toolbar.TurnInto(
+                    isVisible = false
+                ),
+                blockToolbar = ControlPanelState.Toolbar.Block(
+                    isVisible = true,
+                    selectedAction = ControlPanelState.Toolbar.Block.Action.ADD
+                )
+            )
+
+            assertEquals(
+                expected = expected,
+                actual = actual
+            )
+        }
+
+    @Test
+    fun `should hide add-block toolbar and show turn-into toolbar on turn-into-toolbar-toogle-clicked event`() =
+        runBlockingTest {
+
+            val given = ControlPanelState(
+                focus = ControlPanelState.Focus(
+                    id = MockDataFactory.randomUuid(),
+                    type = ControlPanelState.Focus.Type.H1
+                ),
+                blockToolbar = ControlPanelState.Toolbar.Block(
+                    isVisible = true,
+                    selectedAction = ControlPanelState.Toolbar.Block.Action.ADD
+                ),
+                addBlockToolbar = ControlPanelState.Toolbar.AddBlock(
+                    isVisible = true
+                ),
+                turnIntoToolbar = ControlPanelState.Toolbar.TurnInto(
+                    isVisible = false
+                ),
+                colorToolbar = ControlPanelState.Toolbar.Color(
+                    isVisible = false
+                ),
+                actionToolbar = ControlPanelState.Toolbar.BlockAction(
+                    isVisible = false
+                ),
+                markupToolbar = ControlPanelState.Toolbar.Markup(
+                    isVisible = false
+                )
+            )
+
+            val event = ControlPanelMachine.Event.OnTurnIntoToolbarToggleClicked
+
+            val actual = reducer.reduce(
+                state = given,
+                event = event
+            )
+
+            val expected = given.copy(
+                addBlockToolbar = ControlPanelState.Toolbar.AddBlock(
+                    isVisible = false
+                ),
+                turnIntoToolbar = ControlPanelState.Toolbar.TurnInto(
+                    isVisible = true
+                ),
+                blockToolbar = ControlPanelState.Toolbar.Block(
+                    isVisible = true,
+                    selectedAction = ControlPanelState.Toolbar.Block.Action.TURN_INTO
+                )
+            )
+
+            assertEquals(
+                expected = expected,
+                actual = actual
+            )
+        }
+
+    @Test
+    fun `should hide turn-into toolbar on focus-changed event`() = runBlockingTest {
+
+        val given = ControlPanelState(
+            focus = ControlPanelState.Focus(
+                id = MockDataFactory.randomUuid(),
+                type = ControlPanelState.Focus.Type.H1
+            ),
+            blockToolbar = ControlPanelState.Toolbar.Block(
+                isVisible = true,
+                selectedAction = ControlPanelState.Toolbar.Block.Action.TURN_INTO
+            ),
+            addBlockToolbar = ControlPanelState.Toolbar.AddBlock(
+                isVisible = false
+            ),
+            turnIntoToolbar = ControlPanelState.Toolbar.TurnInto(
+                isVisible = true
+            ),
+            colorToolbar = ControlPanelState.Toolbar.Color(
+                isVisible = false
+            ),
+            actionToolbar = ControlPanelState.Toolbar.BlockAction(
+                isVisible = false
+            ),
+            markupToolbar = ControlPanelState.Toolbar.Markup(
+                isVisible = false
+            )
+        )
+
+        val event = ControlPanelMachine.Event.OnFocusChanged(
+            id = MockDataFactory.randomUuid(),
+            style = Block.Content.Text.Style.P
+        )
+
+        val actual = reducer.reduce(
+            state = given,
+            event = event
+        )
+
+        val expected = given.copy(
+            focus = ControlPanelState.Focus(
+                id = event.id,
+                type = ControlPanelState.Focus.Type.valueOf(event.style.name)
+            ),
+            turnIntoToolbar = ControlPanelState.Toolbar.TurnInto(
+                isVisible = false
+            ),
+            blockToolbar = ControlPanelState.Toolbar.Block(
+                isVisible = true,
+                selectedAction = null
+            )
+        )
+
+        assertEquals(
+            expected = expected,
+            actual = actual
+        )
+    }
+
+    @Test
+    fun `should hide add-block toolbar on focus-changed event`() = runBlockingTest {
+
+        val given = ControlPanelState(
+            focus = ControlPanelState.Focus(
+                id = MockDataFactory.randomUuid(),
+                type = ControlPanelState.Focus.Type.H1
+            ),
+            blockToolbar = ControlPanelState.Toolbar.Block(
+                isVisible = true,
+                selectedAction = ControlPanelState.Toolbar.Block.Action.ADD
+            ),
+            addBlockToolbar = ControlPanelState.Toolbar.AddBlock(
+                isVisible = true
+            ),
+            turnIntoToolbar = ControlPanelState.Toolbar.TurnInto(
+                isVisible = false
+            ),
+            colorToolbar = ControlPanelState.Toolbar.Color(
+                isVisible = false
+            ),
+            actionToolbar = ControlPanelState.Toolbar.BlockAction(
+                isVisible = false
+            ),
+            markupToolbar = ControlPanelState.Toolbar.Markup(
+                isVisible = false
+            )
+        )
+
+        val event = ControlPanelMachine.Event.OnFocusChanged(
+            id = MockDataFactory.randomUuid(),
+            style = Block.Content.Text.Style.P
+        )
+
+        val actual = reducer.reduce(
+            state = given,
+            event = event
+        )
+
+        val expected = given.copy(
+            focus = ControlPanelState.Focus(
+                id = event.id,
+                type = ControlPanelState.Focus.Type.valueOf(event.style.name)
+            ),
+            addBlockToolbar = ControlPanelState.Toolbar.AddBlock(
+                isVisible = false
+            ),
+            blockToolbar = ControlPanelState.Toolbar.Block(
+                isVisible = true,
+                selectedAction = null
+            )
+        )
+
+        assertEquals(
+            expected = expected,
+            actual = actual
+        )
+    }
+
+    @Test
+    fun `should hide block-action toolbar on focus-changed event`() = runBlockingTest {
+
+        val given = ControlPanelState(
+            focus = ControlPanelState.Focus(
+                id = MockDataFactory.randomUuid(),
+                type = ControlPanelState.Focus.Type.H1
+            ),
+            blockToolbar = ControlPanelState.Toolbar.Block(
+                isVisible = true,
+                selectedAction = ControlPanelState.Toolbar.Block.Action.BLOCK_ACTION
+            ),
+            addBlockToolbar = ControlPanelState.Toolbar.AddBlock(
+                isVisible = false
+            ),
+            turnIntoToolbar = ControlPanelState.Toolbar.TurnInto(
+                isVisible = false
+            ),
+            colorToolbar = ControlPanelState.Toolbar.Color(
+                isVisible = false
+            ),
+            actionToolbar = ControlPanelState.Toolbar.BlockAction(
+                isVisible = true
+            ),
+            markupToolbar = ControlPanelState.Toolbar.Markup(
+                isVisible = false
+            )
+        )
+
+        val event = ControlPanelMachine.Event.OnFocusChanged(
+            id = MockDataFactory.randomUuid(),
+            style = Block.Content.Text.Style.P
+        )
+
+        val actual = reducer.reduce(
+            state = given,
+            event = event
+        )
+
+        val expected = given.copy(
+            focus = ControlPanelState.Focus(
+                id = event.id,
+                type = ControlPanelState.Focus.Type.valueOf(event.style.name)
+            ),
+            blockToolbar = ControlPanelState.Toolbar.Block(
+                isVisible = true,
+                selectedAction = null
+            ),
+            actionToolbar = given.actionToolbar.copy(
+                isVisible = false
+            )
+        )
+
+        assertEquals(
+            expected = expected,
+            actual = actual
+        )
+    }
+
+    @Test
+    fun `should hide block-action toolbar and show turn-into toolbar on turn-into-toolbar-toogle-clicked-event`() =
+        runBlockingTest {
+
+            val given = ControlPanelState(
+                focus = ControlPanelState.Focus(
+                    id = MockDataFactory.randomUuid(),
+                    type = ControlPanelState.Focus.Type.H1
+                ),
+                blockToolbar = ControlPanelState.Toolbar.Block(
+                    isVisible = true,
+                    selectedAction = ControlPanelState.Toolbar.Block.Action.BLOCK_ACTION
+                ),
+                addBlockToolbar = ControlPanelState.Toolbar.AddBlock(
+                    isVisible = false
+                ),
+                turnIntoToolbar = ControlPanelState.Toolbar.TurnInto(
+                    isVisible = false
+                ),
+                colorToolbar = ControlPanelState.Toolbar.Color(
+                    isVisible = false
+                ),
+                actionToolbar = ControlPanelState.Toolbar.BlockAction(
+                    isVisible = true
+                ),
+                markupToolbar = ControlPanelState.Toolbar.Markup(
+                    isVisible = false
+                )
+            )
+
+            val event = ControlPanelMachine.Event.OnTurnIntoToolbarToggleClicked
+
+            val actual = reducer.reduce(
+                state = given,
+                event = event
+            )
+
+            val expected = given.copy(
+                blockToolbar = ControlPanelState.Toolbar.Block(
+                    isVisible = true,
+                    selectedAction = ControlPanelState.Toolbar.Block.Action.TURN_INTO
+                ),
+                turnIntoToolbar = ControlPanelState.Toolbar.TurnInto(
+                    isVisible = true
+                ),
+                actionToolbar = given.actionToolbar.copy(
+                    isVisible = false
+                )
+            )
+
+            assertEquals(
+                expected = expected,
+                actual = actual
+            )
+        }
+
+    @Test
+    fun `should hide turn-into toolbar, show block-action toolbar on action-toolbar-toogle-clicked event`() =
+        runBlockingTest {
+
+            val given = ControlPanelState(
+                focus = ControlPanelState.Focus(
+                    id = MockDataFactory.randomUuid(),
+                    type = ControlPanelState.Focus.Type.H1
+                ),
+                blockToolbar = ControlPanelState.Toolbar.Block(
+                    isVisible = true,
+                    selectedAction = ControlPanelState.Toolbar.Block.Action.TURN_INTO
+                ),
+                addBlockToolbar = ControlPanelState.Toolbar.AddBlock(
+                    isVisible = false
+                ),
+                turnIntoToolbar = ControlPanelState.Toolbar.TurnInto(
+                    isVisible = true
+                ),
+                colorToolbar = ControlPanelState.Toolbar.Color(
+                    isVisible = false
+                ),
+                actionToolbar = ControlPanelState.Toolbar.BlockAction(
+                    isVisible = false
+                ),
+                markupToolbar = ControlPanelState.Toolbar.Markup(
+                    isVisible = false
+                )
+            )
+
+            val event = ControlPanelMachine.Event.OnActionToolbarClicked
+
+            val actual = reducer.reduce(
+                state = given,
+                event = event
+            )
+
+            val expected = given.copy(
+                blockToolbar = ControlPanelState.Toolbar.Block(
+                    isVisible = true,
+                    selectedAction = ControlPanelState.Toolbar.Block.Action.BLOCK_ACTION
+                ),
+                turnIntoToolbar = ControlPanelState.Toolbar.TurnInto(
+                    isVisible = false
+                ),
+                actionToolbar = given.actionToolbar.copy(
+                    isVisible = true
+                )
+            )
+
+            assertEquals(
+                expected = expected,
+                actual = actual
+            )
+
+        }
+
 }
\ No newline at end of file
diff --git a/presentation/src/test/java/com/agileburo/anytype/presentation/page/PageViewModelTest.kt b/presentation/src/test/java/com/agileburo/anytype/presentation/page/PageViewModelTest.kt
index 1cef65c53d..13b5b4918a 100644
--- a/presentation/src/test/java/com/agileburo/anytype/presentation/page/PageViewModelTest.kt
+++ b/presentation/src/test/java/com/agileburo/anytype/presentation/page/PageViewModelTest.kt
@@ -62,6 +62,9 @@ class PageViewModelTest {
     @Mock
     lateinit var unlinkBlocks: UnlinkBlocks
 
+    @Mock
+    lateinit var updateTextStyle: UpdateTextStyle
+
     private lateinit var vm: PageViewModel
 
     @Before
@@ -1044,8 +1047,34 @@ class PageViewModelTest {
     @Test
     fun `add-block-or-turn-into panel should be opened on add-block-toolbar-clicked event`() {
 
-        simulateNormalPageOpeningFlow()
+        val root = MockDataFactory.randomUuid()
+        val child = MockDataFactory.randomUuid()
+        val page = MockBlockFactory.makeOnePageWithOneTextBlock(root = root, child = child)
 
+        val flow: Flow<List<Event.Command>> = flow {
+            delay(1000)
+            emit(
+                listOf(
+                    Event.Command.ShowBlock(
+                        rootId = root,
+                        blocks = page
+                    )
+                )
+            )
+        }
+
+        stubObserveEvents(flow)
+        stubOpenPage()
+        buildViewModel()
+
+        vm.open(root)
+
+        coroutineTestRule.advanceTime(1001)
+
+        vm.onBlockFocusChanged(
+            id = child,
+            hasFocus = true
+        )
         vm.onAddBlockToolbarClicked()
 
         val expected = ControlPanelState(
@@ -1064,6 +1093,13 @@ class PageViewModelTest {
             ),
             actionToolbar = ControlPanelState.Toolbar.BlockAction(
                 isVisible = false
+            ),
+            turnIntoToolbar = ControlPanelState.Toolbar.TurnInto(
+                isVisible = false
+            ),
+            focus = ControlPanelState.Focus(
+                id = child,
+                type = ControlPanelState.Focus.Type.P
             )
         )
 
@@ -1073,8 +1109,34 @@ class PageViewModelTest {
     @Test
     fun `add-block-or-turn-into panel should be closed on add-text-block-clicked event`() {
 
-        simulateNormalPageOpeningFlow()
+        val root = MockDataFactory.randomUuid()
+        val child = MockDataFactory.randomUuid()
+        val page = MockBlockFactory.makeOnePageWithOneTextBlock(root = root, child = child)
 
+        val flow: Flow<List<Event.Command>> = flow {
+            delay(1000)
+            emit(
+                listOf(
+                    Event.Command.ShowBlock(
+                        rootId = root,
+                        blocks = page
+                    )
+                )
+            )
+        }
+
+        stubObserveEvents(flow)
+        stubOpenPage()
+        buildViewModel()
+
+        vm.open(root)
+
+        coroutineTestRule.advanceTime(1001)
+
+        vm.onBlockFocusChanged(
+            id = child,
+            hasFocus = true
+        )
         vm.onAddBlockToolbarClicked()
         vm.onAddTextBlockClicked(style = Block.Content.Text.Style.P)
 
@@ -1094,6 +1156,13 @@ class PageViewModelTest {
             ),
             actionToolbar = ControlPanelState.Toolbar.BlockAction(
                 isVisible = false
+            ),
+            turnIntoToolbar = ControlPanelState.Toolbar.TurnInto(
+                isVisible = false
+            ),
+            focus = ControlPanelState.Focus(
+                id = child,
+                type = ControlPanelState.Focus.Type.P
             )
         )
 
@@ -1103,8 +1172,34 @@ class PageViewModelTest {
     @Test
     fun `should open markup panel when text is selected`() {
 
-        simulateNormalPageOpeningFlow()
+        val root = MockDataFactory.randomUuid()
+        val child = MockDataFactory.randomUuid()
+        val page = MockBlockFactory.makeOnePageWithOneTextBlock(root = root, child = child)
 
+        val flow: Flow<List<Event.Command>> = flow {
+            delay(1000)
+            emit(
+                listOf(
+                    Event.Command.ShowBlock(
+                        rootId = root,
+                        blocks = page
+                    )
+                )
+            )
+        }
+
+        stubObserveEvents(flow)
+        stubOpenPage()
+        buildViewModel()
+
+        vm.open(root)
+
+        coroutineTestRule.advanceTime(1001)
+
+        vm.onBlockFocusChanged(
+            id = child,
+            hasFocus = true
+        )
         vm.onSelectionChanged(
             id = MockDataFactory.randomUuid(),
             selection = 0..4
@@ -1128,6 +1223,13 @@ class PageViewModelTest {
             ),
             actionToolbar = ControlPanelState.Toolbar.BlockAction(
                 isVisible = false
+            ),
+            turnIntoToolbar = ControlPanelState.Toolbar.TurnInto(
+                isVisible = false
+            ),
+            focus = ControlPanelState.Focus(
+                id = child,
+                type = ControlPanelState.Focus.Type.P
             )
         )
 
@@ -1139,7 +1241,34 @@ class PageViewModelTest {
 
         val expectedVisibility = false
 
-        simulateNormalPageOpeningFlow()
+        val root = MockDataFactory.randomUuid()
+        val child = MockDataFactory.randomUuid()
+        val page = MockBlockFactory.makeOnePageWithOneTextBlock(root = root, child = child)
+
+        val flow: Flow<List<Event.Command>> = flow {
+            delay(1000)
+            emit(
+                listOf(
+                    Event.Command.ShowBlock(
+                        rootId = root,
+                        blocks = page
+                    )
+                )
+            )
+        }
+
+        stubObserveEvents(flow)
+        stubOpenPage()
+        buildViewModel()
+
+        vm.open(root)
+
+        coroutineTestRule.advanceTime(1001)
+
+        vm.onBlockFocusChanged(
+            id = child,
+            hasFocus = true
+        )
 
         vm.onSelectionChanged(
             id = MockDataFactory.randomUuid(),
@@ -1162,6 +1291,13 @@ class PageViewModelTest {
             ),
             actionToolbar = ControlPanelState.Toolbar.BlockAction(
                 isVisible = false
+            ),
+            turnIntoToolbar = ControlPanelState.Toolbar.TurnInto(
+                isVisible = false
+            ),
+            focus = ControlPanelState.Focus(
+                id = child,
+                type = ControlPanelState.Focus.Type.P
             )
         )
 
@@ -1171,7 +1307,34 @@ class PageViewModelTest {
     @Test
     fun `should open color toolbar when this option is selected on markup toolbar`() {
 
-        simulateNormalPageOpeningFlow()
+        val root = MockDataFactory.randomUuid()
+        val child = MockDataFactory.randomUuid()
+        val page = MockBlockFactory.makeOnePageWithOneTextBlock(root = root, child = child)
+
+        val flow: Flow<List<Event.Command>> = flow {
+            delay(1000)
+            emit(
+                listOf(
+                    Event.Command.ShowBlock(
+                        rootId = root,
+                        blocks = page
+                    )
+                )
+            )
+        }
+
+        stubObserveEvents(flow)
+        stubOpenPage()
+        buildViewModel()
+
+        vm.open(root)
+
+        coroutineTestRule.advanceTime(1001)
+
+        vm.onBlockFocusChanged(
+            id = child,
+            hasFocus = true
+        )
 
         vm.onSelectionChanged(
             id = MockDataFactory.randomUuid(),
@@ -1199,6 +1362,13 @@ class PageViewModelTest {
             ),
             actionToolbar = ControlPanelState.Toolbar.BlockAction(
                 isVisible = false
+            ),
+            turnIntoToolbar = ControlPanelState.Toolbar.TurnInto(
+                isVisible = false
+            ),
+            focus = ControlPanelState.Focus(
+                id = child,
+                type = ControlPanelState.Focus.Type.P
             )
         )
 
@@ -1614,6 +1784,199 @@ class PageViewModelTest {
         )
     }
 
+    @Test
+    fun `should create a new paragraph on outside-clicked event if page contains only title and icon`() {
+
+        val root = MockDataFactory.randomUuid()
+        val child = MockDataFactory.randomUuid()
+        val page = MockBlockFactory.makeOnePageWithOneTextBlock(
+            root = root,
+            child = child,
+            style = Block.Content.Text.Style.TITLE
+        )
+
+        val flow: Flow<List<Event.Command>> = flow {
+            delay(100)
+            emit(
+                listOf(
+                    Event.Command.ShowBlock(
+                        rootId = root,
+                        blocks = page
+                    )
+                )
+            )
+        }
+
+        stubObserveEvents(flow)
+        stubOpenPage()
+        buildViewModel()
+
+        vm.open(root)
+
+        coroutineTestRule.advanceTime(100)
+
+        vm.onOutsideClicked()
+
+        verify(createBlock, times(1)).invoke(
+            scope = any(),
+            params = eq(
+                CreateBlock.Params(
+                    contextId = root,
+                    targetId = "",
+                    position = Position.INNER,
+                    prototype = Block.Prototype.Text(
+                        style = Block.Content.Text.Style.P
+                    )
+                )
+            ),
+            onResult = any()
+        )
+    }
+
+    @Test
+    fun `should not create a new paragraph on outside-clicked event if page already contains one paragraph`() {
+
+        val root = MockDataFactory.randomUuid()
+        val firstChild = MockDataFactory.randomUuid()
+        val secondChild = MockDataFactory.randomUuid()
+        val page = MockBlockFactory.makeOnePageWithTwoTextBlocks(
+            root = root,
+            firstChild = firstChild,
+            firstChildStyle = Block.Content.Text.Style.TITLE,
+            secondChild = secondChild,
+            secondChildStyle = Block.Content.Text.Style.P
+        )
+
+        val flow: Flow<List<Event.Command>> = flow {
+            delay(100)
+            emit(
+                listOf(
+                    Event.Command.ShowBlock(
+                        rootId = root,
+                        blocks = page
+                    )
+                )
+            )
+        }
+
+        stubObserveEvents(flow)
+        stubOpenPage()
+        buildViewModel()
+
+        vm.open(root)
+
+        coroutineTestRule.advanceTime(100)
+
+        vm.onOutsideClicked()
+
+        verify(createBlock, never()).invoke(
+            scope = any(),
+            params = any(),
+            onResult = any()
+        )
+    }
+
+    @Test
+    fun `should start updating text style of the focused block on turn-into-option-clicked event`() {
+
+        val root = MockDataFactory.randomUuid()
+        val firstChild = MockDataFactory.randomUuid()
+        val secondChild = MockDataFactory.randomUuid()
+        val page = MockBlockFactory.makeOnePageWithTwoTextBlocks(
+            root = root,
+            firstChild = firstChild,
+            firstChildStyle = Block.Content.Text.Style.TITLE,
+            secondChild = secondChild,
+            secondChildStyle = Block.Content.Text.Style.P
+        )
+
+        val flow: Flow<List<Event.Command>> = flow {
+            delay(100)
+            emit(
+                listOf(
+                    Event.Command.ShowBlock(
+                        rootId = root,
+                        blocks = page
+                    )
+                )
+            )
+        }
+
+        stubObserveEvents(flow)
+        stubOpenPage()
+        buildViewModel()
+
+        vm.open(root)
+
+        coroutineTestRule.advanceTime(100)
+
+        vm.onBlockFocusChanged(
+            id = secondChild,
+            hasFocus = true
+        )
+
+        val newStyle = Block.Content.Text.Style.H1
+
+        vm.onTurnIntoStyleClicked(style = newStyle)
+
+        verify(updateTextStyle, times(1)).invoke(
+            scope = any(),
+            params = eq(
+                UpdateTextStyle.Params(
+                    context = root,
+                    target = secondChild,
+                    style = newStyle
+                )
+            ),
+            onResult = any()
+        )
+    }
+
+    @Test
+    fun `should clear focus internally and re-render on hide-keyboard event`() {
+
+        val root = MockDataFactory.randomUuid()
+        val child = MockDataFactory.randomUuid()
+        val page = MockBlockFactory.makeOnePageWithOneTextBlock(
+            root = root,
+            child = child,
+            style = Block.Content.Text.Style.TITLE
+        )
+
+        val flow: Flow<List<Event.Command>> = flow {
+            delay(100)
+            emit(
+                listOf(
+                    Event.Command.ShowBlock(
+                        rootId = root,
+                        blocks = page
+                    )
+                )
+            )
+        }
+
+        stubObserveEvents(flow)
+        stubOpenPage()
+        buildViewModel()
+
+        vm.open(root)
+
+        coroutineTestRule.advanceTime(100)
+
+        val testObserver = vm.focus.test()
+
+        vm.onBlockFocusChanged(
+            id = child,
+            hasFocus = true
+        )
+
+        testObserver.assertValue(child)
+
+        vm.onHideKeyboardClicked()
+
+        testObserver.assertValue(PageViewModel.EMPTY_FOCUS_ID)
+    }
+
     private fun simulateNormalPageOpeningFlow() {
 
         val root = MockDataFactory.randomUuid()
@@ -1672,7 +2035,8 @@ class PageViewModelTest {
             createBlock = createBlock,
             updateCheckbox = updateCheckbox,
             unlinkBlocks = unlinkBlocks,
-            duplicateBlock = duplicateBlock
+            duplicateBlock = duplicateBlock,
+            updateTextStyle = updateTextStyle
         )
     }
 }
\ No newline at end of file