diff --git a/templates/contact/list.php b/templates/contact/list.php
index 99b88e1..86bbd96 100755
--- a/templates/contact/list.php
+++ b/templates/contact/list.php
@@ -53,7 +53,7 @@
                                                     <tr>
                                                         <td><?php $this->s($contact['id']); ?></td>
                                                         <td><?php $this->s($contact['name']); ?></td>
-                                                        <td><?php $this->s($contact['number']); ?></td>
+                                                        <td><?php $this->s(\controllers\internals\Tool::phone_format($contact['number'])); ?></td>
                                                         <td><input type="checkbox" name="ids[]" value="<?php $this->s($contact['id']); ?>"></td>
                                                     </tr>
                                             <?php } ?>
diff --git a/templates/dashboard/show.php b/templates/dashboard/show.php
index 51e5b6a..56ac0fc 100755
--- a/templates/dashboard/show.php
+++ b/templates/dashboard/show.php
@@ -153,7 +153,7 @@
                                         <tbody>
                                         <?php foreach ($sendeds as $sended) { ?>
                                                 <tr>
-                                                    <td><?php $this->s($sended['destination']); ?></td>
+                                                    <td><?php $this->s(\controllers\internals\Tool::phone_format($sended['destination'])); ?></td>
                                                     <td><?php $this->s($sended['at']); ?></td>
                                                 </tr>
                                         <?php } ?>
@@ -188,7 +188,7 @@
                                         <tbody>
                                         <?php foreach ($receiveds as $received) { ?>
                                             <tr>
-                                                <td><?php $this->s($received['origin']); ?></td>
+                                                <td><?php $this->s(\controllers\internals\Tool::phone_format($received['origin'])); ?></td>
                                                 <td><?php $this->s($received['at']); ?></td>
                                                 <td><?php echo ($received['command']) ? 'Oui' : 'Non'; ?></td>
                                             </tr>
diff --git a/templates/discussion/list.php b/templates/discussion/list.php
index 0441821..ee68937 100755
--- a/templates/discussion/list.php
+++ b/templates/discussion/list.php
@@ -49,7 +49,7 @@
                                             <?php foreach ($discussions as $discussion) { ?>
                                                         <tr class="goto" url="<?php $this->s(\descartes\Router::url('Discussion', 'show', ['number' => $discussion['number']])); ?>">
                                                         <td><?php $this->s($discussion['at']); ?></td>
-                                                        <td><?php $this->s(isset($discussion['contact']) ? $discussion['contact'] . ' (' . $discussion['number'] . ')' : $discussion['number']); ?></td>
+                                                        <td><?php $this->s(isset($discussion['contact']) ? $discussion['contact'] . ' (' . \controllers\internals\Tool::phone_format($discussion['number']) . ')' : \controllers\internals\Tool::phone_format($discussion['number'])); ?></td>
                                                     </tr>
                                             <?php } ?>
                                         </tbody>
diff --git a/templates/discussion/show.php b/templates/discussion/show.php
index bd5b737..87a9fc4 100755
--- a/templates/discussion/show.php
+++ b/templates/discussion/show.php
@@ -13,7 +13,7 @@
 			<div class="row">
 				<div class="col-lg-12">
 					<h1 class="page-header">
-						Discussion <small><?php $this->s($contact ? $contact['name'] . ' (' . $number . ')' : $number); ?></small>
+						Discussion <small><?php $this->s($contact ? $contact['name'] . ' (' . \controllers\internals\Tool::phone_format($number) . ')' : \controllers\internals\Tool::phone_format($number)); ?></small>
 					</h1>
 					<ol class="breadcrumb">
 						<li>
@@ -23,7 +23,7 @@
 							<i class="fa fa-comments-o"></i> <a href="<?php echo \descartes\Router::url('Discussion', 'list'); ?>">Discussions</a>
 						</li>
 						<li class="active">
-							<?php $this->s($number); ?>
+							<?php $this->s(\controllers\internals\Tool::phone_format($number)); ?>
 						</li>
 					</ol>
 				</div>
diff --git a/templates/phone/list.php b/templates/phone/list.php
index 2377192..22a7a54 100755
--- a/templates/phone/list.php
+++ b/templates/phone/list.php
@@ -49,7 +49,7 @@
                                         <?php foreach ($phones as $phone) { ?>
                                             <tr>
                                                 <td><?php $this->s($phone['id']); ?></td>
-                                                <td><?php $this->s($phone['number']); ?></td>
+                                                <td><?php $this->s(\controllers\internals\Tool::phone_format($phone['number'])); ?></td>
                                                 <td><?php $this->s($phone['adapter']); ?></td>
                                                 <td><input type="checkbox" value="<?php $this->s($phone['id']); ?>" name="ids[]"></td>
                                             </tr>
diff --git a/templates/received/list.php b/templates/received/list.php
index dfed67f..5dd0507 100755
--- a/templates/received/list.php
+++ b/templates/received/list.php
@@ -55,8 +55,8 @@
                                             <?php foreach ($receiveds as $received) { ?>
                                                     <tr>
                                                         <td><?php $this->s($received['id']); ?></td>
-                                                        <td><?php $this->s($received['origin']); ?></td>
-                                                        <td><?php $this->s($received['destination']); ?></td>
+                                                        <td><?php $this->s(\controllers\internals\Tool::phone_format($received['origin'])); ?></td>
+                                                        <td><?php $this->s(\controllers\internals\Tool::phone_format($received['destination'])); ?></td>
                                                         <td><?php $this->s($received['text']); ?></td>
                                                         <td><?php $this->s($received['at']); ?></td>
                                                         <td><?php echo $received['command'] ? 'Oui' : 'Non'; ?></td>
diff --git a/templates/sended/list.php b/templates/sended/list.php
index b236965..a8d2be5 100755
--- a/templates/sended/list.php
+++ b/templates/sended/list.php
@@ -57,8 +57,8 @@
                                             <?php foreach ($sendeds as $sended) { ?>
                                                     <tr>
                                                         <td><?php $this->s($sended['id']); ?></td>
-                                                        <td><?php $this->s($sended['origin']); ?></td>
-                                                        <td><?php $this->s($sended['destination']); ?></td>
+                                                        <td><?php $this->s(\controllers\internals\Tool::phone_format($sended['origin'])); ?></td>
+                                                        <td><?php $this->s(\controllers\internals\Tool::phone_format($sended['destination'])); ?></td>
                                                         <td><?php $this->s($sended['text']); ?></td>
                                                         <td><?php $this->s($sended['at']); ?></td>
 
diff --git a/templates/smsstop/list.php b/templates/smsstop/list.php
index bda69e0..df934c2 100755
--- a/templates/smsstop/list.php
+++ b/templates/smsstop/list.php
@@ -51,7 +51,7 @@
                                             <?php foreach ($smsstops as $smsstop) { ?>
                                                 <tr>
                                                     <td><?php $this->s($smsstop['id']); ?></td>
-                                                    <td><?php $this->s($smsstop['number']); ?></td>
+                                                    <td><?php $this->s(\controllers\internals\Tool::phone_format($smsstop['number'])); ?></td>
                                                     <?php if ($_SESSION['user']['admin']) { ?>
                                                         <td><input name="ids[]" type="checkbox" value="<?php $this->s($smsstop['id']); ?>"></td>
                                                     <?php } ?>