diff --git a/doc/calendar/IconDoc.vue b/doc/calendar/IconDoc.vue
index c4d1aeda7..907ebdaeb 100644
--- a/doc/calendar/IconDoc.vue
+++ b/doc/calendar/IconDoc.vue
@@ -15,7 +15,7 @@
             <label for="templatedisplay" class="font-bold block mb-2"> Custom Icon </label>
             <Calendar v-model="templatedisplay" showIcon iconDisplay="input" timeOnly inputId="templatedisplay">
                 <template #inputicon="{ clickCallback }">
-                    <i class="pi pi-clock cursor-pointer" @click="clickCallback" />
+                    <InputIcon class="pi pi-clock cursor-pointer" @click="clickCallback" />
                 </template>
             </Calendar>
         </div>
@@ -36,7 +36,7 @@ export default {
 <Calendar v-model="icondisplay" showIcon iconDisplay="input" />
 <Calendar v-model="templatedisplay" showIcon iconDisplay="input" timeOnly>
     <template #inputicon="{ clickCallback }">
-        <i class="pi pi-clock cursor-pointer" @click="clickCallback" />
+        <InputIcon class="pi pi-clock cursor-pointer" @click="clickCallback" />
     </template>
 </Calendar>
 `,
@@ -55,7 +55,7 @@ export default {
             <label for="templatedisplay" class="font-bold block mb-2"> Custom Icon </label>
             <Calendar v-model="templatedisplay" showIcon iconDisplay="input" timeOnly inputId="templatedisplay">
                 <template #inputicon="{ clickCallback }">
-                    <i class="pi pi-clock cursor-pointer" @click="clickCallback" />
+                    <InputIcon class="pi pi-clock cursor-pointer" @click="clickCallback" />
                 </template>
             </Calendar>
         </div>
@@ -89,7 +89,7 @@ export default {
             <label for="templatedisplay" class="font-bold block mb-2"> Custom Icon </label>
             <Calendar v-model="templatedisplay" showIcon iconDisplay="input" timeOnly inputId="templatedisplay">
                 <template #inputicon="{ clickCallback }">
-                    <i class="pi pi-clock cursor-pointer" @click="clickCallback" />
+                    <InputIcon class="pi pi-clock cursor-pointer" @click="clickCallback" />
                 </template>
             </Calendar>
         </div>
diff --git a/doc/iconfield/BasicDoc.vue b/doc/iconfield/BasicDoc.vue
index 95b6cb181..8583009ec 100644
--- a/doc/iconfield/BasicDoc.vue
+++ b/doc/iconfield/BasicDoc.vue
@@ -7,16 +7,12 @@
     </DocSectionText>
     <div class="card flex flex-wrap justify-content-center gap-3">
         <IconField iconPosition="left">
-            <InputIcon>
-                <i class="pi pi-search" />
-            </InputIcon>
+            <InputIcon class="pi pi-search"> </InputIcon>
             <InputText v-model="value1" placeholder="Search" />
         </IconField>
 
         <IconField>
-            <InputIcon>
-                <i class="pi pi-spin pi-spinner" />
-            </InputIcon>
+            <InputIcon class="pi pi-spin pi-spinner"> </InputIcon>
             <InputText v-model="value2" />
         </IconField>
     </div>
@@ -32,16 +28,12 @@ export default {
             code: {
                 basic: `
 <IconField iconPosition="left">
-    <InputIcon>
-        <i class="pi pi-search" />
-    </InputIcon>
+    <InputIcon class="pi pi-search"> </InputIcon>
     <InputText v-model="value1" placeholder="Search" />
 </IconField>
 
 <IconField>
-    <InputIcon>
-        <i class="pi pi-spin pi-spinner" />
-    </InputIcon>
+    <InputIcon class="pi pi-spin pi-spinner"> </InputIcon>
     <InputText v-model="value2" />
 </IconField>
 `,
@@ -49,16 +41,13 @@ export default {
 <template>
     <div class="card flex flex-wrap justify-content-center gap-3">
         <IconField iconPosition="left">
-            <InputIcon>
-                <i class="pi pi-search" />
-            </InputIcon>
+            <IconField iconPosition="left">
+            <InputIcon class="pi pi-search"> </InputIcon>
             <InputText v-model="value1" placeholder="Search" />
         </IconField>
 
         <IconField>
-            <InputIcon>
-                <i class="pi pi-spin pi-spinner" />
-            </InputIcon>
+            <InputIcon class="pi pi-spin pi-spinner"> </InputIcon>
             <InputText v-model="value2" />
         </IconField>
     </div>
@@ -79,16 +68,12 @@ export default {
 <template>
     <div class="card flex flex-wrap justify-content-center gap-3">
         <IconField iconPosition="left">
-            <InputIcon>
-                <i class="pi pi-search" />
-            </InputIcon>
+            <InputIcon class="pi pi-search"> </InputIcon>
             <InputText v-model="value1" placeholder="Search" />
         </IconField>
 
         <IconField>
-            <InputIcon>
-                <i class="pi pi-spin pi-spinner" />
-            </InputIcon>
+            <InputIcon class="pi pi-spin pi-spinner"> </InputIcon>
             <InputText v-model="value2" />
         </IconField>
     </div>
diff --git a/doc/iconfield/TemplateDoc.vue b/doc/iconfield/TemplateDoc.vue
new file mode 100644
index 000000000..3f371e61c
--- /dev/null
+++ b/doc/iconfield/TemplateDoc.vue
@@ -0,0 +1,92 @@
+<template>
+    <DocSectionText v-bind="$attrs">
+        <p>Custom content inside an InputIcon is defined as children.</p>
+    </DocSectionText>
+    <div class="card flex justify-content-center">
+        <IconField iconPosition="left">
+            <InputIcon>
+                <svg width="14" height="16" viewBox="0 0 35 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+                    <path
+                        d="M25.87 18.05L23.16 17.45L25.27 20.46V29.78L32.49 23.76V13.53L29.18 14.73L25.87 18.04V18.05ZM25.27 35.49L29.18 31.58V27.67L25.27 30.98V35.49ZM20.16 17.14H20.03H20.17H20.16ZM30.1 5.19L34.89 4.81L33.08 12.33L24.1 15.67L30.08 5.2L30.1 5.19ZM5.72 14.74L2.41 13.54V23.77L9.63 29.79V20.47L11.74 17.46L9.03 18.06L5.72 14.75V14.74ZM9.63 30.98L5.72 27.67V31.58L9.63 35.49V30.98ZM4.8 5.2L10.78 15.67L1.81 12.33L0 4.81L4.79 5.19L4.8 5.2ZM24.37 21.05V34.59L22.56 37.29L20.46 39.4H14.44L12.34 37.29L10.53 34.59V21.05L12.42 18.23L17.45 26.8L22.48 18.23L24.37 21.05ZM22.85 0L22.57 0.69L17.45 13.08L12.33 0.69L12.05 0H22.85Z"
+                        fill="var(--primary-color)"
+                    />
+                    <path
+                        d="M30.69 4.21L24.37 4.81L22.57 0.69L22.86 0H26.48L30.69 4.21ZM23.75 5.67L22.66 3.08L18.05 14.24V17.14H19.7H20.03H20.16H20.2L24.1 15.7L30.11 5.19L23.75 5.67ZM4.21002 4.21L10.53 4.81L12.33 0.69L12.05 0H8.43002L4.22002 4.21H4.21002ZM21.9 17.4L20.6 18.2H14.3L13 17.4L12.4 18.2L12.42 18.23L17.45 26.8L22.48 18.23L22.5 18.2L21.9 17.4ZM4.79002 5.19L10.8 15.7L14.7 17.14H14.74H15.2H16.85V14.24L12.24 3.09L11.15 5.68L4.79002 5.2V5.19Z"
+                        fill="var(--text-color)"
+                    />
+                </svg>
+            </InputIcon>
+            <InputText v-model="value" placeholder="Search" />
+        </IconField>
+    </div>
+    <DocSectionCode :code="code" />
+</template>
+
+<script>
+export default {
+    data() {
+        return {
+            value: null,
+            code: {
+                basic: `
+<IconField iconPosition="left">
+    <InputIcon>
+        <svg width="35" height="40" viewBox="0 0 35 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+            <path d="..." fill="var(--primary-color)" />
+            <path d="..." fill="var(--text-color)" />
+        </svg>
+    </InputIcon>
+    <InputText v-model="value" placeholder="Search" />
+</IconField>
+`,
+                options: `
+<template>
+    <div class="card flex justify-content-center">
+        <IconField iconPosition="left">
+            <InputIcon>
+                <svg width="35" height="40" viewBox="0 0 35 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+                    <path d="..." fill="var(--primary-color)" />
+                    <path d="..." fill="var(--text-color)" />
+                </svg>
+            </InputIcon>
+            <InputText v-model="value" placeholder="Search" />
+        </IconField>
+    </div>
+</template>
+
+<script setup>
+export default {
+    data() {
+        return {
+            value: null
+        }
+    }
+}
+<\/script>
+`,
+                composition: `
+<template>
+    <div class="card flex justify-content-center">
+        <IconField iconPosition="left">
+            <InputIcon>
+                <svg width="35" height="40" viewBox="0 0 35 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+                    <path d="..." fill="var(--primary-color)" />
+                    <path d="..." fill="var(--text-color)" />
+                </svg>
+            </InputIcon>
+            <InputText v-model="value" placeholder="Search" />
+        </IconField>
+    </div>
+</template>
+
+<script setup>
+import { ref } from 'vue';
+
+const value = ref(null);
+<\/script>
+`
+            }
+        };
+    }
+};
+</script>
diff --git a/doc/iconfield/theming/StyledDoc.vue b/doc/iconfield/theming/StyledDoc.vue
index 5e1b7be5b..de3a07ec0 100644
--- a/doc/iconfield/theming/StyledDoc.vue
+++ b/doc/iconfield/theming/StyledDoc.vue
@@ -11,13 +11,21 @@
                 </thead>
                 <tbody>
                     <tr>
-                        <td>p-input-icon-right</td>
+                        <td>p-icon-field</td>
+                        <td>Container of element.</td>
+                    </tr>
+                    <tr>
+                        <td>p-icon-field-right</td>
                         <td>Right input icon element.</td>
                     </tr>
                     <tr>
-                        <td>p-input-icon-left</td>
+                        <td>p-icon-field-left</td>
                         <td>Left input icon element.</td>
                     </tr>
+                    <tr>
+                        <td>p-input-icon</td>
+                        <td>Container of input icon.</td>
+                    </tr>
                 </tbody>
             </table>
         </div>
diff --git a/pages/iconfield/index.vue b/pages/iconfield/index.vue
index f7ebaaf54..3465dfe51 100644
--- a/pages/iconfield/index.vue
+++ b/pages/iconfield/index.vue
@@ -6,6 +6,7 @@
 import AccessibilityDoc from '@/doc/iconfield/AccessibilityDoc.vue';
 import BasicDoc from '@/doc/iconfield/BasicDoc.vue';
 import ImportDoc from '@/doc/iconfield/ImportDoc.vue';
+import TemplateDoc from '@/doc/iconfield/TemplateDoc.vue';
 import PTComponent from '@/doc/iconfield/pt/index.vue';
 import ThemingDoc from '@/doc/iconfield/theming/index.vue';
 
@@ -23,6 +24,11 @@ export default {
                     label: 'Basic',
                     component: BasicDoc
                 },
+                {
+                    id: 'template',
+                    label: 'Template',
+                    component: TemplateDoc
+                },
                 {
                     id: 'accessibility',
                     label: 'Accessibility',