diff --git a/admin/css/debug-toolbar/toolbar.scss b/admin/css/debug-toolbar/toolbar.scss
index e32b037dd648..9c5b149d392c 100644
--- a/admin/css/debug-toolbar/toolbar.scss
+++ b/admin/css/debug-toolbar/toolbar.scss
@@ -398,6 +398,11 @@
             text-align: right;
         }
     }
+
+    // show tab
+    &>.debug-bar-dblock {
+        display: block;
+    }
 }
 
 
@@ -467,18 +472,6 @@
     @import '_theme-light';
 }
 
-// show tab
-#ci-database.debug-bar-dblock,
-#ci-files.debug-bar-dblock,
-#ci-routes.debug-bar-dblock,
-#ci-events.debug-bar-dblock,
-#ci-history.debug-bar-dblock,
-#ci-vars.debug-bar-dblock,
-#ci-config.debug-bar-dblock,
-#ci-timeline.debug-bar-dblock {
-   display: block;
-}
-
 // LAYOUT HELPERS
 // ========================================================================== */
 
diff --git a/app/Views/welcome_message.php b/app/Views/welcome_message.php
index d2c869ef0a30..86a6e39de305 100644
--- a/app/Views/welcome_message.php
+++ b/app/Views/welcome_message.php
@@ -150,24 +150,9 @@
         .further h2:first-of-type {
             padding-top: 0;
         }
-        .f1 {
+        .svg-stroke {
             fill: none;
             stroke: #000;
-            stroke-linejoin: round;
-            stroke-width: 32px;
-        }
-        .f2 {
-            fill: none;
-            stroke: #000;
-            stroke-linecap: round;
-            stroke-linejoin: round;
-            stroke-width: 32px;
-        }
-        .f3 {
-            fill: none;
-            stroke: #000;
-            stroke-linecap: round;
-            stroke-miterlimit: 10;
             stroke-width: 32px;
         }
         footer {
@@ -273,7 +258,7 @@
         <h1>Go further</h1>
 
         <h2>
-            <svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 512 512'><rect x='32' y='96' width='64' height='368' rx='16' ry='16' class="f1" /><line x1='112' y1='224' x2='240' y2='224' class="f2" /><line x1='112' y1='400' x2='240' y2='400' class="f2" /><rect x='112' y='160' width='128' height='304' rx='16' ry='16' class="f1" /><rect x='256' y='48' width='96' height='416' rx='16' ry='16' class="f1" /><path d='M422.46,96.11l-40.4,4.25c-11.12,1.17-19.18,11.57-17.93,23.1l34.92,321.59c1.26,11.53,11.37,20,22.49,18.84l40.4-4.25c11.12-1.17,19.18-11.57,17.93-23.1L445,115C443.69,103.42,433.58,94.94,422.46,96.11Z' class="f1"/></svg>
+            <svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 512 512'><rect x='32' y='96' width='64' height='368' rx='16' ry='16' class="svg-stroke" /><line x1='112' y1='224' x2='240' y2='224' class="svg-stroke" /><line x1='112' y1='400' x2='240' y2='400' class="svg-stroke" /><rect x='112' y='160' width='128' height='304' rx='16' ry='16' class="svg-stroke" /><rect x='256' y='48' width='96' height='416' rx='16' ry='16' class="svg-stroke" /><path d='M422.46,96.11l-40.4,4.25c-11.12,1.17-19.18,11.57-17.93,23.1l34.92,321.59c1.26,11.53,11.37,20,22.49,18.84l40.4-4.25c11.12-1.17,19.18-11.57,17.93-23.1L445,115C443.69,103.42,433.58,94.94,422.46,96.11Z' class="svg-stroke"/></svg>
             Learn
         </h2>
 
@@ -283,7 +268,7 @@
             target="_blank">User Guide</a> !</p>
 
         <h2>
-            <svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 512 512'><path d='M431,320.6c-1-3.6,1.2-8.6,3.3-12.2a33.68,33.68,0,0,1,2.1-3.1A162,162,0,0,0,464,215c.3-92.2-77.5-167-173.7-167C206.4,48,136.4,105.1,120,180.9a160.7,160.7,0,0,0-3.7,34.2c0,92.3,74.8,169.1,171,169.1,15.3,0,35.9-4.6,47.2-7.7s22.5-7.2,25.4-8.3a26.44,26.44,0,0,1,9.3-1.7,26,26,0,0,1,10.1,2L436,388.6a13.52,13.52,0,0,0,3.9,1,8,8,0,0,0,8-8,12.85,12.85,0,0,0-.5-2.7Z' class="f3" /><path d='M66.46,232a146.23,146.23,0,0,0,6.39,152.67c2.31,3.49,3.61,6.19,3.21,8s-11.93,61.87-11.93,61.87a8,8,0,0,0,2.71,7.68A8.17,8.17,0,0,0,72,464a7.26,7.26,0,0,0,2.91-.6l56.21-22a15.7,15.7,0,0,1,12,.2c18.94,7.38,39.88,12,60.83,12A159.21,159.21,0,0,0,284,432.11' class="f3" /></svg>
+            <svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 512 512'><path d='M431,320.6c-1-3.6,1.2-8.6,3.3-12.2a33.68,33.68,0,0,1,2.1-3.1A162,162,0,0,0,464,215c.3-92.2-77.5-167-173.7-167C206.4,48,136.4,105.1,120,180.9a160.7,160.7,0,0,0-3.7,34.2c0,92.3,74.8,169.1,171,169.1,15.3,0,35.9-4.6,47.2-7.7s22.5-7.2,25.4-8.3a26.44,26.44,0,0,1,9.3-1.7,26,26,0,0,1,10.1,2L436,388.6a13.52,13.52,0,0,0,3.9,1,8,8,0,0,0,8-8,12.85,12.85,0,0,0-.5-2.7Z' class="svg-stroke" /><path d='M66.46,232a146.23,146.23,0,0,0,6.39,152.67c2.31,3.49,3.61,6.19,3.21,8s-11.93,61.87-11.93,61.87a8,8,0,0,0,2.71,7.68A8.17,8.17,0,0,0,72,464a7.26,7.26,0,0,0,2.91-.6l56.21-22a15.7,15.7,0,0,1,12,.2c18.94,7.38,39.88,12,60.83,12A159.21,159.21,0,0,0,284,432.11' class="svg-stroke" /></svg>
             Discuss
         </h2>
 
@@ -294,7 +279,7 @@
              target="_blank">chat on Slack</a> !</p>
 
         <h2>
-        <svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 512 512'><line x1='176' y1='48' x2='336' y2='48' class="f3" /><line x1='118' y1='304' x2='394' y2='304' class="f3" /><path d='M208,48v93.48a64.09,64.09,0,0,1-9.88,34.18L73.21,373.49C48.4,412.78,76.63,464,123.08,464H388.92c46.45,0,74.68-51.22,49.87-90.51L313.87,175.66A64.09,64.09,0,0,1,304,141.48V48' class="f3" /></svg>
+        <svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 512 512'><line x1='176' y1='48' x2='336' y2='48' class="svg-stroke" /><line x1='118' y1='304' x2='394' y2='304' class="svg-stroke" /><path d='M208,48v93.48a64.09,64.09,0,0,1-9.88,34.18L73.21,373.49C48.4,412.78,76.63,464,123.08,464H388.92c46.45,0,74.68-51.22,49.87-90.51L313.87,175.66A64.09,64.09,0,0,1,304,141.48V48' class="svg-stroke" /></svg>
              Contribute
         </h2>
 
diff --git a/system/Debug/Toolbar/Views/toolbar.css b/system/Debug/Toolbar/Views/toolbar.css
index 9dfc5c8e5aa1..a3b934b68bd4 100644
--- a/system/Debug/Toolbar/Views/toolbar.css
+++ b/system/Debug/Toolbar/Views/toolbar.css
@@ -288,6 +288,9 @@
   padding-left: 1em;
   text-align: right;
 }
+#debug-bar > .debug-bar-dblock {
+  display: block;
+}
 
 .debug-view.show-view {
   border: 1px solid;
@@ -765,17 +768,6 @@
   color: #434343;
 }
 
-#ci-database.debug-bar-dblock,
-#ci-files.debug-bar-dblock,
-#ci-routes.debug-bar-dblock,
-#ci-events.debug-bar-dblock,
-#ci-history.debug-bar-dblock,
-#ci-vars.debug-bar-dblock,
-#ci-config.debug-bar-dblock,
-#ci-timeline.debug-bar-dblock {
-  display: block;
-}
-
 .debug-bar-width30 {
   width: 30%;
 }