diff --git a/gradle/android-mixed-java-kotlin-project/AndroidSample/build.gradle b/gradle/android-mixed-java-kotlin-project/AndroidSample/build.gradle
index 6b1da39bb7..2d84549e6f 100644
--- a/gradle/android-mixed-java-kotlin-project/AndroidSample/build.gradle
+++ b/gradle/android-mixed-java-kotlin-project/AndroidSample/build.gradle
@@ -7,7 +7,7 @@ buildscript {
     }
     dependencies {
         classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:0.1-SNAPSHOT'
-        classpath 'com.android.tools.build:gradle:1.1.0'
+        classpath 'com.android.tools.build:gradle:1.3.0'
     }
 }
 apply plugin: 'com.android.application'
@@ -22,12 +22,12 @@ repositories {
 
 dependencies {
     compile files('libs/android-support-v4.jar')
-    compile 'org.jetbrains.kotlin:kotlin-stdlib:0.1-SNAPSHOT'
+    compile 'org.jetbrains.kotlin:kotlin-stdlib:0.12.1230'
 }
 
 android {
-    compileSdkVersion 19
-    buildToolsVersion "19.1"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.0"
 
     defaultConfig {
         minSdkVersion 7
diff --git a/gradle/android-mixed-java-kotlin-project/AndroidSample/src/main/AndroidManifest.xml b/gradle/android-mixed-java-kotlin-project/AndroidSample/src/main/AndroidManifest.xml
index b8a39f7c4e..eae76afc80 100644
--- a/gradle/android-mixed-java-kotlin-project/AndroidSample/src/main/AndroidManifest.xml
+++ b/gradle/android-mixed-java-kotlin-project/AndroidSample/src/main/AndroidManifest.xml
@@ -6,17 +6,17 @@
 
     <uses-sdk
         android:minSdkVersion="7"
-        android:targetSdkVersion="16" />
+        android:targetSdkVersion="23" />
 
     <application
         android:allowBackup="true"
-        android:icon="@drawable/ic_launcher"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
         <activity
             android:name="org.jetbrains.kotlin.gradle.androidsample.MainActivity"
             android:label="@string/title_activity_main_activity1" >
-            <intent-filter>
+            <intent-filter android:label="@string/app_name">
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
diff --git a/gradle/android-mixed-java-kotlin-project/AndroidSample/src/main/kotlin/org/jetbrains/kotlin/gradle/androidsample/MainActivity2.kt b/gradle/android-mixed-java-kotlin-project/AndroidSample/src/main/kotlin/org/jetbrains/kotlin/gradle/androidsample/MainActivity2.kt
index 3c49b7bc2e..f27d3a0a60 100644
--- a/gradle/android-mixed-java-kotlin-project/AndroidSample/src/main/kotlin/org/jetbrains/kotlin/gradle/androidsample/MainActivity2.kt
+++ b/gradle/android-mixed-java-kotlin-project/AndroidSample/src/main/kotlin/org/jetbrains/kotlin/gradle/androidsample/MainActivity2.kt
@@ -15,17 +15,10 @@ open class MainActivity2 : Activity() {
         setContentView(R.layout.activity_main2)
 
         var next: Button = findViewById(R.id.Button02) as Button
-        next.setOnClickListener(object : View.OnClickListener {
-            public override fun onClick(view: View) {
-                val intent: Intent = Intent()
-                setResult(Activity.RESULT_OK, intent)
-                finish()
-            }
-        })
+        next.setOnClickListener {  finish()  }
     }
 
     public override fun onCreateOptionsMenu(menu: Menu?): Boolean {
-        // Inflate the menu; this adds items to the action bar if it is present.
         getMenuInflater().inflate(R.menu.main_activity2, menu)
         return true
     }
diff --git a/gradle/android-mixed-java-kotlin-project/AndroidSample/src/main/res/drawable-hdpi/ic_launcher.png b/gradle/android-mixed-java-kotlin-project/AndroidSample/src/main/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index 96a442e5b8..0000000000
Binary files a/gradle/android-mixed-java-kotlin-project/AndroidSample/src/main/res/drawable-hdpi/ic_launcher.png and /dev/null differ
diff --git a/gradle/android-mixed-java-kotlin-project/AndroidSample/src/main/res/drawable-mdpi/ic_launcher.png b/gradle/android-mixed-java-kotlin-project/AndroidSample/src/main/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index 359047dfa4..0000000000
Binary files a/gradle/android-mixed-java-kotlin-project/AndroidSample/src/main/res/drawable-mdpi/ic_launcher.png and /dev/null differ
diff --git a/gradle/android-mixed-java-kotlin-project/AndroidSample/src/main/res/drawable-xhdpi/ic_launcher.png b/gradle/android-mixed-java-kotlin-project/AndroidSample/src/main/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100644
index 71c6d760f0..0000000000
Binary files a/gradle/android-mixed-java-kotlin-project/AndroidSample/src/main/res/drawable-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/gradle/android-mixed-java-kotlin-project/AndroidSample/src/main/res/layout/activity_main.xml b/gradle/android-mixed-java-kotlin-project/AndroidSample/src/main/res/layout/activity_main.xml
index ede57c3902..7d651a9d73 100644
--- a/gradle/android-mixed-java-kotlin-project/AndroidSample/src/main/res/layout/activity_main.xml
+++ b/gradle/android-mixed-java-kotlin-project/AndroidSample/src/main/res/layout/activity_main.xml
@@ -15,10 +15,10 @@
         android:text="Activity 1" />
 
     <Button android:text="Next"
-            android:id="@+id/Button01"
-            android:layout_width="250px"
-            android:textSize="18px"
-            android:layout_height="55px">
+        android:id="@+id/Button01"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="20sp">
     </Button>
 
 </LinearLayout>
diff --git a/gradle/android-mixed-java-kotlin-project/AndroidSample/src/main/res/layout/activity_main2.xml b/gradle/android-mixed-java-kotlin-project/AndroidSample/src/main/res/layout/activity_main2.xml
index d707536a92..73dab60944 100644
--- a/gradle/android-mixed-java-kotlin-project/AndroidSample/src/main/res/layout/activity_main2.xml
+++ b/gradle/android-mixed-java-kotlin-project/AndroidSample/src/main/res/layout/activity_main2.xml
@@ -14,11 +14,11 @@
             android:layout_height="wrap_content"
             android:text="Activity 2" />
 
-    <Button android:text="Next"
+    <Button android:text="Close"
             android:id="@+id/Button02"
-            android:layout_width="250px"
-            android:textSize="18px"
-            android:layout_height="55px">
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="20sp">
     </Button>
 
 </LinearLayout>
diff --git a/gradle/android-mixed-java-kotlin-project/AndroidSample/src/main/res/mipmap-hdpi/ic_launcher.png b/gradle/android-mixed-java-kotlin-project/AndroidSample/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100755
index 0000000000..d3d607a6b1
Binary files /dev/null and b/gradle/android-mixed-java-kotlin-project/AndroidSample/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/gradle/android-mixed-java-kotlin-project/AndroidSample/src/main/res/mipmap-mdpi/ic_launcher.png b/gradle/android-mixed-java-kotlin-project/AndroidSample/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100755
index 0000000000..fc54a95df3
Binary files /dev/null and b/gradle/android-mixed-java-kotlin-project/AndroidSample/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/gradle/android-mixed-java-kotlin-project/AndroidSample/src/main/res/mipmap-xhdpi/ic_launcher.png b/gradle/android-mixed-java-kotlin-project/AndroidSample/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100755
index 0000000000..d217209292
Binary files /dev/null and b/gradle/android-mixed-java-kotlin-project/AndroidSample/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/gradle/android-mixed-java-kotlin-project/AndroidSample/src/main/res/mipmap-xxhdpi/ic_launcher.png b/gradle/android-mixed-java-kotlin-project/AndroidSample/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100755
index 0000000000..0b4d723159
Binary files /dev/null and b/gradle/android-mixed-java-kotlin-project/AndroidSample/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/gradle/android-mixed-java-kotlin-project/AndroidSample/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/gradle/android-mixed-java-kotlin-project/AndroidSample/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100755
index 0000000000..1e35083581
Binary files /dev/null and b/gradle/android-mixed-java-kotlin-project/AndroidSample/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/gradle/android-mixed-java-kotlin-project/AndroidSample/src/main/res/values/strings.xml b/gradle/android-mixed-java-kotlin-project/AndroidSample/src/main/res/values/strings.xml
index d8f08bc2ab..6593a03db4 100644
--- a/gradle/android-mixed-java-kotlin-project/AndroidSample/src/main/res/values/strings.xml
+++ b/gradle/android-mixed-java-kotlin-project/AndroidSample/src/main/res/values/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">AndroidSample</string>
+    <string name="app_name">Kotlin - AndroidSample</string>
     <string name="action_settings">Settings</string>
     <string name="hello_world">Hello world!</string>
     <string name="title_activity_main_activity1">JavaActivity</string>
diff --git a/gradle/android-mixed-java-kotlin-project/gradle/wrapper/gradle-wrapper.properties b/gradle/android-mixed-java-kotlin-project/gradle/wrapper/gradle-wrapper.properties
index b53ebb08f9..7d804b0f99 100644
--- a/gradle/android-mixed-java-kotlin-project/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/android-mixed-java-kotlin-project/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue May 05 20:30:27 MSK 2015
+#Mon Sep 14 15:13:35 CEST 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.3-all.zip