diff --git a/templates/DI/profiler/logo_svg.html.twig b/templates/DI/profiler/logo_svg.html.twig
new file mode 100644
index 000000000..ada0e1945
--- /dev/null
+++ b/templates/DI/profiler/logo_svg.html.twig
@@ -0,0 +1,42 @@
+<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+     viewBox="0 0 184.3 184.3" style="enable-background:new 0 0 184.3 184.3;" xml:space="preserve">
+<style type="text/css">
+    .st0{fill:#FFFFFF;}
+
+    .st1{clip-path:url(#SVGID_00000182498472666113312050000003155286103176356535_);fill:none;stroke:#202B2F;stroke-width:8.546;stroke-miterlimit:10;}
+</style>
+    <g>
+        <g>
+            <path class="st0" d="M91.4,181.1c49.4,0,89.7-40.3,89.7-89.7c0-48.1-41.6-89.7-89.7-89.7C40.7,1.7,1.7,43.3,1.7,91.4
+			C1.7,140.8,40.7,181.1,91.4,181.1"/>
+        </g>
+        <g>
+            <defs>
+                <path id="SVGID_1_" d="M1.7,91.4c0,49.4,39,89.7,89.7,89.7c49.4,0,89.7-40.3,89.7-89.7c0-48.1-41.6-89.7-89.7-89.7
+				C40.7,1.7,1.7,43.3,1.7,91.4"/>
+            </defs>
+            <use xlink:href="#SVGID_1_"  style="overflow:visible;fill:#FFFFFF;"/>
+            <clipPath id="SVGID_00000031168008579212603900000013796369097020051840_">
+                <use xlink:href="#SVGID_1_"  style="overflow:visible;"/>
+            </clipPath>
+
+            <path style="clip-path:url(#SVGID_00000031168008579212603900000013796369097020051840_);fill:none;stroke:#202B2F;stroke-width:8.546;stroke-miterlimit:10;" d="
+			M113.9,207.1L113.9,207.1l1.5-2.4l1.8,0.1c4,0.2,7.5-2.8,7.7-6.9c0.1-0.9-0.1-1.8-0.3-2.7l-1.6-5l2.4-10.3l16.2-2.1
+			c3.1-0.4,6.2,0.7,8.4,2.9c2.1,2.1,3.1,5,2.8,8c-1.1,6.3-3.7,12.3-7.4,17.6c-14.2,21.8-11.1,46.5,8.6,66.2c3,3,7.7,3.2,11,0.5
+			c3.4-2.6,4.3-7.4,2-11.1c-12.3-20.5-8.9-37.4,10.1-50.3c13.8-9.3,18.4-24,13.4-42.5c-0.3-1.3-1.7-4.6-4.2-10.9
+			c-1.4-3.4-2.8-7-4-10.2c-0.9-2.3,0.2-5,2.6-6l11.7-4.9l7.2,7.7l1.1,5.1c0.8,4,4.7,6.5,8.7,5.6c0.9-0.2,1.8-0.5,2.5-1.1l1.5-1
+			l2.5,1.3c3.4,1.7,7.6,0.4,9.3-3c1-1.9,1-4.1,0.1-6l-1-2.1l1.7-2.8c2-3.2,1-7.4-2.2-9.4c-0.5-0.3-1-0.6-1.6-0.7l-5.9-1.8l-7.8-8.3
+			c-6.3-6.7-16-8.8-24.4-5.3l-14.4,6c-1.1-2-2.4-4-3.8-5.8c-2.7-3.5-5.7-6.8-9-9.8c-1.6-1.5-2.3-3.6-1.8-5.7l4.2-18.8
+			c2-8.9-1.8-18.2-9.5-23.2l-9.6-6.2l-2.8-5.5c-1.7-3.4-5.8-4.7-9.1-3c-0.5,0.3-1,0.6-1.5,1l-2.5,2.2l-2.3-0.6c-3.7-1-7.5,1.3-8.4,5
+			c-0.5,2-0.1,4.2,1.2,5.9l1.7,2.3l-0.7,1.7c-1.6,3.7,0.1,8,3.8,9.6c0.8,0.4,1.8,0.6,2.7,0.6l5.3,0.2l8.9,5.8L138.1,90
+			c-6.3-3.1-12.9-5.6-19.6-7.6c-1.2-0.3-11.3-3.5-12-12.5c0-0.2,0-0.3-0.1-0.5c-0.3-1.7-2.3-9.9-7.5-12.6l-11.7-7.8
+			c-7.1-4.8-16-6.5-24.3-4.5c-3.1,0.6-5.9,2.1-8.3,4.2c-3.1,3.8-4.6,8.5-4.5,13.4c-0.3,5.9,1,11.7,3.9,16.8
+			c3.2,6.8,7.7,12.9,13.1,18.1c3.3,2.3,7.2,3.6,11.3,3.7c5.7,1.5,10.5,5.3,13.2,10.5c1.3,3,3,6.6,4.9,10.6c0.5,1.1,0.4,2.4-0.3,3.4
+			l-7,9.1L79,131.2l-3.5-3.9c-2.7-3-7.3-3.3-10.3-0.6c-0.7,0.6-1.2,1.4-1.7,2.2l-0.8,1.7l-2.1,0.1c-4,0.2-7,3.6-6.8,7.6
+			c0.1,2.2,1.2,4.2,3,5.5l1.3,0.9l-0.1,3.3c-0.1,3.8,2.8,6.9,6.6,7c0.6,0,1.2,0,1.8-0.2l6-1.4l10.9,3.3c8.8,2.7,18.2-0.4,23.8-7.6
+			l2.6-3.4c0.2-0.3,0.6-0.6,1.1-0.6c0.4,0,0.8,0.2,1.1,0.5c3.7,4.1,7.7,7.8,12.1,11.1l-2.3,0.3c-9.1,1.2-16.4,7.9-18.5,16.8
+			l-2.6,11.1l-4.2,4.5c-2.6,2.7-2.4,7.1,0.3,9.6c0.4,0.4,0.9,0.8,1.4,1l2.9,1.6l0.2,2.3c0.4,3.8,3.8,6.6,7.6,6.2
+			C110.9,210,112.8,208.8,113.9,207.1z"/>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/templates/DI/profiler/oql.html.twig b/templates/DI/profiler/oql.html.twig
index 57aa631cc..48406add1 100644
--- a/templates/DI/profiler/oql.html.twig
+++ b/templates/DI/profiler/oql.html.twig
@@ -3,49 +3,7 @@
 
 {% block toolbar %}
     {% set icon %}
-        <svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-             viewBox="0 0 184.3 184.3" style="enable-background:new 0 0 184.3 184.3;" xml:space="preserve">
-<style type="text/css">
-    .st0{fill:#FFFFFF;}
-
-    .st1{clip-path:url(#SVGID_00000182498472666113312050000003155286103176356535_);fill:none;stroke:#202B2F;stroke-width:8.546;stroke-miterlimit:10;}
-</style>
-            <g>
-                <g>
-                    <path class="st0" d="M91.4,181.1c49.4,0,89.7-40.3,89.7-89.7c0-48.1-41.6-89.7-89.7-89.7C40.7,1.7,1.7,43.3,1.7,91.4
-			C1.7,140.8,40.7,181.1,91.4,181.1"/>
-                </g>
-                <g>
-                    <defs>
-                        <path id="SVGID_1_" d="M1.7,91.4c0,49.4,39,89.7,89.7,89.7c49.4,0,89.7-40.3,89.7-89.7c0-48.1-41.6-89.7-89.7-89.7
-				C40.7,1.7,1.7,43.3,1.7,91.4"/>
-                    </defs>
-                    <use xlink:href="#SVGID_1_"  style="overflow:visible;fill:#FFFFFF;"/>
-                    <clipPath id="SVGID_00000031168008579212603900000013796369097020051840_">
-                        <use xlink:href="#SVGID_1_"  style="overflow:visible;"/>
-                    </clipPath>
-
-                    <path style="clip-path:url(#SVGID_00000031168008579212603900000013796369097020051840_);fill:none;stroke:#202B2F;stroke-width:8.546;stroke-miterlimit:10;" d="
-			M113.9,207.1L113.9,207.1l1.5-2.4l1.8,0.1c4,0.2,7.5-2.8,7.7-6.9c0.1-0.9-0.1-1.8-0.3-2.7l-1.6-5l2.4-10.3l16.2-2.1
-			c3.1-0.4,6.2,0.7,8.4,2.9c2.1,2.1,3.1,5,2.8,8c-1.1,6.3-3.7,12.3-7.4,17.6c-14.2,21.8-11.1,46.5,8.6,66.2c3,3,7.7,3.2,11,0.5
-			c3.4-2.6,4.3-7.4,2-11.1c-12.3-20.5-8.9-37.4,10.1-50.3c13.8-9.3,18.4-24,13.4-42.5c-0.3-1.3-1.7-4.6-4.2-10.9
-			c-1.4-3.4-2.8-7-4-10.2c-0.9-2.3,0.2-5,2.6-6l11.7-4.9l7.2,7.7l1.1,5.1c0.8,4,4.7,6.5,8.7,5.6c0.9-0.2,1.8-0.5,2.5-1.1l1.5-1
-			l2.5,1.3c3.4,1.7,7.6,0.4,9.3-3c1-1.9,1-4.1,0.1-6l-1-2.1l1.7-2.8c2-3.2,1-7.4-2.2-9.4c-0.5-0.3-1-0.6-1.6-0.7l-5.9-1.8l-7.8-8.3
-			c-6.3-6.7-16-8.8-24.4-5.3l-14.4,6c-1.1-2-2.4-4-3.8-5.8c-2.7-3.5-5.7-6.8-9-9.8c-1.6-1.5-2.3-3.6-1.8-5.7l4.2-18.8
-			c2-8.9-1.8-18.2-9.5-23.2l-9.6-6.2l-2.8-5.5c-1.7-3.4-5.8-4.7-9.1-3c-0.5,0.3-1,0.6-1.5,1l-2.5,2.2l-2.3-0.6c-3.7-1-7.5,1.3-8.4,5
-			c-0.5,2-0.1,4.2,1.2,5.9l1.7,2.3l-0.7,1.7c-1.6,3.7,0.1,8,3.8,9.6c0.8,0.4,1.8,0.6,2.7,0.6l5.3,0.2l8.9,5.8L138.1,90
-			c-6.3-3.1-12.9-5.6-19.6-7.6c-1.2-0.3-11.3-3.5-12-12.5c0-0.2,0-0.3-0.1-0.5c-0.3-1.7-2.3-9.9-7.5-12.6l-11.7-7.8
-			c-7.1-4.8-16-6.5-24.3-4.5c-3.1,0.6-5.9,2.1-8.3,4.2c-3.1,3.8-4.6,8.5-4.5,13.4c-0.3,5.9,1,11.7,3.9,16.8
-			c3.2,6.8,7.7,12.9,13.1,18.1c3.3,2.3,7.2,3.6,11.3,3.7c5.7,1.5,10.5,5.3,13.2,10.5c1.3,3,3,6.6,4.9,10.6c0.5,1.1,0.4,2.4-0.3,3.4
-			l-7,9.1L79,131.2l-3.5-3.9c-2.7-3-7.3-3.3-10.3-0.6c-0.7,0.6-1.2,1.4-1.7,2.2l-0.8,1.7l-2.1,0.1c-4,0.2-7,3.6-6.8,7.6
-			c0.1,2.2,1.2,4.2,3,5.5l1.3,0.9l-0.1,3.3c-0.1,3.8,2.8,6.9,6.6,7c0.6,0,1.2,0,1.8-0.2l6-1.4l10.9,3.3c8.8,2.7,18.2-0.4,23.8-7.6
-			l2.6-3.4c0.2-0.3,0.6-0.6,1.1-0.6c0.4,0,0.8,0.2,1.1,0.5c3.7,4.1,7.7,7.8,12.1,11.1l-2.3,0.3c-9.1,1.2-16.4,7.9-18.5,16.8
-			l-2.6,11.1l-4.2,4.5c-2.6,2.7-2.4,7.1,0.3,9.6c0.4,0.4,0.9,0.8,1.4,1l2.9,1.6l0.2,2.3c0.4,3.8,3.8,6.6,7.6,6.2
-			C110.9,210,112.8,208.8,113.9,207.1z"/>
-                </g>
-            </g>
-</svg>
-
+        {% include 'DI/profiler/logo_svg.html.twig' %}
         <span class="sf-toolbar-value">KPI</span>
     {% endset %}
 
@@ -63,51 +21,9 @@
     <span class="label">
         <i class="fas fa-database"></i>
         <span class="icon">
-<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-     viewBox="0 0 184.3 184.3" style="enable-background:new 0 0 184.3 184.3;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFFFFF;}
-
-    .st1{clip-path:url(#SVGID_00000182498472666113312050000003155286103176356535_);fill:none;stroke:#202B2F;stroke-width:8.546;stroke-miterlimit:10;}
-</style>
-<g>
-	<g>
-		<path class="st0" d="M91.4,181.1c49.4,0,89.7-40.3,89.7-89.7c0-48.1-41.6-89.7-89.7-89.7C40.7,1.7,1.7,43.3,1.7,91.4
-			C1.7,140.8,40.7,181.1,91.4,181.1"/>
-	</g>
-	<g>
-		<defs>
-			<path id="SVGID_1_" d="M1.7,91.4c0,49.4,39,89.7,89.7,89.7c49.4,0,89.7-40.3,89.7-89.7c0-48.1-41.6-89.7-89.7-89.7
-				C40.7,1.7,1.7,43.3,1.7,91.4"/>
-		</defs>
-		<use xlink:href="#SVGID_1_"  style="overflow:visible;fill:#FFFFFF;"/>
-		<clipPath id="SVGID_00000031168008579212603900000013796369097020051840_">
-			<use xlink:href="#SVGID_1_"  style="overflow:visible;"/>
-		</clipPath>
-
-			<path style="clip-path:url(#SVGID_00000031168008579212603900000013796369097020051840_);fill:none;stroke:#202B2F;stroke-width:8.546;stroke-miterlimit:10;" d="
-			M113.9,207.1L113.9,207.1l1.5-2.4l1.8,0.1c4,0.2,7.5-2.8,7.7-6.9c0.1-0.9-0.1-1.8-0.3-2.7l-1.6-5l2.4-10.3l16.2-2.1
-			c3.1-0.4,6.2,0.7,8.4,2.9c2.1,2.1,3.1,5,2.8,8c-1.1,6.3-3.7,12.3-7.4,17.6c-14.2,21.8-11.1,46.5,8.6,66.2c3,3,7.7,3.2,11,0.5
-			c3.4-2.6,4.3-7.4,2-11.1c-12.3-20.5-8.9-37.4,10.1-50.3c13.8-9.3,18.4-24,13.4-42.5c-0.3-1.3-1.7-4.6-4.2-10.9
-			c-1.4-3.4-2.8-7-4-10.2c-0.9-2.3,0.2-5,2.6-6l11.7-4.9l7.2,7.7l1.1,5.1c0.8,4,4.7,6.5,8.7,5.6c0.9-0.2,1.8-0.5,2.5-1.1l1.5-1
-			l2.5,1.3c3.4,1.7,7.6,0.4,9.3-3c1-1.9,1-4.1,0.1-6l-1-2.1l1.7-2.8c2-3.2,1-7.4-2.2-9.4c-0.5-0.3-1-0.6-1.6-0.7l-5.9-1.8l-7.8-8.3
-			c-6.3-6.7-16-8.8-24.4-5.3l-14.4,6c-1.1-2-2.4-4-3.8-5.8c-2.7-3.5-5.7-6.8-9-9.8c-1.6-1.5-2.3-3.6-1.8-5.7l4.2-18.8
-			c2-8.9-1.8-18.2-9.5-23.2l-9.6-6.2l-2.8-5.5c-1.7-3.4-5.8-4.7-9.1-3c-0.5,0.3-1,0.6-1.5,1l-2.5,2.2l-2.3-0.6c-3.7-1-7.5,1.3-8.4,5
-			c-0.5,2-0.1,4.2,1.2,5.9l1.7,2.3l-0.7,1.7c-1.6,3.7,0.1,8,3.8,9.6c0.8,0.4,1.8,0.6,2.7,0.6l5.3,0.2l8.9,5.8L138.1,90
-			c-6.3-3.1-12.9-5.6-19.6-7.6c-1.2-0.3-11.3-3.5-12-12.5c0-0.2,0-0.3-0.1-0.5c-0.3-1.7-2.3-9.9-7.5-12.6l-11.7-7.8
-			c-7.1-4.8-16-6.5-24.3-4.5c-3.1,0.6-5.9,2.1-8.3,4.2c-3.1,3.8-4.6,8.5-4.5,13.4c-0.3,5.9,1,11.7,3.9,16.8
-			c3.2,6.8,7.7,12.9,13.1,18.1c3.3,2.3,7.2,3.6,11.3,3.7c5.7,1.5,10.5,5.3,13.2,10.5c1.3,3,3,6.6,4.9,10.6c0.5,1.1,0.4,2.4-0.3,3.4
-			l-7,9.1L79,131.2l-3.5-3.9c-2.7-3-7.3-3.3-10.3-0.6c-0.7,0.6-1.2,1.4-1.7,2.2l-0.8,1.7l-2.1,0.1c-4,0.2-7,3.6-6.8,7.6
-			c0.1,2.2,1.2,4.2,3,5.5l1.3,0.9l-0.1,3.3c-0.1,3.8,2.8,6.9,6.6,7c0.6,0,1.2,0,1.8-0.2l6-1.4l10.9,3.3c8.8,2.7,18.2-0.4,23.8-7.6
-			l2.6-3.4c0.2-0.3,0.6-0.6,1.1-0.6c0.4,0,0.8,0.2,1.1,0.5c3.7,4.1,7.7,7.8,12.1,11.1l-2.3,0.3c-9.1,1.2-16.4,7.9-18.5,16.8
-			l-2.6,11.1l-4.2,4.5c-2.6,2.7-2.4,7.1,0.3,9.6c0.4,0.4,0.9,0.8,1.4,1l2.9,1.6l0.2,2.3c0.4,3.8,3.8,6.6,7.6,6.2
-			C110.9,210,112.8,208.8,113.9,207.1z"/>
-	</g>
-</g>
-</svg>
-
+            {% include 'DI/profiler/logo_svg.html.twig' %}
         </span>
-        <strong>KPI</strong>
+        <strong>iTop KPI</strong>
     </span>
 {% endblock %}