diff --git a/src/Bundle/ChillMainBundle/Phonenumber/Templating.php b/src/Bundle/ChillMainBundle/Phonenumber/Templating.php
deleted file mode 100644
index b2fffd9b3..000000000
--- a/src/Bundle/ChillMainBundle/Phonenumber/Templating.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/**
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Chill\MainBundle\Phonenumber;
-
-use Twig\Extension\AbstractExtension;
-use Twig\TwigFilter;
-
-final class Templating extends AbstractExtension
-{
-    protected PhoneNumberHelperInterface $phonenumberHelper;
-
-    public function __construct(PhoneNumberHelperInterface $phonenumberHelper)
-    {
-        $this->phonenumberHelper = $phonenumberHelper;
-    }
-
-    public function formatPhonenumber(string $phonenumber): string
-    {
-        return $this->phonenumberHelper->format($phonenumber);
-    }
-
-    public function getFilters()
-    {
-        return [
-            new TwigFilter('chill_format_phonenumber', [$this, 'formatPhonenumber']),
-        ];
-    }
-}
diff --git a/src/Bundle/ChillMainBundle/config/services/phonenumber.yaml b/src/Bundle/ChillMainBundle/config/services/phonenumber.yaml
index 0482da320..f12cc47a3 100644
--- a/src/Bundle/ChillMainBundle/config/services/phonenumber.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/phonenumber.yaml
@@ -7,10 +7,6 @@ services:
 
     Chill\MainBundle\Phonenumber\PhonenumberHelper: ~
 
-    Chill\MainBundle\Phonenumber\Templating:
-        tags:
-            - { name: twig.extension }
-
     Chill\MainBundle\Validation\Validator\ValidPhonenumber:
         tags:
             - { name: validator.constraint_validator }
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
index e3280d755..e21716d8e 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
@@ -148,14 +148,14 @@
             {% endif %}
             <li>
                 {% if person.mobilenumber %}
-                    <i class="fa fa-li fa-mobile"></i><a href="{{ 'tel:' ~ person.mobilenumber }}">
-                        {{ person.mobilenumber|chill_format_phonenumber }}
+                    <i class="fa fa-li fa-mobile"></i><a href="{{ 'tel:' ~ person.mobilenumber|phone_number_format('E164') }}">
+                        {{ person.mobilenumber|phone_number_format('NATIONAL') }}
                     </a>
                 {% else %}
                     <i class="fa fa-li fa-phone"></i>
                     {% if person.phonenumber %}
-                        <a href="{{ 'tel:' ~ person.phonenumber }}">
-                            {{ person.phonenumber|chill_format_phonenumber }}
+                        <a href="{{ 'tel:' ~ person.phonenumber|phone_number_format('E164') }}">
+                            {{ person.phonenumber|phone_number_format('NATIONAL') }}
                         </a>
                     {% else %}
                         <span class="chill-no-data-statement">{{ 'No data given'|trans }}</span>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/banner.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/banner.html.twig
index b603dd70c..e7fbc0228 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/banner.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/banner.html.twig
@@ -25,15 +25,15 @@
                         {% if person.phonenumber %}
                             <span class="phonenumber d-block d-sm-inline-block">
                                 <i class="fa fa-fw fa-phone"></i>
-                                <a href="{{ 'tel:' ~ person.phonenumber }}" class="phone mr-3" title="{{ 'Phonenumber'|trans }}">
-                                    {{ person.phonenumber|chill_format_phonenumber }}</a>
+                                <a href="{{ 'tel:' ~ person.phonenumber|phone_number_format('E164') }}" class="phone mr-3" title="{{ 'Phonenumber'|trans }}">
+                                    {{ person.phonenumber|phone_number_format('NATIONAL') }}</a>
                             </span>
                         {% endif %}
                         {% if person.mobilenumber %}
                             <span class="mobilenumber d-block d-sm-inline-block">
                                 <i class="fa fa-fw fa-mobile"></i>
-                                <a href="{{ 'tel:' ~ person.mobilenumber }}" class="phone mr-3" title="{{ 'Mobilenumber'|trans }}">
-                                    {{ person.mobilenumber|chill_format_phonenumber }}</a>
+                                <a href="{{ 'tel:' ~ person.mobilenumber|phone_number_format('E164') }}" class="phone mr-3" title="{{ 'Mobilenumber'|trans }}">
+                                    {{ person.mobilenumber|phone_number_format('NATIONAL') }}</a>
                             </span>
                         {% endif %}
                         {% if person.email %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/list_by_phonenumber.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/list_by_phonenumber.html.twig
index 642225571..83ee9fff9 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/list_by_phonenumber.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/list_by_phonenumber.html.twig
@@ -62,12 +62,12 @@
                             <ul>
                                 {% if person.phonenumber is not empty %}
                                     <li>
-                                        <a href="tel:{{ person.phonenumber }}"><img src="{{ asset('build/images/mobile-alt-solid.svg') }}">&nbsp;<pre>{{ person.phonenumber|chill_format_phonenumber }}</pre></a>
+                                        <a href="tel:{{ person.phonenumber|phone_number_format('E164') }}"><img src="{{ asset('build/images/mobile-alt-solid.svg') }}">&nbsp;<pre>{{ person.phonenumber|phone_number_format('NATIONAL') }}</pre></a>
                                     </li>
                                 {% endif %}
                                 {% if person.mobilenumber is not empty%}
                                     <li>
-                                        <a href="tel:{{ person.mobilenumber }}"><img src="{{ asset('build/images/phone-alt-solid.svg') }}">&nbsp;<pre>{{ person.mobilenumber|chill_format_phonenumber }}</pre></a>
+                                        <a href="tel:{{ person.mobilenumber|phone_number_format('E164') }}"><img src="{{ asset('build/images/phone-alt-solid.svg') }}">&nbsp;<pre>{{ person.mobilenumber|phone_number_format('NATIONAL') }}</pre></a>
                                     </li>
                                 {% endif %}
                             </ul>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig
index 9bdc3a479..945984380 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig
@@ -232,14 +232,14 @@ This view should receive those arguments:
                 {%- if chill_person.fields.phonenumber == 'visible' -%}
                         <dl>
                             <dt>{{ 'Phonenumber'|trans }}&nbsp;:</dt>
-                            <dd>{% if person.phonenumber is not empty %}<a href="tel:{{ person.phonenumber }}"><pre>{{ person.phonenumber|chill_format_phonenumber }}</pre></a>{% else %}<span class="chill-no-data-statement">{{ 'No data given'|trans }}{% endif %}</dd>
+                            <dd>{% if person.phonenumber is not empty %}<a href="tel:{{ person.phonenumber|phone_number_format('E164') }}"><pre>{{ person.phonenumber|phone_number_format('NATIONAL') }}</pre></a>{% else %}<span class="chill-no-data-statement">{{ 'No data given'|trans }}{% endif %}</dd>
                         </dl>
                 {% endif %}
 
                 {%- if chill_person.fields.mobilenumber == 'visible' -%}
                 <dl>
                     <dt>{{ 'Mobilenumber'|trans }}&nbsp;:</dt>
-                    <dd>{% if person.mobilenumber is not empty %}<a href="tel:{{ person.mobilenumber }}">{{ person.mobilenumber|chill_format_phonenumber }}</a>{% else %}<span class="chill-no-data-statement">{{ 'No data given'|trans }}{% endif %}</dd>
+                    <dd>{% if person.mobilenumber is not empty %}<a href="tel:{{ person.mobilenumber|phone_number_format('E164') }}">{{ person.mobilenumber|phone_number_format('NATIONAL') }}</a>{% else %}<span class="chill-no-data-statement">{{ 'No data given'|trans }}{% endif %}</dd>
                     <p>{% if person.acceptSMS %}{{ 'Accept short text message'|trans }}{% endif %}</p>
                 </dl>
                 {% endif %}
@@ -250,7 +250,7 @@ This view should receive those arguments:
                     <dt>{{ 'Others phone numbers'|trans }}&nbsp;:</dt>
                     {% for el in person.otherPhoneNumbers %}
                         {% if el.phonenumber is not empty %}
-                        <dd>{% if el.description is not empty %}{{ el.description }}&nbsp;:&nbsp;{% endif %}<a href="tel:{{ el.phonenumber }}">{{ el.phonenumber|chill_format_phonenumber }}</a></dd>
+                        <dd>{% if el.description is not empty %}{{ el.description }}&nbsp;:&nbsp;{% endif %}<a href="tel:{{ el.phonenumber|phone_number_format('E164') }}">{{ el.phonenumber|phone_number_format('NATIONAL') }}</a></dd>
                         {% endif %}
                     {% endfor %}
                     </ul>
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/Entity/thirdparty.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/Entity/thirdparty.html.twig
index 79aa7be6c..9fb55f71e 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/views/Entity/thirdparty.html.twig
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/Entity/thirdparty.html.twig
@@ -111,7 +111,7 @@
                         </li>
                         <li><i class="fa fa-li fa-phone"></i>
                             {% if thirdparty.telephone %}
-                                <a href="{{ 'tel:' ~ thirdparty.telephone }}">{{ thirdparty.telephone|chill_format_phonenumber }}</a>
+                                <a href="{{ 'tel:' ~ thirdparty.telephone|phone_number_format('E164') }}">{{ thirdparty.telephone|phone_number_format('NATIONAL') }}</a>
                             {% else %}
                                 <span class="chill-no-data-statement">{{ 'thirdparty.No_phonenumber'|trans }}</span>
                             {% endif %}
@@ -136,7 +136,7 @@
                 </li>
                 <li><i class="fa fa-li fa-phone"></i>
                     {% if thirdparty.telephone %}
-                        <a href="{{ 'tel:' ~ thirdparty.telephone }}">{{ thirdparty.telephone|chill_format_phonenumber }}</a>
+                        <a href="{{ 'tel:' ~ thirdparty.telephone|phone_number_format('E164') }}">{{ thirdparty.telephone|phone_number_format('NATIONAL') }}</a>
                     {% else %}
                         <span class="chill-no-data-statement">{{ 'thirdparty.No_phonenumber'|trans }}</span>
                     {% endif %}
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/view.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/view.html.twig
index 824438fa3..9157ff575 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/view.html.twig
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/view.html.twig
@@ -69,8 +69,8 @@
                         {% if thirdParty.telephone == null %}
                             <span class="chill-no-data-statement">{{ 'No phone given'|trans }}</span>
                         {%  else %}
-                            <a href="{{ 'tel:' ~ thirdParty.telephone }}">
-                                {{ thirdParty.telephone|chill_print_or_message("thirdparty.No_phonenumber") }}
+                            <a href="{{ 'tel:' ~ thirdParty.telephone|phone_number_format('E164') }}">
+                                {{ thirdParty.telephone|phone_number_format('NATIONAL') }}
                             </a>
                         {% endif %}
                     </dd>