diff --git a/app/src/main/java/com/itsaky/androidide/actions/filetree/NewFileAction.kt b/app/src/main/java/com/itsaky/androidide/actions/filetree/NewFileAction.kt
index 2b0a8398b6..3e4a61c750 100644
--- a/app/src/main/java/com/itsaky/androidide/actions/filetree/NewFileAction.kt
+++ b/app/src/main/java/com/itsaky/androidide/actions/filetree/NewFileAction.kt
@@ -168,6 +168,15 @@ class NewFileAction(
 		val builder = DialogUtils.newMaterialDialogBuilder(context)
 		val binding: LayoutCreateFileJavaBinding =
 			LayoutCreateFileJavaBinding.inflate(LayoutInflater.from(context))
+		binding.languageGroup.addOnButtonCheckedListener { _, _, _ ->
+			binding.typeClass.setIconResource(
+				if (binding.languageGroup.checkedButtonId == binding.langKotlin.id) {
+					R.drawable.ic_language_kotlin
+				} else {
+					R.drawable.ic_language_java
+				},
+			)
+		}
 		binding.typeGroup.addOnButtonCheckedListener { _, _, _ ->
 			binding.createLayout.isVisible = binding.typeGroup.checkedButtonId == binding.typeActivity.id
 		}
diff --git a/resources/src/main/res/color/button_outlined_background_selector.xml b/resources/src/main/res/color/button_outlined_background_selector.xml
new file mode 100644
index 0000000000..0081af738c
--- /dev/null
+++ b/resources/src/main/res/color/button_outlined_background_selector.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item
+		android:color="?attr/colorPrimary"
+		android:state_checked="true"
+		android:state_enabled="true" />
+	<item android:color="?attr/colorContainer" />
+</selector>
diff --git a/resources/src/main/res/color/button_outlined_foreground_selector.xml b/resources/src/main/res/color/button_outlined_foreground_selector.xml
new file mode 100644
index 0000000000..0a0a352ea7
--- /dev/null
+++ b/resources/src/main/res/color/button_outlined_foreground_selector.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item
+		android:alpha="0.38"
+		android:color="?attr/colorOnSurface"
+		android:state_enabled="false" />
+	<item
+		android:color="?attr/colorOnContainer"
+		android:state_checkable="false" />
+	<item
+		android:color="?attr/colorOnPrimary"
+		android:state_checked="true" />
+	<item android:color="?attr/colorOnSurface" />
+</selector>
diff --git a/resources/src/main/res/values/styles.xml b/resources/src/main/res/values/styles.xml
index db873d2e23..a6463ae45e 100755
--- a/resources/src/main/res/values/styles.xml
+++ b/resources/src/main/res/values/styles.xml
@@ -55,6 +55,15 @@
 		<item name="shapeAppearanceLargeComponent">@style/AppTheme.ShapeOverlay.Large</item>
 		<item name="textAppearanceBodySmall">@style/TextAppearance.AndroidIDE.BodySmall</item>
 		<item name="colorSuccess">@color/green_500</item>
+		<item name="materialButtonOutlinedStyle">@style/Widget.AndroidIDE.Button.OutlinedButton</item>
+	</style>
+
+	<style
+		name="Widget.AndroidIDE.Button.OutlinedButton"
+		parent="Widget.Material3.Button.OutlinedButton">
+		<item name="backgroundTint">@color/button_outlined_background_selector</item>
+		<item name="android:textColor">@color/button_outlined_foreground_selector</item>
+		<item name="iconTint">@color/button_outlined_foreground_selector</item>
 	</style>
 
 	<style