diff --git a/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt b/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt
index 628be78fe26..a3dd37b11d1 100644
--- a/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt
+++ b/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt
@@ -170,6 +170,7 @@ fun createSpacingBuilder(settings: CodeStyleSettings, builderUtil: KotlinSpacing
             betweenInside(TYPE_REFERENCE, DOT, FUN).spacing(0, 0, 0, false, 0)
             betweenInside(DOT, IDENTIFIER, FUN).spacing(0, 0, 0, false, 0)
             afterInside(IDENTIFIER, FUN).spacing(0, 0, 0, false, 0)
+            aroundInside(DOT, USER_TYPE).spaces(0)
 
             around(AS_KEYWORD).spaces(1)
             around(IS_KEYWORD).spaces(1)
@@ -211,6 +212,7 @@ fun createSpacingBuilder(settings: CodeStyleSettings, builderUtil: KotlinSpacing
             beforeInside(RPAR, VALUE_ARGUMENT_LIST).spaces(0)
             afterInside(LT, TYPE_ARGUMENT_LIST).spaces(0)
             beforeInside(GT, TYPE_ARGUMENT_LIST).spaces(0)
+            before(TYPE_ARGUMENT_LIST).spaces(0)
 
             betweenInside(FOR_KEYWORD, LPAR, FOR).spacing(1, 1, 0, false, 0)
             betweenInside(IF_KEYWORD, LPAR, IF).spacing(1, 1, 0, false, 0)
diff --git a/idea/testData/formatter/SpaceAroundDotInUserReference.after.kt b/idea/testData/formatter/SpaceAroundDotInUserReference.after.kt
new file mode 100644
index 00000000000..27e5cf8343f
--- /dev/null
+++ b/idea/testData/formatter/SpaceAroundDotInUserReference.after.kt
@@ -0,0 +1,4 @@
+fun some(param: kotlin.Int): kotlin.Int {
+    val num: kotlin.Int = 0
+    return num
+}
diff --git a/idea/testData/formatter/SpaceAroundDotInUserReference.kt b/idea/testData/formatter/SpaceAroundDotInUserReference.kt
new file mode 100644
index 00000000000..5efec6119be
--- /dev/null
+++ b/idea/testData/formatter/SpaceAroundDotInUserReference.kt
@@ -0,0 +1,4 @@
+fun some(param: kotlin   .   Int): kotlin   .Int {
+    val num: kotlin.   Int = 0
+    return num
+}
diff --git a/idea/testData/formatter/SpaceBeforeTypeArgumentList.after.kt b/idea/testData/formatter/SpaceBeforeTypeArgumentList.after.kt
new file mode 100644
index 00000000000..9f0644a2d1e
--- /dev/null
+++ b/idea/testData/formatter/SpaceBeforeTypeArgumentList.after.kt
@@ -0,0 +1,4 @@
+fun some(param: List<Int>): List<Int> {
+    val list = emptyList<Int>()
+    return list
+}
diff --git a/idea/testData/formatter/SpaceBeforeTypeArgumentList.kt b/idea/testData/formatter/SpaceBeforeTypeArgumentList.kt
new file mode 100644
index 00000000000..223777e97b1
--- /dev/null
+++ b/idea/testData/formatter/SpaceBeforeTypeArgumentList.kt
@@ -0,0 +1,4 @@
+fun some(param: List   <Int>): List   <Int> {
+    val list = emptyList   <Int>()
+    return list
+}
diff --git a/idea/tests/org/jetbrains/kotlin/formatter/FormatterTestGenerated.java b/idea/tests/org/jetbrains/kotlin/formatter/FormatterTestGenerated.java
index 548395871bc..e4ca7626f7a 100644
--- a/idea/tests/org/jetbrains/kotlin/formatter/FormatterTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/formatter/FormatterTestGenerated.java
@@ -572,6 +572,12 @@ public class FormatterTestGenerated extends AbstractFormatterTest {
             doTest(fileName);
         }
 
+        @TestMetadata("SpaceAroundDotInUserReference.after.kt")
+        public void testSpaceAroundDotInUserReference() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/SpaceAroundDotInUserReference.after.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("SpaceAroundExtendColon.after.kt")
         public void testSpaceAroundExtendColon() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/SpaceAroundExtendColon.after.kt");
@@ -602,6 +608,12 @@ public class FormatterTestGenerated extends AbstractFormatterTest {
             doTest(fileName);
         }
 
+        @TestMetadata("SpaceBeforeTypeArgumentList.after.kt")
+        public void testSpaceBeforeTypeArgumentList() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/SpaceBeforeTypeArgumentList.after.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("SpacedInsideParans.after.kt")
         public void testSpacedInsideParans() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/SpacedInsideParans.after.kt");