diff --git a/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirJvmTypeMapper.kt b/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirJvmTypeMapper.kt
index b20b8e16389..85bc7d30f02 100644
--- a/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirJvmTypeMapper.kt
+++ b/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirJvmTypeMapper.kt
@@ -5,23 +5,28 @@
 
 package org.jetbrains.kotlin.fir.backend.jvm
 
+import org.jetbrains.kotlin.builtins.functions.BuiltInFunctionArity
+import org.jetbrains.kotlin.builtins.jvm.JavaToKotlinClassMap
 import org.jetbrains.kotlin.codegen.signature.JvmSignatureWriter
+import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper
 import org.jetbrains.kotlin.descriptors.ClassKind
 import org.jetbrains.kotlin.fir.*
+import org.jetbrains.kotlin.fir.declarations.*
 import org.jetbrains.kotlin.fir.resolve.defaultType
 import org.jetbrains.kotlin.fir.resolve.firSymbolProvider
-import org.jetbrains.kotlin.fir.resolve.inference.isKClassType
-import org.jetbrains.kotlin.fir.resolve.inference.isSuspendFunctionType
+import org.jetbrains.kotlin.fir.resolve.inference.*
+import org.jetbrains.kotlin.fir.resolve.toSymbol
 import org.jetbrains.kotlin.fir.symbols.ConeClassLikeLookupTag
 import org.jetbrains.kotlin.fir.symbols.ConeClassifierLookupTag
 import org.jetbrains.kotlin.fir.symbols.ConeTypeParameterLookupTag
 import org.jetbrains.kotlin.fir.symbols.StandardClassIds
 import org.jetbrains.kotlin.fir.symbols.impl.FirRegularClassSymbol
+import org.jetbrains.kotlin.fir.symbols.impl.FirTypeParameterSymbol
 import org.jetbrains.kotlin.fir.types.*
 import org.jetbrains.kotlin.fir.types.impl.ConeTypeParameterTypeImpl
-import org.jetbrains.kotlin.load.kotlin.JvmDescriptorTypeWriter
+import org.jetbrains.kotlin.ir.util.*
 import org.jetbrains.kotlin.load.kotlin.TypeMappingMode
-import org.jetbrains.kotlin.name.Name
+import org.jetbrains.kotlin.name.SpecialNames
 import org.jetbrains.kotlin.types.AbstractTypeMapper
 import org.jetbrains.kotlin.types.TypeMappingContext
 import org.jetbrains.kotlin.types.TypeSystemCommonBackendContext
@@ -30,12 +35,13 @@ import org.jetbrains.kotlin.types.model.KotlinTypeMarker
 import org.jetbrains.kotlin.types.model.SimpleTypeMarker
 import org.jetbrains.kotlin.types.model.TypeConstructorMarker
 import org.jetbrains.kotlin.types.model.TypeParameterMarker
+import org.jetbrains.kotlin.utils.addToStdlib.runIf
 import org.jetbrains.org.objectweb.asm.Type
 
-class FirJvmTypeMapper(val session: FirSession) : TypeMappingContext<JvmDescriptorTypeWriter<Type>>, FirSessionComponent {
+class FirJvmTypeMapper(val session: FirSession) : TypeMappingContext<JvmSignatureWriter>, FirSessionComponent {
     override val typeContext = ConeTypeSystemCommonBackendContextForTypeMapping(session.typeContext)
 
-    fun mapType(type: ConeKotlinType, mode: TypeMappingMode = TypeMappingMode.DEFAULT, sw: JvmDescriptorTypeWriter<Type>? = null): Type {
+    fun mapType(type: ConeKotlinType, mode: TypeMappingMode = TypeMappingMode.DEFAULT, sw: JvmSignatureWriter? = null): Type {
         return AbstractTypeMapper.mapType(this, type, mode, sw)
     }
 
@@ -44,9 +50,128 @@ class FirJvmTypeMapper(val session: FirSession) : TypeMappingContext<JvmDescript
         return typeConstructor.classId.asString().replace(".", "$").replace("/", ".")
     }
 
-    override fun JvmDescriptorTypeWriter<Type>.writeGenericType(type: SimpleTypeMarker, asmType: Type, mode: TypeMappingMode) {
-        //TODO Make correct implementation
-        (this as JvmSignatureWriter).writeAsmType(asmType)
+    override fun JvmSignatureWriter.writeGenericType(type: SimpleTypeMarker, asmType: Type, mode: TypeMappingMode) {
+        if (type !is ConeClassLikeType) return
+        if (skipGenericSignature() || hasNothingInNonContravariantPosition(type) || type.typeArguments.isEmpty()) {
+            writeAsmType(asmType)
+            return
+        }
+
+        val possiblyInnerType = type.buildPossiblyInnerType() ?: error("possiblyInnerType with arguments should not be null")
+
+        val innerTypesAsList = possiblyInnerType.segments()
+
+        val indexOfParameterizedType = innerTypesAsList.indexOfFirst { innerPart -> innerPart.arguments.isNotEmpty() }
+        if (indexOfParameterizedType < 0 || innerTypesAsList.size == 1) {
+            writeClassBegin(asmType)
+            writeGenericArguments(this, possiblyInnerType, mode)
+        } else {
+            val outerType = innerTypesAsList[indexOfParameterizedType]
+
+            writeOuterClassBegin(asmType, mapType(outerType.classifier.fir.defaultType()).internalName)
+            writeGenericArguments(this, outerType, mode)
+
+            writeInnerParts(
+                innerTypesAsList,
+                this,
+                mode,
+                indexOfParameterizedType + 1
+            ) // inner parts separated by `.`
+        }
+
+        writeClassEnd()
+    }
+
+    private fun hasNothingInNonContravariantPosition(type: ConeKotlinType): Boolean = with(KotlinTypeMapper) {
+        typeContext.hasNothingInNonContravariantPosition(type)
+    }
+
+    private fun ConeClassLikeType.buildPossiblyInnerType(): PossiblyInnerConeType? =
+        buildPossiblyInnerType(lookupTag.toSymbol(session) as? FirRegularClassSymbol?, 0)
+
+    private fun ConeClassLikeType.parentClassOrNull(): FirRegularClassSymbol? {
+        val parentClassId = classId?.outerClassId ?: return null
+        return session.firSymbolProvider.getClassLikeSymbolByFqName(parentClassId) as? FirRegularClassSymbol?
+    }
+
+    private fun ConeClassLikeType.buildPossiblyInnerType(classifier: FirRegularClassSymbol?, index: Int): PossiblyInnerConeType? {
+        if (classifier == null) return null
+
+        val firClass = classifier.fir
+        val toIndex = firClass.typeParameters.count { it is FirTypeParameter } + index
+        if (!firClass.isInner) {
+            assert(toIndex == typeArguments.size || firClass.isLocal) {
+                "${typeArguments.size - toIndex} trailing arguments were found in this type: ${render()}"
+            }
+            return PossiblyInnerConeType(classifier, typeArguments.toList().subList(index, typeArguments.size), null)
+        }
+
+        val argumentsSubList = typeArguments.toList().subList(index, toIndex)
+        return PossiblyInnerConeType(
+            classifier, argumentsSubList,
+            buildPossiblyInnerType(firClass.defaultType().parentClassOrNull(), toIndex)
+        )
+    }
+
+    private class PossiblyInnerConeType(
+        val classifier: FirRegularClassSymbol,
+        val arguments: List<ConeTypeProjection>,
+        private val outerType: PossiblyInnerConeType?
+    ) {
+        fun segments(): List<PossiblyInnerConeType> = outerType?.segments().orEmpty() + this
+    }
+
+    private fun writeGenericArguments(
+        sw: JvmSignatureWriter,
+        type: PossiblyInnerConeType,
+        mode: TypeMappingMode
+    ) {
+        val classifier = type.classifier.fir
+        val defaultType = classifier.defaultType()
+        val parameters = classifier.typeParameters.map { it.symbol }
+        val arguments = type.arguments
+
+        if ((defaultType.isFunctionalType(session) && arguments.size > BuiltInFunctionArity.BIG_ARITY)
+            || defaultType.isKFunctionType(session)
+        ) {
+            writeGenericArguments(sw, listOf(arguments.last()), listOf(parameters.last()), mode)
+            return
+        }
+
+        writeGenericArguments(sw, arguments, parameters, mode)
+    }
+
+    private fun writeGenericArguments(
+        sw: JvmSignatureWriter,
+        arguments: List<ConeTypeProjection>,
+        parameterSymbols: List<FirTypeParameterSymbol>,
+        mode: TypeMappingMode
+    ) {
+        with(KotlinTypeMapper) {
+            val parameters = parameterSymbols.map { ConeTypeParameterLookupTag(it) }
+            typeContext.writeGenericArguments(sw, arguments, parameters, mode) { type, sw, mode ->
+                mapType(type as ConeKotlinType, mode, sw)
+            }
+        }
+    }
+
+    private fun writeInnerParts(
+        innerTypesAsList: List<PossiblyInnerConeType>,
+        sw: JvmSignatureWriter,
+        mode: TypeMappingMode,
+        index: Int
+    ) {
+        for (innerPart in innerTypesAsList.subList(index, innerTypesAsList.size)) {
+            sw.writeInnerClass(getJvmShortName(innerPart.classifier.fir))
+            writeGenericArguments(sw, innerPart, mode)
+        }
+    }
+
+    internal fun getJvmShortName(klass: FirRegularClass): String {
+        val result = runIf(!klass.isLocal) {
+            klass.classId.asSingleFqName().toUnsafe().let { JavaToKotlinClassMap.mapKotlinToJava(it)?.shortClassName?.asString() }
+        }
+        return result ?: SpecialNames.safeIdentifier(klass.name).identifier
     }
 }
 
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/InferenceUtils.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/InferenceUtils.kt
index 8551fa59352..20f9490b99a 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/InferenceUtils.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/InferenceUtils.kt
@@ -46,6 +46,11 @@ fun ConeKotlinType.isBuiltinFunctionalType(session: FirSession): Boolean {
             kind == FunctionClassKind.KSuspendFunction
 }
 
+fun ConeKotlinType.isFunctionalType(session: FirSession): Boolean {
+    val kind = functionClassKind(session) ?: return false
+    return kind == FunctionClassKind.Function
+}
+
 fun ConeKotlinType.isSuspendFunctionType(session: FirSession): Boolean {
     val kind = functionClassKind(session) ?: return false
     return kind == FunctionClassKind.SuspendFunction ||