diff --git a/src/bundle/Resources/views/themes/admin/ui/dashboard/block/ez.html.twig b/src/bundle/Resources/views/themes/admin/ui/dashboard/block/ez.html.twig
index 0bac5cd7..7a27ded3 100644
--- a/src/bundle/Resources/views/themes/admin/ui/dashboard/block/ez.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/dashboard/block/ez.html.twig
@@ -15,7 +15,7 @@
         {% set severity = 1 %}
         <div class="alert alert-warning mb-0 mt-3 ez-alert ez-alert--icon" role="alert">
             <svg class="ez-icon ez-icon--small-medium ez-icon--light">
-                <use xlink:href="{{ asset('bundles/ezplatformadminui/img/ez-icons.svg') }}#information"></use>
+                <use xlink:href="{{ asset('bundles/ezplatformadminui/img/ez-icons.svg') }}#system-information"></use>
             </svg>
             <span>
                 {{ 'dashboard.ez_version.release_not_determined'|trans
@@ -30,7 +30,7 @@
         {% set badge = 'Development' %}
         <div class="alert alert-warning mb-0 mt-3 ez-alert ez-alert--icon" role="alert">
             <svg class="ez-icon ez-icon--small-medium ez-icon--light">
-                <use xlink:href="{{ asset('bundles/ezplatformadminui/img/ez-icons.svg') }}#information"></use>
+                <use xlink:href="{{ asset('bundles/ezplatformadminui/img/ez-icons.svg') }}#system-information"></use>
             </svg>
             <span>
                 {% if ez.composerInfo.minimumStability != 'stable' %}
@@ -49,7 +49,7 @@
             {% set severity = 2 %}
             <div class="alert alert-danger mb-0 mt-3 ez-alert ez-alert--icon" role="alert">
                 <svg class="ez-icon ez-icon--small-medium ez-icon--light">
-                    <use xlink:href="{{ asset('bundles/ezplatformadminui/img/ez-icons.svg') }}#information"></use>
+                    <use xlink:href="{{ asset('bundles/ezplatformadminui/img/ez-icons.svg') }}#system-information"></use>
                 </svg>
                 <span>
                     {{ 'dashboard.ez_version.trial_expired'|trans({'%ttl_url%': urls['ttl']})|desc("Unfortunately your trial period has expired and your <a target=\"_blank\" href=\"%ttl_url%\">TTL license</a> is no longer valid.")|raw }}
@@ -57,7 +57,7 @@
             {% set severity = 1 %}
             <div class="alert alert-warning mb-0 mt-3 ez-alert ez-alert--icon" role="alert">
                 <svg class="ez-icon ez-icon--small-medium ez-icon--light">
-                    <use xlink:href="{{ asset('bundles/ezplatformadminui/img/ez-icons.svg') }}#information"></use>
+                    <use xlink:href="{{ asset('bundles/ezplatformadminui/img/ez-icons.svg') }}#system-information"></use>
                 </svg>
                 <span>
                     {{ 'dashboard.ez_version.trial_end_of_maintenance'|trans|desc("Your trial period is coming to an end.")}}
@@ -65,7 +65,7 @@
             {% set severity = 0 %}
             <div class="alert alert-info mb-0 mt-3 ez-alert ez-alert--icon" role="alert">
                 <svg class="ez-icon ez-icon--small-medium ez-icon--light">
-                    <use xlink:href="{{ asset('bundles/ezplatformadminui/img/ez-icons.svg') }}#information"></use>
+                    <use xlink:href="{{ asset('bundles/ezplatformadminui/img/ez-icons.svg') }}#system-information"></use>
                 </svg>
                 <span>
                     {{ 'dashboard.ez_version.trial_notice'|trans({'%name%': ez.name, '%doc_url%': urls['doc'], '%consulting_url%': urls['consulting_service'], '%training_url%': urls['training_service']})
@@ -86,7 +86,7 @@
             {% set severity = 1 %}
             <div class="alert alert-warning mb-0 mt-3 ez-alert ez-alert--icon" role="alert">
                 <svg class="ez-icon ez-icon--small-medium ez-icon--light">
-                    <use xlink:href="{{ asset('bundles/ezplatformadminui/img/ez-icons.svg') }}#information"></use>
+                    <use xlink:href="{{ asset('bundles/ezplatformadminui/img/ez-icons.svg') }}#system-information"></use>
                 </svg>
                 <span>
                     {{ 'dashboard.ez_version.community_end_of_maintenance'|trans({
@@ -116,7 +116,7 @@
             {% set severity = 0 %}
             <div class="alert alert-info mb-0 mt-3 ez-alert ez-alert--icon" role="alert">
                 <svg class="ez-icon ez-icon--small-medium ez-icon--light">
-                    <use xlink:href="{{ asset('bundles/ezplatformadminui/img/ez-icons.svg') }}#information"></use>
+                    <use xlink:href="{{ asset('bundles/ezplatformadminui/img/ez-icons.svg') }}#system-information"></use>
                 </svg>
                 <span>
                     {{ 'dashboard.ez_version.community_severity_non'|trans({
@@ -136,7 +136,7 @@
         {% set badge = 'End of Life' %}
         <div class="alert alert-warning mb-0 mt-3 ez-alert ez-alert--icon" role="alert">
             <svg class="ez-icon ez-icon--small-medium ez-icon--light">
-                <use xlink:href="{{ asset('bundles/ezplatformadminui/img/ez-icons.svg') }}#information"></use>
+                <use xlink:href="{{ asset('bundles/ezplatformadminui/img/ez-icons.svg') }}#system-information"></use>
             </svg>
             <span>
                 {{ 'dashboard.ez_version.end_of_life_upgrade'|trans({
@@ -153,24 +153,24 @@
 {% endapply %}
 {% endset %}
 
-<div class="mb-4">
-    <br>
-    <h2 class="mb-0">
+<div class="ez-dashboard__version-info">
+    <h2 class="ez-dashboard__version">
         {{ ez.name }}&nbsp;
         {{ ez.release }}{% if ez.stability != 'stable' %}{{ ez.release ? '-' : '' }}{{ ez.stability }}{% endif %}
-        {% if status %}
-            <a class="badge badge-{{ levels[severity] }} ez-badge ez-badge--round ez-badge--icon" data-toggle="collapse" href="#systemInfoCollapse">
-                {{ badge }}
-                {% if severity != 0 %}
-                    <svg class="ez-icon ez-icon--small-medium ez-icon--light">
-                        <use xlink:href="{{ asset('bundles/ezplatformadminui/img/ez-icons.svg') }}#information"></use>
-                    </svg>
-                {% endif %}
-            </a>
-        {% endif %}
     </h2>
 
-    <div class="collapse" id="systemInfoCollapse">
-        {{ status|raw }}
-    </div>
+    {% if status %}
+        <a class="badge badge-{{ levels[severity] }} ez-badge ez-badge--round ez-badge--icon" data-toggle="collapse" href="#systemInfoCollapse">
+            {{ badge }}
+            {% if severity != 0 %}
+                <svg class="ez-icon ez-icon--small-medium ez-icon--light">
+                    <use xlink:href="{{ asset('bundles/ezplatformadminui/img/ez-icons.svg') }}#system-information"></use>
+                </svg>
+            {% endif %}
+        </a>
+    {% endif %}
+</div>
+
+<div class="collapse" id="systemInfoCollapse">
+    {{ status|raw }}
 </div>