diff --git a/common/src/main/java/com/itsaky/androidide/fragments/BaseFragment.kt b/common/src/main/java/com/itsaky/androidide/fragments/BaseFragment.kt
index 791e793cf..e5a04da2d 100755
--- a/common/src/main/java/com/itsaky/androidide/fragments/BaseFragment.kt
+++ b/common/src/main/java/com/itsaky/androidide/fragments/BaseFragment.kt
@@ -15,20 +15,6 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-/**
- * This file is part of AndroidIDE.
- *
- * AndroidIDE is free software: you can redistribute it and/or modify it under the terms of the GNU
- * General Public License as published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * AndroidIDE is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
- * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with AndroidIDE. If not,
- * see <https:></https:>//www.gnu.org/licenses/>.
- */
 package com.itsaky.androidide.fragments
 
 import android.content.Intent
diff --git a/templates-api/src/main/java/com/itsaky/androidide/templates/parameters.kt b/templates-api/src/main/java/com/itsaky/androidide/templates/parameters.kt
index c70cf7cb4..196628b57 100644
--- a/templates-api/src/main/java/com/itsaky/androidide/templates/parameters.kt
+++ b/templates-api/src/main/java/com/itsaky/androidide/templates/parameters.kt
@@ -17,6 +17,7 @@
 
 package com.itsaky.androidide.templates
 
+import android.view.View
 import androidx.annotation.StringRes
 import com.itsaky.androidide.templates.Language.Java
 import com.itsaky.androidide.templates.Language.Kotlin
@@ -226,24 +227,24 @@ abstract class TextFieldParameter<T>(@StringRes name: Int,
                                      @StringRes description: Int?, default: T,
                                      val startIcon: ((TextFieldParameter<T>) -> Int)?,
                                      val endIcon: ((TextFieldParameter<T>) -> Int)?,
-                                     val onStartIconClick: (() -> Unit)?,
-                                     val onEndIconClick: (() -> Unit)?,
+                                     val onStartIconClick: View.OnClickListener?,
+                                     val onEndIconClick: View.OnClickListener?,
                                      constraints: List<ParameterConstraint>
 ) : Parameter<T>(name, description, default, constraints)
 
 abstract class TextFieldParameterBuilder<T>(
   var startIcon: ((TextFieldParameter<T>) -> Int)? = null,
   var endIcon: ((TextFieldParameter<T>) -> Int)? = null,
-  var onStartIconClick: (() -> Unit)? = null,
-  var onEndIconClick: (() -> Unit)? = null
+  var onStartIconClick: View.OnClickListener? = null,
+  var onEndIconClick: View.OnClickListener? = null
 ) : ParameterBuilder<T>()
 
 class StringParameter(@StringRes name: Int, @StringRes description: Int?,
                       default: String,
                       startIcon: ((TextFieldParameter<String>) -> Int)?,
                       endIcon: ((TextFieldParameter<String>) -> Int)?,
-                      onStartIconClick: (() -> Unit)?,
-                      onEndIconClick: (() -> Unit)?,
+                      onStartIconClick: View.OnClickListener?,
+                      onEndIconClick: View.OnClickListener?,
                       constraints: List<ParameterConstraint>
 ) : TextFieldParameter<String>(name, description, default, startIcon, endIcon,
   onStartIconClick, onEndIconClick, constraints)
@@ -262,8 +263,8 @@ class EnumParameter<T : Enum<*>>(@StringRes name: Int,
                                  @StringRes description: Int?, default: T,
                                  startIcon: ((TextFieldParameter<T>) -> Int)?,
                                  endIcon: ((TextFieldParameter<T>) -> Int)?,
-                                 onStartIconClick: (() -> Unit)?,
-                                 onEndIconClick: (() -> Unit)?,
+                                 onStartIconClick: View.OnClickListener?,
+                                 onEndIconClick: View.OnClickListener?,
                                  constraints: List<ParameterConstraint>,
                                  val displayName: ((T) -> String)? = null,
                                  val filter: ((T) -> Boolean)? = null
diff --git a/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/TemplateWidgetViewProviderImpl.kt b/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/TemplateWidgetViewProviderImpl.kt
index 7e2a9282e..e2c59adfc 100644
--- a/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/TemplateWidgetViewProviderImpl.kt
+++ b/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/TemplateWidgetViewProviderImpl.kt
@@ -214,16 +214,12 @@ class TemplateWidgetViewProviderImpl : ITemplateWidgetViewProvider {
   ) {
     startIcon?.let {
       root.startIconDrawable = ContextCompat.getDrawable(context, it(this))
-      onStartIconClick?.let { onClick ->
-        root.setStartIconOnClickListener { onClick() }
-      }
+      onStartIconClick?.let(root::setStartIconOnClickListener)
     }
 
     endIcon?.let {
       root.endIconDrawable = ContextCompat.getDrawable(context, it(this))
-      onEndIconClick?.let { onClick ->
-        root.setEndIconOnClickListener { onClick() }
-      }
+      onEndIconClick?.let(root::setEndIconOnClickListener)
     }
   }
 }
\ No newline at end of file