diff --git a/resources/templates/provision/fanvil/x5s/{$mac}.cfg b/resources/templates/provision/fanvil/x5s/{$mac}.cfg
index d45e40708f..8883212536 100644
--- a/resources/templates/provision/fanvil/x5s/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x5s/{$mac}.cfg
@@ -1738,194 +1738,198 @@
         <Extern3PageBelong>0</Extern3PageBelong>
         <Extern4PageBelong>0</Extern4PageBelong>
         <Extern5PageBelong>0</Extern5PageBelong>
-{strip}{*-- Each Internal Index contains 8 keys --*}{/strip}        
+        {strip}{*-- Each Internal Index contains 8 keys --*}{/strip}        
 
         <internal index="1">
-{foreach $keys["line"] as $row}
-{if $row.device_key_id <= 8}
+        {foreach $keys["line"] as $row}
+        {if $row.device_key_id <= 8}
             <Fkey index="{$row.device_key_id}">
                 <Type>{if $row.device_key_type == 3}0{elseif $row.device_key_type == 1}2{else}1{/if}</Type>
                 <Value>{if $row.device_key_type == 3}{elseif $row.device_key_type == 1}SIP{$row.device_key_line}{else}{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}{/if}</Value>
                 <Title>{$row.device_key_label}</Title>
                 <ICON>{$row.device_key_icon}</ICON>
             </Fkey>
-{/if}
-{/foreach}
+        {/if}
+        {/foreach}
         </internal>
         <internal index="2">
-{foreach $keys["line"] as $row}
-{if $row.device_key_id > 8 && $row.device_key_id <= 16}
+        {foreach $keys["line"] as $row}
+        {if $row.device_key_id > 8 && $row.device_key_id <= 16}
             <Fkey index="{$row.device_key_id-8}">
                 <Type>{if $row.device_key_type == 3}0{elseif $row.device_key_type == 1}2{else}1{/if}</Type>
                 <Value>{if $row.device_key_type == 3}{elseif $row.device_key_type == 1}SIP{$row.device_key_line}{else}{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}{/if}</Value>
                 <Title>{$row.device_key_label}</Title>
                 <ICON>{$row.device_key_icon}</ICON>
             </Fkey>
-{/if}
-{/foreach}
+        {/if}
+        {/foreach}
         </internal>
         <internal index="3">
-{foreach $keys["line"] as $row}
-{if $row.device_key_id > 16 && $row.device_key_id <= 24}
+        {foreach $keys["line"] as $row}
+        {if $row.device_key_id > 16 && $row.device_key_id <= 24}
             <Fkey index="{$row.device_key_id-16}">
                 <Type>{if $row.device_key_type == 3}0{elseif $row.device_key_type == 1}2{else}1{/if}</Type>
                 <Value>{if $row.device_key_type == 3}{elseif $row.device_key_type == 1}SIP{$row.device_key_line}{else}{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}{/if}</Value>
                 <Title>{$row.device_key_label}</Title>
                 <ICON>{$row.device_key_icon}</ICON>
             </Fkey>
-{/if}
-{/foreach}
+        {/if}
+        {/foreach}
         </internal>
         <internal index="4">
-{foreach $keys["line"] as $row}
-{if $row.device_key_id > 24 && $row.device_key_id <= 32}
+        {foreach $keys["line"] as $row}
+        {if $row.device_key_id > 24 && $row.device_key_id <= 32}
             <Fkey index="{$row.device_key_id-24}">
                 <Type>{if $row.device_key_type == 3}0{elseif $row.device_key_type == 1}2{else}1{/if}</Type>
                 <Value>{if $row.device_key_type == 3}{elseif $row.device_key_type == 1}SIP{$row.device_key_line}{else}{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}{/if}</Value>
                 <Title>{$row.device_key_label}</Title>
                 <ICON>{$row.device_key_icon}</ICON>
             </Fkey>
-{/if}
-{/foreach}
+        {/if}
+        {/foreach}
         </internal>
         <internal index="5">
-{foreach $keys["line"] as $row}
-{if $row.device_key_id > 32 && $row.device_key_id <= 40}
+        {foreach $keys["line"] as $row}
+        {if $row.device_key_id > 32 && $row.device_key_id <= 40}
             <Fkey index="{$row.device_key_id-32}">
                 <Type>{if $row.device_key_type == 3}0{elseif $row.device_key_type == 1}2{else}1{/if}</Type>
                 <Value>{if $row.device_key_type == 3}{elseif $row.device_key_type == 1}SIP{$row.device_key_line}{else}{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}{/if}</Value>
                 <Title>{$row.device_key_label}</Title>
                 <ICON>{$row.device_key_icon}</ICON>
             </Fkey>
-{/if}
-{/foreach}
+        {/if}
+        {/foreach}
         </internal>
 
         <internal index="1">
-{foreach $keys["memory"] as $row}
-{if $row.device_key_id <= 8}
+        {foreach $keys["memory"] as $row}
+        {if $row.device_key_id <= 8}
             <Fkey index="{$row.device_key_id}">
                 <Type>{if $row.device_key_type == 3}0{elseif $row.device_key_type == 1}2{else}1{/if}</Type>
                 <Value>{if $row.device_key_type == 3}{elseif $row.device_key_type == 1}SIP{$row.device_key_line}{else}{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}{/if}</Value>
                 <Title>{$row.device_key_label}</Title>
                 <ICON>{$row.device_key_icon}</ICON>
             </Fkey>
-{/if}
-{/foreach}
+        {/if}
+        {/foreach}
         </internal>
         <internal index="2">
-{foreach $keys["memory"] as $row}
-{if $row.device_key_id > 8 && $row.device_key_id <= 16}
+        {foreach $keys["memory"] as $row}
+        {if $row.device_key_id > 8 && $row.device_key_id <= 16}
             <Fkey index="{$row.device_key_id-8}">
                 <Type>{if $row.device_key_type == 3}0{elseif $row.device_key_type == 1}2{else}1{/if}</Type>
                 <Value>{if $row.device_key_type == 3}{elseif $row.device_key_type == 1}SIP{$row.device_key_line}{else}{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}{/if}</Value>
                 <Title>{$row.device_key_label}</Title>
                 <ICON>{$row.device_key_icon}</ICON>
             </Fkey>
-{/if}
-{/foreach}
+        {/if}
+        {/foreach}
         </internal>
         <internal index="3">
-{foreach $keys["memory"] as $row}
-{if $row.device_key_id > 16 && $row.device_key_id <= 24}
+        {foreach $keys["memory"] as $row}
+        {if $row.device_key_id > 16 && $row.device_key_id <= 24}
             <Fkey index="{$row.device_key_id-16}">
                 <Type>{if $row.device_key_type == 3}0{elseif $row.device_key_type == 1}2{else}1{/if}</Type>
                 <Value>{if $row.device_key_type == 3}{elseif $row.device_key_type == 1}SIP{$row.device_key_line}{else}{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}{/if}</Value>
                 <Title>{$row.device_key_label}</Title>
                 <ICON>{$row.device_key_icon}</ICON>
             </Fkey>
-{/if}
-{/foreach}
+        {/if}
+        {/foreach}
         </internal>
         <internal index="4">
-{foreach $keys["memory"] as $row}
-{if $row.device_key_id > 24 && $row.device_key_id <= 32}
+        {foreach $keys["memory"] as $row}
+        {if $row.device_key_id > 24 && $row.device_key_id <= 32}
             <Fkey index="{$row.device_key_id-24}">
                 <Type>{if $row.device_key_type == 3}0{elseif $row.device_key_type == 1}2{else}1{/if}</Type>
                 <Value>{if $row.device_key_type == 3}{elseif $row.device_key_type == 1}SIP{$row.device_key_line}{else}{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}{/if}</Value>
                 <Title>{$row.device_key_label}</Title>
                 <ICON>{$row.device_key_icon}</ICON>
             </Fkey>
-{/if}
-{/foreach}
+        {/if}
+        {/foreach}
         </internal>
         <internal index="5">
-{foreach $keys["memory"] as $row}
-{if $row.device_key_id > 32 && $row.device_key_id <= 40}
+        {foreach $keys["memory"] as $row}
+        {if $row.device_key_id > 32 && $row.device_key_id <= 40}
             <Fkey index="{$row.device_key_id-32}">
                 <Type>{if $row.device_key_type == 3}0{elseif $row.device_key_type == 1}2{else}1{/if}</Type>
                 <Value>{if $row.device_key_type == 3}{elseif $row.device_key_type == 1}SIP{$row.device_key_line}{else}{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}{/if}</Value>
                 <Title>{$row.device_key_label}</Title>
                 <ICON>{$row.device_key_icon}</ICON>
             </Fkey>
-{/if}
-{/foreach}
+        {/if}
+        {/foreach}
         </internal>
 
-
-
-{foreach $keys["programmable"] as $row}
+        {foreach $keys["programmable"] as $row}
         <dssSoft index="{$row.device_key_id}">
             <Type>{if $row.device_key_type == 3}0{elseif $row.device_key_type == 1}2{else}1{/if}</Type>
             <Value>{if $row.device_key_type == 3}{elseif $row.device_key_type == 1}SIP{$row.device_key_line}{else}{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}{/if}</Value>
             <Title>{$row.device_key_label}</Title>
+            <ICON>{$row.device_key_icon}</ICON>
         </dssSoft>
-{/foreach}
-{strip}{*-- Each External Index contains 20 keys --*}{/strip}
+        {/foreach}
+        {strip}{*-- Each External Index contains 20 keys --*}{/strip}
         <external index="1">        
-{foreach $keys["expansion"] as $row}
-{if $row.device_key_id < 20}
+        {foreach $keys["expansion"] as $row}
+        {if $row.device_key_id < 20}
             <exKey index="{$row.device_key_id}">
                 <Type>0</Type>
                 <Value>{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}</Value>
                 <Title>{$row.device_key_label}</Title>
+                <ICON>{$row.device_key_icon}</ICON>
             </exKey>
-{/if}
-{/foreach}
+        {/if}
+        {/foreach}
         </external>
         <external index="2">        
-{foreach $keys["expansion"] as $row}
-{if $row.device_key_id > 19 && $row.device_key_id < 40}
+        {foreach $keys["expansion"] as $row}
+        {if $row.device_key_id > 19 && $row.device_key_id < 40}
             <exKey index="{$row.device_key_id}">
                 <Type>0</Type>
                 <Value>{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}</Value>
                 <Title>{$row.device_key_label}</Title>
+                <ICON>{$row.device_key_icon}</ICON>
             </exKey>
-{/if}
-{/foreach}
+        {/if}
+        {/foreach}
         </external>
         <external index="3">
-{foreach $keys["expansion"] as $row}
-{if $row.device_key_id > 39 && $row.device_key_id < 60}
+        {foreach $keys["expansion"] as $row}
+        {if $row.device_key_id > 39 && $row.device_key_id < 60}
             <exKey index="{$row.device_key_id}">
                 <Type>0</Type>
                 <Value>{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}</Value>
                 <Title>{$row.device_key_label}</Title>
+                <ICON>{$row.device_key_icon}</ICON>
             </exKey>
-{/if}
-{/foreach}
+        {/if}
+        {/foreach}
         </external>
         <external index="4">        
-{foreach $keys["expansion"] as $row}
-{if $row.device_key_id > 59 && $row.device_key_id < 80}
+        {foreach $keys["expansion"] as $row}
+        {if $row.device_key_id > 59 && $row.device_key_id < 80}
             <exKey index="{$row.device_key_id}">
                 <Type>0</Type>
                 <Value>{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}</Value>
                 <Title>{$row.device_key_label}</Title>
+                <ICON>{$row.device_key_icon}</ICON>
             </exKey>
-{/if}
-{/foreach}
+        {/if}
+        {/foreach}
         </external>
         <external index="5">        
-{foreach $keys["expansion"] as $row}
-{if $row.device_key_id > 79 && $row.device_key_id < 100}
+        {foreach $keys["expansion"] as $row}
+        {if $row.device_key_id > 79 && $row.device_key_id < 100}
             <exKey index="{$row.device_key_id}">
                 <Type>0</Type>
                 <Value>{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}</Value>
                 <Title>{$row.device_key_label}</Title>
+                <ICON>{$row.device_key_icon}</ICON>
             </exKey>
-{/if}
-{/foreach}
+        {/if}
+        {/foreach}
         </external>
     </dsskey>
     <ateTest>