diff --git a/config/telescope-toolbar.php b/config/telescope-toolbar.php
index e59de99..a947b02 100644
--- a/config/telescope-toolbar.php
+++ b/config/telescope-toolbar.php
@@ -15,6 +15,17 @@
     */
     'enabled' => env('TELESCOPE_TOOLBAR_ENABLED', env('TELESCOPE_ENABLED', true)),
 
+    /*
+    |--------------------------------------------------------------------------
+    | Telescope Auto Replace Requests
+    |--------------------------------------------------------------------------
+    |
+    | This options automatically replaces the content of the toolbar with new
+    | (AJAX) requests.
+    |
+    */
+    'replace' => env('TELESCOPE_TOOLBAR_REPLACE', true),
+
     /*
     |--------------------------------------------------------------------------
     | Use Telescope Theme ('light mode')
diff --git a/resources/css/base.css b/resources/css/base.css
index a512095..2012cf1 100644
--- a/resources/css/base.css
+++ b/resources/css/base.css
@@ -1,5 +1,53 @@
+.sf-toolbarreset {
+    --sf-toolbar-font-family-system: system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", "Liberation Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+    --sf-toolbar-font-family-monospace: "Ubuntu Mono", "JetBrains Mono", ui-monospace, "Roboto Mono", SFMono-Regular, Menlo, Monaco, Consolas,"Liberation Mono", "Courier New", monospace;
+
+    --sf-toolbar-white: #fff;
+    --sf-toolbar-black: #000;
+    --sf-toolbar-gray-50: #fafafa;
+    --sf-toolbar-gray-100: #f5f5f5;
+    --sf-toolbar-gray-200: #e5e5e5;
+    --sf-toolbar-gray-300: #d4d4d4;
+    --sf-toolbar-gray-400: #a3a3a3;
+    --sf-toolbar-gray-500: #737373;
+    --sf-toolbar-gray-600: #525252;
+    --sf-toolbar-gray-700: #404040;
+    --sf-toolbar-gray-800: #262626;
+    --sf-toolbar-gray-900: #171717;
+    --sf-toolbar-red-50: #FEFBFC;
+    --sf-toolbar-red-100: #FCE9ED;
+    --sf-toolbar-red-200: #F5B8C5;
+    --sf-toolbar-red-300: #EF869C;
+    --sf-toolbar-red-400: #E85574;
+    --sf-toolbar-red-500: #E1244B;
+    --sf-toolbar-red-600: #B41939;
+    --sf-toolbar-red-700: #83122A;
+    --sf-toolbar-red-800: #510B1A;
+    --sf-toolbar-red-900: #20040A;
+    --sf-toolbar-yellow-50: #fef7e1;
+    --sf-toolbar-yellow-100: #fef2cd;
+    --sf-toolbar-yellow-200: #fde496;
+    --sf-toolbar-yellow-300: #fcd55f;
+    --sf-toolbar-yellow-400: #fbc728;
+    --sf-toolbar-yellow-500: #e6af05;
+    --sf-toolbar-yellow-600: #af8503;
+    --sf-toolbar-yellow-700: #785b02;
+    --sf-toolbar-yellow-800: #413101;
+    --sf-toolbar-yellow-900: #0a0800;
+    --sf-toolbar-green-50: #eff5f5;
+    --sf-toolbar-green-100: #deeaea;
+    --sf-toolbar-green-200: #bbd5d5;
+    --sf-toolbar-green-300: #99bfbf;
+    --sf-toolbar-green-400: #76a9a9;
+    --sf-toolbar-green-500: #598e8e;
+    --sf-toolbar-green-600: #436c6c;
+    --sf-toolbar-green-700: #2e4949;
+    --sf-toolbar-green-800: #182727;
+    --sf-toolbar-green-900: #030404;
+}
+
 .sf-minitoolbar {
-    background-color: #222;
+    background-color: var(--sf-toolbar-gray-800);
     border-top-left-radius: 4px;
     bottom: 0;
     box-sizing: border-box;
@@ -11,11 +59,14 @@
     z-index: 99999;
 }
 
-.sf-minitoolbar a {
-    display: block;
+.sf-minitoolbar button {
+    background-color: transparent;
+    padding: 0;
+    border: none;
 }
 .sf-minitoolbar svg,
 .sf-minitoolbar img {
+    color: var(--sf-toolbar-gray-200);
     max-height: 24px;
     max-width: 24px;
     display: inline;
@@ -30,7 +81,7 @@
     display: none;
 }
 
-.sf-toolbarreset * {
+.sf-toolbarreset *:not(svg rect) {
     box-sizing: content-box;
     vertical-align: baseline;
     letter-spacing: normal;
@@ -38,11 +89,11 @@
 }
 
 .sf-toolbarreset {
-    background-color: #222;
+    background-color: var(--sf-toolbar-gray-800);
     bottom: 0;
-    box-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2);
-    color: #EEE;
-    font: 11px Arial, sans-serif;
+    box-shadow: inset 0 1px 0 var(--sf-toolbar-black), 0 -1px 0 rgba(0, 0, 0, 0.5);
+    color: var(--sf-toolbar-gray-200);
+    font: 11px var(--sf-toolbar-font-family-system);
     left: 0;
     margin: 0;
     padding: 0 36px 0 0;
@@ -58,7 +109,7 @@
     -moz-osx-font-smoothing: auto;
 }
 .sf-toolbarreset abbr {
-    border: dashed #777;
+    border: dashed var(--sf-toolbar-gray-500);
     border-width: 0 0 1px;
 }
 .sf-toolbarreset svg,
@@ -68,20 +119,31 @@
     display: inline-block;
 }
 
+.sf-toolbarreset .sf-cancel-button {
+    color: var(--sf-toolbar-gray-700);
+}
+
 .sf-toolbarreset .hide-button {
-    background: #444;
+    background: var(--sf-toolbar-gray-800);
+    color: var(--sf-toolbar-gray-300);
     display: block;
     position: absolute;
-    top: 0;
+    top: 2px;
     right: 0;
     width: 36px;
-    height: 36px;
+    height: 34px;
     cursor: pointer;
     text-align: center;
+    border: none;
+    margin: 0;
+    padding: 0;
+}
+.sf-toolbarreset .hide-button:hover {
+    background: var(--sf-toolbar-gray-700);
 }
 .sf-toolbarreset .hide-button svg {
     max-height: 18px;
-    margin-top: 10px;
+    margin-top: 1px;
 }
 
 .sf-toolbar-block {
@@ -90,6 +152,7 @@
     float: left;
     height: 36px;
     margin-right: 0;
+    position: relative;
     white-space: nowrap;
     max-width: 15%;
 }
@@ -97,6 +160,7 @@
 .sf-toolbar-block > a:hover {
     display: block;
     text-decoration: none;
+    background-color: transparent;
     color: inherit;
 }
 
@@ -104,15 +168,16 @@
     display: inline-block;
 }
 .sf-toolbar-block .sf-toolbar-value {
-    color: #F5F5F5;
+    color: var(--sf-toolbar-gray-100);
     font-size: 13px;
     line-height: 36px;
     padding: 0;
 }
 .sf-toolbar-block .sf-toolbar-label,
 .sf-toolbar-block .sf-toolbar-class-separator {
-    color: #AAA;
+    color: var(--sf-toolbar-gray-400);
     font-size: 12px;
+    margin-left: 2px;
 }
 
 .sf-toolbar-block .sf-toolbar-info {
@@ -121,7 +186,7 @@
     z-index: 100000;
 }
 .sf-toolbar-block hr {
-    border-top: 1px solid #777;
+    border-top: 1px solid var(--sf-toolbar-gray-500);
     margin: 4px 0;
     padding-top: 4px;
 }
@@ -146,6 +211,7 @@
 }
 
 .sf-toolbar-block .sf-toolbar-info-piece .sf-toolbar-status {
+    border-radius: 4px;
     padding: 2px 5px;
     margin-bottom: 0;
 }
@@ -166,75 +232,104 @@ div.sf-toolbar .sf-toolbar-block a:hover {
 }
 
 .sf-toolbar-block .sf-toolbar-info-piece b {
-    color: #AAA;
+    color: var(--sf-toolbar-gray-400);
     display: table-cell;
     font-size: 11px;
     padding: 4px 8px 4px 0;
 }
 .sf-toolbar-block:not(.sf-toolbar-block-dump) .sf-toolbar-info-piece span {
-    color: #F5F5F5;
+    color: var(--sf-toolbar-gray-100);
 }
 .sf-toolbar-block .sf-toolbar-info-piece span {
     font-size: 12px;
 }
+div.sf-toolbar  .sf-toolbar-block .sf-toolbar-info-piece.sf-toolbar-info-php-ext a {
+    text-decoration: none;
+}
 
 .sf-toolbar-block .sf-toolbar-info {
-    background-color: #444;
+    background-color: var(--sf-toolbar-gray-700);
+    border-radius: 4px;
+    border-bottom-left-radius: 0;
     bottom: 36px;
-    color: #F5F5F5;
+    color: var(--sf-toolbar-gray-100);
     display: none;
     padding: 9px 0;
     position: absolute;
 }
 
+.sf-toolbar-block.sf-toolbar-block-right .sf-toolbar-info {
+    border-bottom-left-radius: 4px;
+    border-bottom-right-radius: 0;
+}
+
 .sf-toolbar-block .sf-toolbar-info:empty {
     visibility: hidden;
 }
 
 .sf-toolbar-block .sf-toolbar-status {
     display: inline-block;
-    color: #FFF;
-    background-color: #666;
+    color: var(--sf-toolbar-white);
+    background-color: var(--sf-toolbar-gray-600);
     padding: 3px 6px;
-    margin-bottom: 2px;
-    vertical-align: middle;
+    margin: 0 4px;
     min-width: 15px;
     min-height: 13px;
     text-align: center;
 }
 
-.sf-toolbar-block .sf-toolbar-status-green {
-    background-color: #4F805D;
+.sf-toolbar-block .sf-toolbar-status.sf-toolbar-status-green,
+.sf-toolbar-block .sf-toolbar-info .sf-toolbar-status.sf-toolbar-status-green {
+    background-color: #059669;
+    color: var(--white);
 }
-.sf-toolbar-block .sf-toolbar-status-red {
-    background-color: #B0413E;
+.sf-toolbar-block .sf-toolbar-status.sf-toolbar-status-red,
+.sf-toolbar-block .sf-toolbar-info .sf-toolbar-status.sf-toolbar-status-red {
+    background-color: var(--sf-toolbar-red-500);
+    color: var(--sf-toolbar-red-50);
 }
-.sf-toolbar-block .sf-toolbar-status-yellow {
-    background-color: #A46A1F;
+.sf-toolbar-block .sf-toolbar-status.sf-toolbar-status-yellow,
+.sf-toolbar-block .sf-toolbar-info .sf-toolbar-status.sf-toolbar-status-yellow {
+    background-color: var(--sf-toolbar-yellow-300);
+    color: var(--sf-toolbar-yellow-800);
 }
 
-.sf-toolbar-block.sf-toolbar-status-green {
-    background-color: #4F805D;
-    color: #FFF;
+.sf-toolbar-block.sf-toolbar-status-green::before,
+.sf-toolbar-block.sf-toolbar-status-red::before,
+.sf-toolbar-block.sf-toolbar-status-yellow::before {
+    background: var(--sf-toolbar-yellow-400);
+    border-radius: 6px;
+    content: '';
+    position: absolute;
+    bottom: 1px;
+    left: 0;
+    width: 98%;
+    height: 3px;
+    z-index: 10005;
 }
-.sf-toolbar-block.sf-toolbar-status-red {
-    background-color: #B0413E;
-    color: #FFF;
+.sf-toolbar-block.sf-toolbar-status-red::before {
+    background: var(--sf-toolbar-red-400);
 }
-.sf-toolbar-block.sf-toolbar-status-yellow {
-    background-color: #A46A1F;
-    color: #FFF;
+.sf-toolbar-block.sf-toolbar-status-green::before {
+    background: var(--sf-toolbar-green-400);
+}
+.sf-toolbar-block-request.sf-toolbar-block.sf-toolbar-status-green::before,
+.sf-toolbar-block-request.sf-toolbar-block.sf-toolbar-status-red::before,
+.sf-toolbar-block-request.sf-toolbar-block.sf-toolbar-status-yellow::before {
+    display: none;
 }
 
 .sf-toolbar-block-request .sf-toolbar-status {
-    color: #FFF;
+    border-radius: 6px;
+    color: #fff;
     display: inline-block;
-    font-size: 14px;
-    height: 36px;
-    line-height: 36px;
-    padding: 0 10px;
+    flex-shrink: 0;
+    font-size: 13px;
+    font-weight: 500;
+    padding: 4px 8px;
 }
 .sf-toolbar-block-request .sf-toolbar-info-piece a {
+    background-color: transparent;
     text-decoration: none;
 }
 .sf-toolbar-block-request .sf-toolbar-info-piece a:hover {
@@ -245,12 +340,27 @@ div.sf-toolbar .sf-toolbar-block a:hover {
     padding: 2px 4px;
     line-height: 18px;
 }
+.sf-toolbar-block.sf-toolbar-block-request .sf-toolbar-redirection-status.sf-toolbar-status-yellow {
+    background-color: var(--sf-toolbar-yellow-300);
+    border-radius: 4px;
+    color: var(--sf-toolbar-yellow-800);
+    padding: 1px 4px;
+}
+.sf-toolbar-block.sf-toolbar-block-request .sf-toolbar-info-piece .sf-toolbar-redirection-method {
+    background: transparent;
+    color: var(--sf-toolbar-gray-300);
+    border: 1px solid var(--sf-toolbar-gray-400);
+    padding: 1px 4px;
+}
 .sf-toolbar-block-request .sf-toolbar-info-piece span.sf-toolbar-redirection-method {
     font-size: 12px;
     height: 17px;
     line-height: 17px;
     margin-right: 5px;
 }
+.sf-toolbar-block-request .sf-toolbar-request-icon svg {
+    stroke-width: 3px;
+}
 
 .sf-toolbar-block-ajax .sf-toolbar-icon {
     cursor: pointer;
@@ -259,28 +369,31 @@ div.sf-toolbar .sf-toolbar-block a:hover {
 .sf-toolbar-status-green .sf-toolbar-label,
 .sf-toolbar-status-yellow .sf-toolbar-label,
 .sf-toolbar-status-red .sf-toolbar-label {
-    color: #FFF;
-}
-.sf-toolbar-status-green svg path,
-.sf-toolbar-status-green svg .sf-svg-path,
-.sf-toolbar-status-red svg path,
-.sf-toolbar-status-red svg .sf-svg-path,
-.sf-toolbar-status-yellow svg path,
-.sf-toolbar-status-yellow svg .sf-svg-path {
-    fill: #FFF;
+    color: var(--sf-toolbar-white);
 }
 .sf-toolbar-block-config svg path,
 .sf-toolbar-block-config svg .sf-svg-path {
-    fill: #FFF;
+    fill: var(--sf-toolbar-white);
 }
 
 .sf-toolbar-block .sf-toolbar-icon {
-    display: block;
+    color: var(--sf-toolbar-gray-300);
+    align-items: center;
+    display: flex;
     height: 36px;
     padding: 0 7px;
     overflow: hidden;
     text-overflow: ellipsis;
 }
+.sf-toolbar-block:hover .sf-toolbar-icon {
+    border-bottom-left-radius: 4px;
+    border-bottom-right-radius: 4px;
+    box-shadow: 1px 0 0 var(--sf-toolbar-black), inset 0 -1px 0 var(--sf-toolbar-black);
+}
+.sf-toolbar-block.sf-toolbar-block-right:hover .sf-toolbar-icon {
+    box-shadow: -1px 0 0 var(--sf-toolbar-black), inset 0 -1px 0 var(--sf-toolbar-black);
+}
+
 .sf-toolbar-block-request .sf-toolbar-icon {
     padding-left: 0;
     padding-right: 0;
@@ -289,17 +402,19 @@ div.sf-toolbar .sf-toolbar-block a:hover {
 .sf-toolbar-block .sf-toolbar-icon img,
 .sf-toolbar-block .sf-toolbar-icon svg {
     border-width: 0;
-    position: relative;
-    top: 8px;
-    vertical-align: baseline;
 }
 
 .sf-toolbar-block .sf-toolbar-icon img + span,
 .sf-toolbar-block .sf-toolbar-icon svg + span {
     margin-left: 4px;
 }
-.sf-toolbar-block-config .sf-toolbar-icon .sf-toolbar-value {
-    margin-left: 4px;
+.sf-toolbar-block-config .sf-toolbar-icon .sf-toolbar-value,
+.sf-toolbar-block.sf-toolbar-block-sf-cli .sf-toolbar-value {
+    margin-left: 5px;
+}
+.sf-toolbar-block-config .sf-toolbar-icon .sf-toolbar-label,
+.sf-toolbar-block.sf-toolbar-block-sf-cli .sf-toolbar-label {
+    margin-left: 0;
 }
 
 .sf-toolbar-block:hover,
@@ -308,7 +423,7 @@ div.sf-toolbar .sf-toolbar-block a:hover {
 }
 .sf-toolbar-block:hover .sf-toolbar-icon,
 .sf-toolbar-block.hover .sf-toolbar-icon {
-    background-color: #444;
+    background-color: var(--sf-toolbar-gray-700);
     position: relative;
     z-index: 10002;
 }
@@ -319,33 +434,36 @@ div.sf-toolbar .sf-toolbar-block a:hover {
 .sf-toolbar-block.hover .sf-toolbar-info {
     display: block;
     padding: 10px;
-    max-width: 480px;
+    max-width: 525px;
     max-height: 480px;
     word-wrap: break-word;
     overflow: hidden;
     overflow-y: auto;
 }
 .sf-toolbar-info-piece b.sf-toolbar-ajax-info {
-    color: #F5F5F5;
+    color: var(--sf-toolbar-gray-100);
 }
 .sf-toolbar-ajax-requests {
-    table-layout: auto;
+    border: 1px solid var(--sf-toolbar-gray-500);
+    font-variant: tabular-nums;
+    margin: 5px 0 0;
     width: 100%;
 }
 .sf-toolbar-ajax-requests td {
-    background-color: #444;
-    border-bottom: 1px solid #777;
-    color: #F5F5F5;
+    background-color: var(--sf-toolbar-gray-700);
+    border: 1px solid var(--sf-toolbar-gray-500);
+    color: var(--sf-toolbar-gray-100);
     font-size: 12px;
     padding: 4px;
+    vertical-align: middle;
 }
-.sf-toolbar-ajax-requests tr:last-child td {
-    border-bottom: 0;
+.sf-toolbar-ajax-requests thead {
+    border: 0;
 }
 .sf-toolbar-ajax-requests th {
-    background-color: #222;
-    border-bottom: 0;
-    color: #AAA;
+    background-color: var(--sf-toolbar-gray-800);
+    border: 1px solid var(--sf-toolbar-gray-500);
+    color: var(--sf-toolbar-gray-200);
     font-size: 11px;
     padding: 4px;
 }
@@ -364,13 +482,17 @@ div.sf-toolbar .sf-toolbar-block a:hover {
 .sf-ajax-request-duration {
     text-align: right;
 }
+.sf-toolbar-block .sf-toolbar-info-piece .sf-toolbar-ajax-requests .sf-toolbar-status {
+    font-size: 11px;
+    padding: 1px 3px;
+}
 .sf-ajax-request-loading {
     animation: sf-blink .5s ease-in-out infinite;
 }
 @keyframes sf-blink {
-    0% { background: #222; }
-    50% { background: #444; }
-    100% { background: #222; }
+    0% { background: var(--sf-toolbar-gray-800); }
+    50% { background: var(--sf-toolbar-gray-700); }
+    100% { background: var(--sf-toolbar-gray-800); }
 }
 
 .sf-toolbar-block.sf-toolbar-block-dump .sf-toolbar-info {
@@ -382,8 +504,8 @@ div.sf-toolbar .sf-toolbar-block a:hover {
 }
 
 .sf-toolbar-block-dump pre.sf-dump {
-    background-color: #222;
-    border-color: #777;
+    background-color: var(--sf-toolbar-gray-800);
+    border-color: var(--sf-toolbar-gray-500);
     border-radius: 0;
     margin: 6px 0 12px 0;
 }
@@ -401,45 +523,48 @@ div.sf-toolbar .sf-toolbar-block a:hover {
     display: block;
 }
 .sf-toolbar-block-dump .sf-toolbar-info-piece .sf-toolbar-file-line {
-    color: #AAA;
+    color: var(--sf-toolbar-gray-400);
     margin-left: 4px;
 }
 .sf-toolbar-block-dump .sf-toolbar-info img {
     display: none;
 }
 
+.sf-toolbar-block-serializer .detailed-metrics {
+    display: grid;
+    grid-template-columns: repeat(3, 1fr);
+    grid-gap: 15px;
+    margin-top: 15px;
+}
+
 /* Responsive Design */
 .sf-toolbar-icon .sf-toolbar-label,
 .sf-toolbar-icon .sf-toolbar-value {
     display: none;
 }
-.sf-toolbar-block-config .sf-toolbar-icon .sf-toolbar-label {
+.sf-toolbar-block-config .sf-toolbar-icon .sf-toolbar-label,
+.sf-cli .sf-toolbar-icon .sf-toolbar-label {
     display: inline-block;
 }
 
 /* Legacy Design - these styles are maintained to make old panels look
    a bit better on the new toolbar */
 .sf-toolbar-block .sf-toolbar-info-piece-additional-detail {
-    color: #AAA;
+    color: var(--sf-toolbar-gray-400);
     font-size: 12px;
 }
 .sf-toolbar-status-green .sf-toolbar-info-piece-additional-detail,
 .sf-toolbar-status-yellow .sf-toolbar-info-piece-additional-detail,
 .sf-toolbar-status-red .sf-toolbar-info-piece-additional-detail {
-    color: #FFF;
+    color: var(--sf-toolbar-white);
 }
 
 @media (min-width: 768px) {
-
     .sf-toolbar-icon .sf-toolbar-label,
     .sf-toolbar-icon .sf-toolbar-value {
         display: inline;
     }
 
-    .sf-toolbar-block .sf-toolbar-icon img,
-    .sf-toolbar-block .sf-toolbar-icon svg {
-        top: 6px;
-    }
     .sf-toolbar-block-time .sf-toolbar-icon svg,
     .sf-toolbar-block-memory .sf-toolbar-icon svg {
         display: none;
@@ -459,20 +584,24 @@ div.sf-toolbar .sf-toolbar-block a:hover {
         padding-left: 5px;
     }
     .sf-toolbar-block-request .sf-toolbar-icon {
+        display: flex;
+        align-items: center;
         padding-left: 0;
         padding-right: 0;
     }
     .sf-toolbar-block-request .sf-toolbar-label {
-        margin-left: 5px;
+        margin-left: 4px;
+        margin-right: 1px;
     }
-    .sf-toolbar-block-request .sf-toolbar-status + svg {
+    .sf-toolbar-block-request .sf-toolbar-status + .sf-toolbar-request-icon {
+        display: inline-flex;
         margin-left: 5px;
     }
-    .sf-toolbar-block-request .sf-toolbar-icon svg + .sf-toolbar-label {
+    .sf-toolbar-block-request .sf-toolbar-icon .sf-toolbar-request-icon + .sf-toolbar-label {
         margin-left: 0;
     }
     .sf-toolbar-block-request .sf-toolbar-label + .sf-toolbar-value {
-        margin-right: 10px;
+        margin-right: 5px;
     }
 
     .sf-toolbar-block-request:hover .sf-toolbar-info {
@@ -491,6 +620,10 @@ div.sf-toolbar .sf-toolbar-block a:hover {
         margin-left: 0;
         margin-right: 0;
     }
+    .sf-toolbarreset .sf-toolbar-block.sf-toolbar-block-right:not(.sf-toolbar-block-sf-cli) .sf-toolbar-info {
+        border-bottom-left-radius: 4px;
+        border-bottom-right-radius: 0;
+    }
 }
 
 @media (min-width: 1024px) {
@@ -507,9 +640,9 @@ div.sf-toolbar .sf-toolbar-block a:hover {
 
 /***** Error Toolbar *****/
 .sf-error-toolbar .sf-toolbarreset {
-    background: #222;
-    color: #f5f5f5;
-    font: 13px/36px Arial, sans-serif;
+    background: var(--sf-toolbar-gray-800);
+    color: var(--sf-toolbar-gray-100);
+    font: 13px/36px var(--sf-toolbar-font-family-system);
     height: 36px;
     padding: 0 15px;
     text-align: left;
@@ -535,9 +668,14 @@ div.sf-toolbar .sf-toolbar-block a:hover {
     margin-right: 10px;
 }
 
+.sf-full-stack {
+    left: 0px;
+    font-size: 12px;
+}
+
 /***** Media query print: Do not print the Toolbar. *****/
 @media print {
     .sf-toolbar {
-        display: none;
+        display: none !important;
     }
 }
diff --git a/resources/css/custom.css b/resources/css/custom.css
index 1f784f3..00fa5d5 100644
--- a/resources/css/custom.css
+++ b/resources/css/custom.css
@@ -51,3 +51,7 @@
     max-height: 18px;
     margin-top: 4px;
 }
+.sf-toolbar-block-config svg path,
+.sf-toolbar-block-config svg .sf-svg-path {
+    fill: #FF2929;
+}
diff --git a/resources/css/theme_light.css b/resources/css/theme_light.css
index 3e4ca1f..ac2bd07 100644
--- a/resources/css/theme_light.css
+++ b/resources/css/theme_light.css
@@ -1,6 +1,3 @@
-.sf-minitoolbar {
-    background-color: #3439BC;
-}
 
 .sf-toolbarreset {
     background-color: #EEF1F3;
@@ -8,8 +5,9 @@
     color: #212529;
 }
 
-.sf-toolbarreset .hide-button {
-    background: #3439BC;
+.sf-toolbarreset .hide-button, .sf-toolbarreset .hide-button:hover {
+    background: #EEF1F3;
+    color: var(--sf-toolbar-gray-800);
 }
 
 .sf-toolbar-block .sf-toolbar-value {
@@ -52,11 +50,6 @@ div.sf-toolbar .sf-toolbar-block .sf-toolbar-info-piece a {
 
 .sf-toolbar-block .sf-toolbar-status {
     background-color: #212529;
-    border-radius: 9999px;
-}
-
-.sf-toolbar-icon .sf-toolbar-status {
-    border-radius: 0px;
 }
 
 .sf-toolbar-block .sf-toolbar-status-green {
@@ -83,6 +76,10 @@ div.sf-toolbar .sf-toolbar-block .sf-toolbar-info-piece a {
     background-color: #D69E2E;
 }
 
+.sf-toolbar-block .sf-toolbar-icon {
+    color: var(--sf-toolbar-gray-800);
+}
+
 .sf-toolbar-block:hover .sf-toolbar-icon,
 .sf-toolbar-block.hover .sf-toolbar-icon {
     background-color: #fff;
@@ -137,4 +134,4 @@ div.sf-toolbar .sf-toolbar-block .sf-toolbar-info-piece a {
 
 .sf-error-toolbar .sf-toolbarreset a {
     color: #3439bc;
-}
\ No newline at end of file
+}
diff --git a/resources/icons/LICENSE.txt b/resources/icons/LICENSE.txt
new file mode 100644
index 0000000..c3b6e47
--- /dev/null
+++ b/resources/icons/LICENSE.txt
@@ -0,0 +1,26 @@
+Icons are from "Tabler Icons" (https://github.com/tabler/tabler-icons), a set of
+free MIT-licensed high-quality SVG icons.
+
+-----
+
+MIT License
+
+Copyright (c) 2020-2022 Paweł Kuna
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/resources/icons/ajax.svg b/resources/icons/ajax.svg
index f19d536..ba7dcfd 100644
--- a/resources/icons/ajax.svg
+++ b/resources/icons/ajax.svg
@@ -1 +1,7 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="#868d94" d="M9.8 18L6 22.4c-.3.3-.8.4-1.1 0L1 18c-.4-.5-.1-1 .5-1H3V6.4C3 3.8 5.5 2 8.2 2h3.9c1.1 0 2 .9 2 2s-.9 2-2 2H8.2C7.7 6 7 6 7 6.4V17h2.2c.6 0 1 .5.6 1zM23 6l-3.8-4.5a.8.8 0 0 0-1.1 0L14.2 6c-.4.5-.1 1 .5 1H17v10.6c0 .4-.7.4-1.2.4h-3.9c-1.1 0-2 .9-2 2s.9 2 2 2h3.9c2.6 0 5.2-1.8 5.2-4.4V7h1.5c.6 0 .9-.5.5-1z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" data-icon-name="icon-tabler-arrows-down-up" width="24" height="24" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
+    <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
+    <line x1="17" y1="3" x2="17" y2="21"></line>
+    <path d="M10 18l-3 3l-3 -3"></path>
+    <line x1="7" y1="21" x2="7" y2="3"></line>
+    <path d="M20 6l-3 -3l-3 3"></path>
+</svg>
diff --git a/resources/icons/cache.svg b/resources/icons/cache.svg
index f24682c..be85557 100644
--- a/resources/icons/cache.svg
+++ b/resources/icons/cache.svg
@@ -1,3 +1,7 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
-    <path fill="#868d94" d="M16 2h4v15a3 3 0 0 1-3 3H3a3 3 0 0 1-3-3V0h16v2zm0 2v13a1 1 0 0 0 1 1 1 1 0 0 0 1-1V4h-2zM2 2v15a1 1 0 0 0 1 1h11.17a2.98 2.98 0 0 1-.17-1V2H2zm2 8h8v2H4v-2zm0 4h8v2H4v-2zM4 4h8v4H4V4z"></path>
+<svg xmlns="http://www.w3.org/2000/svg" data-icon-name="icon-tabler-stack-2" width="24" height="24" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round" role="img">
+    <title>Cache</title>
+    <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
+    <polyline points="12 4 4 8 12 12 20 8 12 4"></polyline>
+    <polyline points="4 12 12 16 20 12"></polyline>
+    <polyline points="4 16 12 20 20 16"></polyline>
 </svg>
diff --git a/resources/icons/close.svg b/resources/icons/close.svg
index 01c294a..d19c88b 100644
--- a/resources/icons/close.svg
+++ b/resources/icons/close.svg
@@ -1 +1,5 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="#868d94" d="M21.1 18.3c.8.8.8 2 0 2.8-.4.4-.9.6-1.4.6s-1-.2-1.4-.6L12 14.8l-6.3 6.3c-.4.4-.9.6-1.4.6s-1-.2-1.4-.6a2 2 0 0 1 0-2.8L9.2 12 2.9 5.7a2 2 0 0 1 0-2.8 2 2 0 0 1 2.8 0L12 9.2l6.3-6.3a2 2 0 0 1 2.8 0c.8.8.8 2 0 2.8L14.8 12l6.3 6.3z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" data-icon-name="icon-tabler-x" width="24" height="24" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
+    <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
+    <line x1="18" y1="6" x2="6" y2="18"></line>
+    <line x1="6" y1="6" x2="18" y2="18"></line>
+</svg>
diff --git a/resources/icons/commands.svg b/resources/icons/commands.svg
index 3fbca2d..fc391c7 100644
--- a/resources/icons/commands.svg
+++ b/resources/icons/commands.svg
@@ -1,3 +1,6 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
-    <path fill="#868d94" d="M7 17H2a2 2 0 0 1-2-2V2C0 .9.9 0 2 0h16a2 2 0 0 1 2 2v13a2 2 0 0 1-2 2h-5l4 2v1H3v-1l4-2zM2 2v11h16V2H2z"></path>
+<svg xmlns="http://www.w3.org/2000/svg" data-icon-name="icon-tabler-terminal-2" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
+    <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
+    <path d="M8 9l3 3l-3 3"></path>
+    <line x1="13" y1="15" x2="16" y2="15"></line>
+    <rect x="3" y="4" width="18" height="16" rx="2"></rect>
 </svg>
diff --git a/resources/icons/config.svg b/resources/icons/config.svg
index 4c204b2..8f76cf1 100644
--- a/resources/icons/config.svg
+++ b/resources/icons/config.svg
@@ -1 +1,13 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="#868d94" d="M11 5.1C11 3.4 9.6 2 7.9 2H5.1A3.1 3.1 0 0 0 2 5.1V18c0 1.6 1.4 3 3.1 3H8c1.7 0 3.1-1.4 3.1-3.1V5.1zM5.2 4h2.7C8.4 4 9 4.8 9 5.3V11H4V5.3C4 4.8 4.6 4 5.2 4zM22 5.1C22 3.4 20.6 2 18.9 2H16c-1.6 0-3 1.4-3 3.1V18c0 1.7 1.4 3.1 3.1 3.1H19c1.7 0 3.1-1.4 3.1-3.1V5.1zM16 4h2.8c.6 0 1.2.8 1.2 1.3V8h-5V5.3c0-.5.5-1.3 1-1.3z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" data-icon-name="icon-tabler-adjustments" width="24" height="24" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round" role="img">
+    <title>Config</title>
+    <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
+    <circle cx="6" cy="10" r="2"></circle>
+    <line x1="6" y1="4" x2="6" y2="8"></line>
+    <line x1="6" y1="12" x2="6" y2="20"></line>
+    <circle cx="12" cy="16" r="2"></circle>
+    <line x1="12" y1="4" x2="12" y2="14"></line>
+    <line x1="12" y1="18" x2="12" y2="20"></line>
+    <circle cx="18" cy="7" r="2"></circle>
+    <line x1="18" y1="4" x2="18" y2="5"></line>
+    <line x1="18" y1="9" x2="18" y2="20"></line>
+</svg>
diff --git a/resources/icons/dumps.svg b/resources/icons/dumps.svg
index 7f29cd1..02a5b70 100644
--- a/resources/icons/dumps.svg
+++ b/resources/icons/dumps.svg
@@ -1,3 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
-    <path fill="#868d94" d="M.7 9.3l4.8-4.8 1.4 1.42L2.84 10l4.07 4.07-1.41 1.42L0 10l.7-.7zm18.6 1.4l.7-.7-5.49-5.49-1.4 1.42L17.16 10l-4.07 4.07 1.41 1.42 4.78-4.78z"></path>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-code" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M7 8l-4 4l4 4" /><path d="M17 8l4 4l-4 4" /><path d="M14 4l-4 16" /></svg>
diff --git a/resources/icons/events.svg b/resources/icons/events.svg
index 81aea46..77d0173 100644
--- a/resources/icons/events.svg
+++ b/resources/icons/events.svg
@@ -1,3 +1,8 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
-    <path fill="#868d94" d="M16 8A6 6 0 1 0 4 8v11H2a2 2 0 0 1-2-2v-4a2 2 0 0 1 2-2V8a8 8 0 1 1 16 0v3a2 2 0 0 1 2 2v4a2 2 0 0 1-2 2h-2V8zm-4 2h3v10h-3V10zm-7 0h3v10H5V10z"></path>
+<svg xmlns="http://www.w3.org/2000/svg" data-icon-name="icon-tabler-access-point" width="24" height="24" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
+    <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
+    <line x1="12" y1="12" x2="12" y2="12.01"></line>
+    <path d="M14.828 9.172a4 4 0 0 1 0 5.656"></path>
+    <path d="M17.657 6.343a8 8 0 0 1 0 11.314"></path>
+    <path d="M9.168 14.828a4 4 0 0 1 0 -5.656"></path>
+    <path d="M6.337 17.657a8 8 0 0 1 0 -11.314"></path>
 </svg>
diff --git a/resources/icons/exceptions.svg b/resources/icons/exceptions.svg
index 66c4e56..8fa0752 100644
--- a/resources/icons/exceptions.svg
+++ b/resources/icons/exceptions.svg
@@ -1,3 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
-    <path fill="#868d94" d="M15.3 14.89l2.77 2.77a1 1 0 0 1 0 1.41 1 1 0 0 1-1.41 0l-2.59-2.58A5.99 5.99 0 0 1 11 18V9.04a1 1 0 0 0-2 0V18a5.98 5.98 0 0 1-3.07-1.51l-2.59 2.58a1 1 0 0 1-1.41 0 1 1 0 0 1 0-1.41l2.77-2.77A5.95 5.95 0 0 1 4.07 13H1a1 1 0 1 1 0-2h3V8.41L.93 5.34a1 1 0 0 1 0-1.41 1 1 0 0 1 1.41 0l2.1 2.1h11.12l2.1-2.1a1 1 0 0 1 1.41 0 1 1 0 0 1 0 1.41L16 8.41V11h3a1 1 0 1 1 0 2h-3.07c-.1.67-.32 1.31-.63 1.89zM15 5H5a5 5 0 1 1 10 0z"></path>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-bug" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M9 9v-1a3 3 0 0 1 6 0v1" /><path d="M8 9h8a6 6 0 0 1 1 3v3a5 5 0 0 1 -10 0v-3a6 6 0 0 1 1 -3" /><path d="M3 13l4 0" /><path d="M17 13l4 0" /><path d="M12 20l0 -6" /><path d="M4 19l3.35 -2" /><path d="M20 19l-3.35 -2" /><path d="M4 7l3.75 2.4" /><path d="M20 7l-3.75 2.4" /></svg>
diff --git a/resources/icons/forward.svg b/resources/icons/forward.svg
index 382891f..57420af 100644
--- a/resources/icons/forward.svg
+++ b/resources/icons/forward.svg
@@ -1 +1,6 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="#868d94" d="M23.6 11l-6.5-6.6a1.2 1.2 0 0 0-2.1.9V9H1.4A1.8 1.8 0 0 0 0 10.8v2.6A1.6 1.6 0 0 0 1.4 15H15v3.7a1.2 1.2 0 0 0 2 1l6.7-6.8a1.3 1.3 0 0 0 0-1.8z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" data-icon-name="icon-tabler-arrow-narrow-right" width="24" height="24" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
+    <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
+    <line x1="5" y1="12" x2="19" y2="12"></line>
+    <line x1="15" y1="16" x2="19" y2="12"></line>
+    <line x1="15" y1="8" x2="19" y2="12"></line>
+</svg>
diff --git a/resources/icons/gates.svg b/resources/icons/gates.svg
index 753ec14..5464f23 100644
--- a/resources/icons/gates.svg
+++ b/resources/icons/gates.svg
@@ -1,3 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
-    <path fill="#868d94" d="M7 10V7a5 5 0 1 1 10 0v3h2a2 2 0 0 1 2 2v8a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-8c0-1.1.9-2 2-2h2zm2 0h6V7a3 3 0 0 0-6 0v3zm-4 2v8h14v-8H5zm7 2a1 1 0 0 1 1 1v2a1 1 0 0 1-2 0v-2a1 1 0 0 1 1-1z"></path>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-lock-access" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M4 8v-2a2 2 0 0 1 2 -2h2" /><path d="M4 16v2a2 2 0 0 0 2 2h2" /><path d="M16 4h2a2 2 0 0 1 2 2v2" /><path d="M16 20h2a2 2 0 0 0 2 -2v-2" /><path d="M8 11m0 1a1 1 0 0 1 1 -1h6a1 1 0 0 1 1 1v3a1 1 0 0 1 -1 1h-6a1 1 0 0 1 -1 -1z" /><path d="M10 11v-2a2 2 0 1 1 4 0v2" /></svg>
diff --git a/resources/icons/http-client.svg b/resources/icons/http-client.svg
new file mode 100644
index 0000000..f7d612b
--- /dev/null
+++ b/resources/icons/http-client.svg
@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" data-icon-name="icon-tabler-affiliate" width="24" height="24" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
+    <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
+    <path d="M5.931 6.936l1.275 4.249m5.607 5.609l4.251 1.275"></path>
+    <path d="M11.683 12.317l5.759 -5.759"></path>
+    <circle cx="5.5" cy="5.5" r="1.5"></circle>
+    <circle cx="18.5" cy="5.5" r="1.5"></circle>
+    <circle cx="18.5" cy="18.5" r="1.5"></circle>
+    <circle cx="8.5" cy="15.5" r="4.5"></circle>
+</svg>
diff --git a/resources/icons/jobs.svg b/resources/icons/jobs.svg
index 0bf0b71..e239e85 100644
--- a/resources/icons/jobs.svg
+++ b/resources/icons/jobs.svg
@@ -1,3 +1,8 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
-    <path fill="#868d94" d="M0 2h20v4H0V2zm0 8h20v2H0v-2zm0 6h20v2H0v-2z"></path>
+<svg xmlns="http://www.w3.org/2000/svg" data-icon-name="icon-tabler-subtask" width="24" height="24" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
+    <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
+    <line x1="6" y1="9" x2="12" y2="9"></line>
+    <line x1="4" y1="5" x2="8" y2="5"></line>
+    <path d="M6 5v11a1 1 0 0 0 1 1h5"></path>
+    <rect x="12" y="7" width="8" height="4" rx="1"></rect>
+    <rect x="12" y="15" width="8" height="4" rx="1"></rect>
 </svg>
diff --git a/resources/icons/logs.svg b/resources/icons/logs.svg
index bc2ba7b..39a3adf 100644
--- a/resources/icons/logs.svg
+++ b/resources/icons/logs.svg
@@ -1,3 +1,8 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
-    <path fill="#868d94" d="M0 2C0 .9.9 0 2 0h16a2 2 0 0 1 2 2v2H0V2zm1 3h18v13a2 2 0 0 1-2 2H3a2 2 0 0 1-2-2V5zm6 2v2h6V7H7z"></path>
+<svg xmlns="http://www.w3.org/2000/svg" data-icon-name="icon-tabler-file-alert" width="24" height="24" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round" role="img">
+    <title>Logger</title>
+    <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
+    <path d="M14 3v4a1 1 0 0 0 1 1h4"></path>
+    <path d="M17 21h-10a2 2 0 0 1 -2 -2v-14a2 2 0 0 1 2 -2h7l5 5v11a2 2 0 0 1 -2 2z"></path>
+    <line x1="12" y1="17" x2="12.01" y2="17"></line>
+    <line x1="12" y1="11" x2="12" y2="14"></line>
 </svg>
diff --git a/resources/icons/mail.svg b/resources/icons/mail.svg
index e8cff25..c60967e 100644
--- a/resources/icons/mail.svg
+++ b/resources/icons/mail.svg
@@ -1,3 +1,6 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
-    <path fill="#868d94" d="M18 2a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V4c0-1.1.9-2 2-2h16zm-4.37 9.1L20 16v-2l-5.12-3.9L20 6V4l-10 8L0 4v2l5.12 4.1L0 14v2l6.37-4.9L10 14l3.63-2.9z"></path>
+<svg xmlns="http://www.w3.org/2000/svg" data-icon-name="icon-tabler-mail" width="24" height="24" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
+    <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
+    <rect x="3" y="5" width="18" height="14" rx="2"></rect>
+    <polyline points="3 7 12 13 21 7"></polyline>
 </svg>
+
diff --git a/resources/icons/memory.svg b/resources/icons/memory.svg
index 1999413..8e05e6e 100644
--- a/resources/icons/memory.svg
+++ b/resources/icons/memory.svg
@@ -1 +1,14 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="#868d94" d="M6 18.9V15h12v3.9c0 .7-.2 1.1-1 1.1H7c-.8 0-1-.4-1-1.1zM20 1c-.6 0-1 .5-1 1.1v18c0 .5-.4.9-.9.9H5.9a.9.9 0 0 1-.9-.9v-18C5 1.5 4.6 1 4 1c-.5 0-1 .5-1 1.1v18C3 21.7 4.3 23 5.9 23h12.2c1.6 0 2.9-1.3 2.9-2.9v-18c0-.6-.4-1.1-1-1.1zm-2 8H6v5h12V9z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" data-icon-name="icon-tabler-cpu" width="24" height="24" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round" role="img">
+    <title>Memory</title>
+    <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
+    <rect x="5" y="5" width="14" height="14" rx="1"></rect>
+    <path d="M9 9h6v6h-6z"></path>
+    <path d="M3 10h2"></path>
+    <path d="M3 14h2"></path>
+    <path d="M10 3v2"></path>
+    <path d="M14 3v2"></path>
+    <path d="M21 10h-2"></path>
+    <path d="M21 14h-2"></path>
+    <path d="M14 21v-2"></path>
+    <path d="M10 21v-2"></path>
+</svg>
diff --git a/resources/icons/menu.svg b/resources/icons/menu.svg
index eb8a719..4805aed 100644
--- a/resources/icons/menu.svg
+++ b/resources/icons/menu.svg
@@ -1 +1,7 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="#868d94" d="M2.6 17.5h18.8c.9 0 1.6.7 1.6 1.6v1.5c0 1-.7 1.6-1.6 1.6H2.6c-.9 0-1.6-.7-1.6-1.6v-1.5c0-.9.7-1.6 1.6-1.6zM1 11.2v1.6c0 .9.7 1.6 1.6 1.6h18.8c.9 0 1.6-.7 1.6-1.6v-1.6c0-.8-.7-1.6-1.6-1.6H2.6A1.6 1.6 0 0 0 1 11.2zm0-7.8v1.5a1.6 1.6 0 0 0 1.6 1.6h18.8c.9 0 1.6-.7 1.6-1.6V3.4c0-1-.7-1.6-1.6-1.6H2.6A1.6 1.6 0 0 0 1 3.4z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" data-icon-name="icon-tabler-menu-2" width="24" height="24" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round" role="img">
+    <title>Menu</title>
+    <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
+    <line x1="4" y1="6" x2="20" y2="6"></line>
+    <line x1="4" y1="12" x2="20" y2="12"></line>
+    <line x1="4" y1="18" x2="20" y2="18"></line>
+</svg>
diff --git a/resources/icons/models.svg b/resources/icons/models.svg
index bd263af..f4d2a42 100644
--- a/resources/icons/models.svg
+++ b/resources/icons/models.svg
@@ -1,3 +1,2 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
-    <path fill="#868d94" d="M10 1l10 6-10 6L0 7l10-6zm6.67 10L20 13l-10 6-10-6 3.33-2L10 15l6.67-4z"></path>
-</svg>
+
+<svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-table" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M3 5a2 2 0 0 1 2 -2h14a2 2 0 0 1 2 2v14a2 2 0 0 1 -2 2h-14a2 2 0 0 1 -2 -2v-14z" /><path d="M3 10h18" /><path d="M10 3v18" /></svg>
diff --git a/resources/icons/no-gray.svg b/resources/icons/no-gray.svg
deleted file mode 100644
index 740cb54..0000000
--- a/resources/icons/no-gray.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="28" height="28" viewBox="0 0 12 12"><path fill="#212529" d="M10.4 8.4L8 6l2.4-2.4c.8-.8.7-1.6.2-2.2-.6-.5-1.4-.6-2.2.2L6 4 3.6 1.6C2.8.8 2 .9 1.4 1.4c-.5.6-.6 1.4.2 2.2L4 6 1.6 8.4c-.8.8-.7 1.6-.2 2.2.6.6 1.4.6 2.2-.2L6 8l2.4 2.4c.8.8 1.6.7 2.2.2.5-.6.6-1.4-.2-2.2z"/></svg>
diff --git a/resources/icons/no.svg b/resources/icons/no.svg
deleted file mode 100644
index 1c94beb..0000000
--- a/resources/icons/no.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="28" height="28" viewBox="0 0 12 12"><path fill="#E53E3E" d="M10.4 8.4L8 6l2.4-2.4c.8-.8.7-1.6.2-2.2-.6-.5-1.4-.6-2.2.2L6 4 3.6 1.6C2.8.8 2 .9 1.4 1.4c-.5.6-.6 1.4.2 2.2L4 6 1.6 8.4c-.8.8-.7 1.6-.2 2.2.6.6 1.4.6 2.2-.2L6 8l2.4 2.4c.8.8 1.6.7 2.2.2.5-.6.6-1.4-.2-2.2z"/></svg>
diff --git a/resources/icons/notifications.svg b/resources/icons/notifications.svg
index ab1a767..80a0323 100644
--- a/resources/icons/notifications.svg
+++ b/resources/icons/notifications.svg
@@ -1,3 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
-    <path fill="#868d94" d="M3 6c0-1.1.9-2 2-2h8l4-4h2v16h-2l-4-4H5a2 2 0 0 1-2-2H1V6h2zm8 9v5H8l-1.67-5H5v-2h8v2h-2z"></path>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-speakerphone" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M18 8a3 3 0 0 1 0 6" /><path d="M10 8v11a1 1 0 0 1 -1 1h-1a1 1 0 0 1 -1 -1v-5" /><path d="M12 8h0l4.524 -3.77a.9 .9 0 0 1 1.476 .692v12.156a.9 .9 0 0 1 -1.476 .692l-4.524 -3.77h-8a1 1 0 0 1 -1 -1v-4a1 1 0 0 1 1 -1h8" /></svg>
diff --git a/resources/icons/pause.svg b/resources/icons/pause.svg
deleted file mode 100644
index 3bb58c6..0000000
--- a/resources/icons/pause.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" class="icon fill-primary">
-    <path fill="#868d94" d="M5 4h3v12H5V4zm7 0h3v12h-3V4z"/>
-</svg>
diff --git a/resources/icons/play.svg b/resources/icons/play.svg
deleted file mode 100644
index 348568c..0000000
--- a/resources/icons/play.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" class="icon fill-primary">
-    <path fill="#868d94" d="M4 4l12 6-12 6z"/>
-</svg>
diff --git a/resources/icons/queries.svg b/resources/icons/queries.svg
index babfbe6..97fd113 100644
--- a/resources/icons/queries.svg
+++ b/resources/icons/queries.svg
@@ -1,3 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
-    <path fill="#868d94" d="M1 1h18v2H1V1zm0 8h18v2H1V9zm0 8h18v2H1v-2zM1 5h12v2H1V5zm0 8h12v2H1v-2z"></path>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-database" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M12 6m-8 0a8 3 0 1 0 16 0a8 3 0 1 0 -16 0" /><path d="M4 6v6a8 3 0 0 0 16 0v-6" /><path d="M4 12v6a8 3 0 0 0 16 0v-6" /></svg>
diff --git a/resources/icons/redirect.svg b/resources/icons/redirect.svg
index a5da94f..a23a971 100644
--- a/resources/icons/redirect.svg
+++ b/resources/icons/redirect.svg
@@ -1 +1,5 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="#868d94" d="M23 7.8L14 .4a1.3 1.3 0 0 0-2 .9V4a13.6 13.6 0 0 1-2.2.6l-1.3.5c-.5.1-1 .4-1.4.6l-.7.4-.7.4a10.6 10.6 0 0 0-1.4 1A13.2 13.2 0 0 0 3 8.8a15.3 15.3 0 0 0-1.1 1.5 17.6 17.6 0 0 0-.9 1.6l-.5 1.7c-.2.5 0 1.2 0 1.7a10.2 10.2 0 0 0 0 1.5A5.7 5.7 0 0 0 1 18l.4 1.2 1 2 1 1.4 1 1c.2.2.4.1.3-.2l-.3-1.2-.3-1.6-.1-1.9v-1a3.4 3.4 0 0 1 .2-1 6.4 6.4 0 0 1 .3-.8l.4-.8.6-.6.6-.6.7-.4a7.5 7.5 0 0 1 .8-.2 4.5 4.5 0 0 1 .8-.2h2.5a3.8 3.8 0 0 1 1.2.3v3.1a1.3 1.3 0 0 0 2 1l9-7.5a1.5 1.5 0 0 0 0-2.3z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" data-icon-name="icon-tabler-corner-down-right" width="24" height="24" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round" role="img">
+    <title>Redirect</title>
+    <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
+    <path d="M6 6v6a3 3 0 0 0 3 3h10l-4 -4m0 8l4 -4"></path>
+</svg>
diff --git a/resources/icons/refresh.svg b/resources/icons/refresh.svg
index 0a09430..f018723 100644
--- a/resources/icons/refresh.svg
+++ b/resources/icons/refresh.svg
@@ -1,3 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" class="icon fill-primary">
-    <path fill="#868d94" d="M10 3v2a5 5 0 0 0-3.54 8.54l-1.41 1.41A7 7 0 0 1 10 3zm4.95 2.05A7 7 0 0 1 10 17v-2a5 5 0 0 0 3.54-8.54l1.41-1.41zM10 20l-4-4 4-4v8zm0-12V0l4 4-4 4z"></path>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-refresh" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M20 11a8.1 8.1 0 0 0 -15.5 -2m-.5 -4v4h4" /><path d="M4 13a8.1 8.1 0 0 0 15.5 2m.5 4v-4h-4" /></svg>
diff --git a/resources/icons/requests.svg b/resources/icons/requests.svg
index ab9b64d..b7486df 100644
--- a/resources/icons/requests.svg
+++ b/resources/icons/requests.svg
@@ -1,3 +1,6 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
-    <path fill="#868d94" d="M0 3c0-1.1.9-2 2-2h16a2 2 0 0 1 2 2v14a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V3zm2 2v12h16V5H2zm8 3l4 5H6l4-5z"></path>
+<svg xmlns="http://www.w3.org/2000/svg" data-icon-name="icon-tabler-browser" width="24" height="24" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
+    <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
+    <rect x="4" y="4" width="16" height="16" rx="1"></rect>
+    <line x1="4" y1="8" x2="20" y2="8"></line>
+    <line x1="8" y1="4" x2="8" y2="8"></line>
 </svg>
diff --git a/resources/icons/schedule.svg b/resources/icons/schedule.svg
index e285d7c..ee0c545 100644
--- a/resources/icons/schedule.svg
+++ b/resources/icons/schedule.svg
@@ -1,3 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
-    <path fill="#868d94" d="M10 20a10 10 0 1 1 0-20 10 10 0 0 1 0 20zm0-2a8 8 0 1 0 0-16 8 8 0 0 0 0 16zm-1-7.59V4h2v5.59l3.95 3.95-1.41 1.41L9 10.41z"></path>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-calendar-time" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M11.795 21h-6.795a2 2 0 0 1 -2 -2v-12a2 2 0 0 1 2 -2h12a2 2 0 0 1 2 2v4" /><path d="M18 18m-4 0a4 4 0 1 0 8 0a4 4 0 1 0 -8 0" /><path d="M15 3v4" /><path d="M7 3v4" /><path d="M3 11h16" /><path d="M18 16.496v1.504l1 1" /></svg>
diff --git a/resources/icons/search.svg b/resources/icons/search.svg
index ef3b370..8a45c12 100644
--- a/resources/icons/search.svg
+++ b/resources/icons/search.svg
@@ -1 +1,5 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="#868d94" d="M11.6.4A8 8 0 0 0 5.2 13L.8 17.5a1.3 1.3 0 0 0-.4.9c0 .3.1.6.4.9s.5.3.9.3c.3 0 .6 0 .9-.3l4.3-4.5a7.9 7.9 0 0 0 4.7 1.5 8 8 0 0 0 0-16zm5.5 8a5.5 5.5 0 0 1-5.5 5.4 5.5 5.5 0 1 1 5.5-5.5z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" data-icon-name="icon-tabler-search" width="24" height="24" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
+    <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
+    <circle cx="10" cy="10" r="7"></circle>
+    <line x1="21" y1="21" x2="15" y2="15"></line>
+</svg>
diff --git a/resources/icons/session.svg b/resources/icons/session.svg
index 96b7ac9..42d8095 100644
--- a/resources/icons/session.svg
+++ b/resources/icons/session.svg
@@ -1,5 +1 @@
-<svg viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <path fill="#868d94" d="M2,1.99079514 C2,0.891309342 2.89451376,0 3.99406028,0 L16.0059397,0 C17.1072288,0 18,0.898212381 18,1.99079514 L18,20 L10,16 L2,20 L2,1.99079514 Z M4,2 L16,2 L16,17 L10,14 L4,17 L4,2 Z" id="Combined-Shape"></path>
-    </g>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-bookmark" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M18 7v14l-6 -4l-6 4v-14a4 4 0 0 1 4 -4h4a4 4 0 0 1 4 4z" /></svg>
diff --git a/resources/icons/time.svg b/resources/icons/time.svg
index 3b0eee5..3c8c65f 100644
--- a/resources/icons/time.svg
+++ b/resources/icons/time.svg
@@ -1 +1,10 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="#868d94" d="M15.1 4.3a13 13 0 0 0-6.2 0c-.3 0-.7-.2-.7-.5v-.4c0-1.2 1-2.3 2.3-2.3h3c1.2 0 2.3 1 2.3 2.3v.3c0 .4-.4.6-.7.6zm5.8 9.7a9 9 0 0 1-17.8 0 9 9 0 0 1 17.8 0zm-4.2 1c0-.6-.4-1-1-1H13V8.4c0-.6-.4-1-1-1s-1 .4-1 1v6.2c0 .6.4 1.3 1 1.3h3.7c.5.1 1-.3 1-.9z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" data-icon-name="icon-tabler-chart-infographic" width="24" height="24" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round" role="img">
+    <title>Time</title>
+    <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
+    <circle cx="7" cy="7" r="4"></circle>
+    <path d="M7 3v4h4"></path>
+    <line x1="9" y1="17" x2="9" y2="21"></line>
+    <line x1="17" y1="14" x2="17" y2="21"></line>
+    <line x1="13" y1="13" x2="13" y2="21"></line>
+    <line x1="21" y1="12" x2="21" y2="21"></line>
+</svg>
diff --git a/resources/icons/user.svg b/resources/icons/user.svg
index 057c19a..0a53eff 100644
--- a/resources/icons/user.svg
+++ b/resources/icons/user.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="#868d94" d="M21 20.4V22H3v-1.6c0-3.7 2.4-6.9 5.8-8-1.7-1.1-2.9-3-2.9-5.2 0-3.4 2.7-6.1 6.1-6.1s6.1 2.7 6.1 6.1c0 2.2-1.2 4.1-2.9 5.2 3.4 1.1 5.8 4.3 5.8 8z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-user" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M8 7a4 4 0 1 0 8 0a4 4 0 0 0 -8 0" /><path d="M6 21v-2a4 4 0 0 1 4 -4h4a4 4 0 0 1 4 4v2" /></svg>
diff --git a/resources/icons/validator.svg b/resources/icons/validator.svg
index 5ebda21..4ff2322 100644
--- a/resources/icons/validator.svg
+++ b/resources/icons/validator.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="#868d94" d="M19.5 22.5H4.3a2.9 2.9 0 0 1-2.9-2.9V4.4a2.9 2.9 0 0 1 2.9-2.9h14.2a1 1 0 0 1 0 2H4.3a.9.9 0 0 0-.9.9v15.2a.9.9 0 0 0 .9.9h15.2a.9.9 0 0 0 1-.9v-8.3a1 1 0 1 1 2 0v8.3a2.9 2.9 0 0 1-3 2.9zM13 17.3L22.9 6a1.5 1.5 0 1 0-2.3-2L12 14 8 9.1A1.5 1.5 0 0 0 5.7 11l5 6.3a1.5 1.5 0 0 0 1.2.5 1.5 1.5 0 0 0 1.1-.5z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-square-check" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M3 3m0 2a2 2 0 0 1 2 -2h14a2 2 0 0 1 2 2v14a2 2 0 0 1 -2 2h-14a2 2 0 0 1 -2 -2z" /><path d="M9 12l2 2l4 -4" /></svg>
diff --git a/resources/icons/view.svg b/resources/icons/view.svg
deleted file mode 100644
index fe32f20..0000000
--- a/resources/icons/view.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 16">
-    <path fill="#868d94" d="M16.56 13.66a8 8 0 0 1-11.32 0L.3 8.7a1 1 0 0 1 0-1.42l4.95-4.95a8 8 0 0 1 11.32 0l4.95 4.95a1 1 0 0 1 0 1.42l-4.95 4.95-.01.01zm-9.9-1.42a6 6 0 0 0 8.48 0L19.38 8l-4.24-4.24a6 6 0 0 0-8.48 0L2.4 8l4.25 4.24h.01zM10.9 12a4 4 0 1 1 0-8 4 4 0 0 1 0 8zm0-2a2 2 0 1 0 0-4 2 2 0 0 0 0 4z"></path>
-</svg>
diff --git a/resources/icons/views.svg b/resources/icons/views.svg
index 828dc75..3021e0f 100644
--- a/resources/icons/views.svg
+++ b/resources/icons/views.svg
@@ -1,3 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
-    <path fill="#868d94" d="M7 3H2v14h5V3zm2 0v14h9V3H9zM0 3c0-1.1.9-2 2-2h16a2 2 0 0 1 2 2v14a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V3zm3 1h3v2H3V4zm0 3h3v2H3V7zm0 3h3v2H3v-2z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-template" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M4 4m0 1a1 1 0 0 1 1 -1h14a1 1 0 0 1 1 1v2a1 1 0 0 1 -1 1h-14a1 1 0 0 1 -1 -1z" /><path d="M4 12m0 1a1 1 0 0 1 1 -1h4a1 1 0 0 1 1 1v6a1 1 0 0 1 -1 1h-4a1 1 0 0 1 -1 -1z" /><path d="M14 12l6 0" /><path d="M14 16l6 0" /><path d="M14 20l6 0" /></svg>
diff --git a/resources/icons/yes.svg b/resources/icons/yes.svg
deleted file mode 100644
index e558b08..0000000
--- a/resources/icons/yes.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="28" height="28" viewBox="0 0 12 12"><path fill="#38a169" d="M12 3.1c0 .4-.1.8-.4 1.1L5.9 9.8c-.3.3-.6.4-1 .4s-.7-.1-1-.4L.4 6.3C.1 6 0 5.6 0 5.2c0-.4.2-.7.4-.9.2-.3.6-.4.9-.4.4 0 .8.1 1.1.4l2.5 2.5 4.7-4.7c.3-.3.7-.4 1-.4.4 0 .7.2.9.4.3.3.5.6.5 1z"/></svg>
diff --git a/resources/views/base_js.blade.php b/resources/views/base_js.blade.php
index 73b4a2f..b573f72 100644
--- a/resources/views/base_js.blade.php
+++ b/resources/views/base_js.blade.php
@@ -1,4 +1,5 @@
-<script @if(isset($csp_script_nonce) && $csp_script_nonce) nonce="{{ $csp_script_nonce }}" @endif>
+<script @if(isset($csp_script_nonce) && $csp_script_nonce) nonce="{{ $csp_script_nonce }}" @endif>/*<![CDATA[*/
+if (typeof Sfjs === 'undefined' || typeof Sfjs.loadToolbar === 'undefined') {
     Sfjs = (function() {
         "use strict";
 
@@ -31,10 +32,41 @@
             };
         }
 
-        var request = function(url, onSuccess, onError, payload, options) {
+        if (navigator.clipboard) {
+            document.addEventListener('readystatechange', () => {
+                if (document.readyState !== 'complete') {
+                    return;
+                }
+
+                document.querySelectorAll('[data-clipboard-text]').forEach(function (element) {
+                    removeClass(element, 'hidden');
+                    element.addEventListener('click', function () {
+                        navigator.clipboard.writeText(element.getAttribute('data-clipboard-text'));
+
+                        if (element.classList.contains("label")) {
+                            let oldContent = element.textContent;
+
+                            element.textContent = "✅ Copied!";
+                            element.classList.add("status-success");
+
+                            setTimeout(() => {
+                                element.textContent = oldContent;
+                                element.classList.remove("status-success");
+                            }, 7000);
+                        }
+                    });
+                });
+            });
+        }
+
+        var request = function(url, onSuccess, onError, payload, options, tries) {
             var xhr = window.XMLHttpRequest ? new XMLHttpRequest() : new ActiveXObject('Microsoft.XMLHTTP');
             options = options || {};
-            options.maxTries = options.maxTries || 0;
+            options.retry = options.retry || false;
+            tries = tries || 1;
+            /* this delays for 125, 375, 625, 875, and 1000, ... */
+            var delay = tries < 5 ? (tries - 0.5) * 250 : 1000;
+
             xhr.open(options.method || 'GET', url, true);
             xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
             xhr.onreadystatechange = function(state) {
@@ -42,11 +74,13 @@
                     return null;
                 }
 
-                if (xhr.status == 404 && options.maxTries > 1) {
-                    setTimeout(function(){
-                        options.maxTries--;
-                        request(url, onSuccess, onError, payload, options);
-                    }, 1000);
+                if (xhr.status == 404 && options.retry && !options.stop) {
+                    setTimeout(function() {
+                        if (options.stop) {
+                            return;
+                        }
+                        request(url, onSuccess, onError, payload, options, tries + 1);
+                    }, delay);
 
                     return null;
                 }
@@ -57,6 +91,11 @@
                     (onError || noop)(xhr);
                 }
             };
+
+            if (options.onSend) {
+                options.onSend(tries);
+            }
+
             xhr.send(payload || '');
         };
 
@@ -90,12 +129,10 @@
             if (ret = allHeaders.match(/^x-debug-token-link:\s+(.*)$/im)) {
                 stackElement.profilerUrl = ret[1];
             }
-        };
-
-        var togglePreference = function() {
-            var newState = Sfjs.getPreference('toolbar/ajax/replace') !== 'manual' ?  'manual' : 'auto' ;
-            Sfjs.setPreference('toolbar/ajax/replace', newState);
-            document.querySelector('.sf-toolbar-ajax-replace-state').innerHTML =  newState === 'manual' ? 'Manual' : 'Auto';
+            if (ret = allHeaders.match(/^x-debug-toolbar-replace:\s+(.*)$/im)) {
+                stackElement.toolbarReplaceFinished = false;
+                stackElement.toolbarReplace = '1' === ret[1];
+            }
         };
 
         var successStreak = 4;
@@ -109,7 +146,7 @@
 
             var infoSpan = document.querySelector(".sf-toolbar-ajax-info");
             if (infoSpan) {
-                infoSpan.textContent = requestStack.length + ' Request' + (requestStack.length !== 1 ? 's' : '');
+                infoSpan.textContent = requestStack.length + ' request' + (requestStack.length !== 1 ? 's' : '');
             }
 
             var ajaxToolbarPanel = document.querySelector('.sf-toolbar-block-ajax');
@@ -127,16 +164,6 @@
                 removeClass(ajaxToolbarPanel, 'sf-ajax-request-loading');
                 removeClass(ajaxToolbarPanel, 'sf-toolbar-status-red');
             }
-
-            addEventListener(document.querySelector('.sf-toolbar-ajax-clear'), 'click', function() {
-                requestStack = [];
-                renderAjaxRequests();
-                successStreak = 4;
-                document.querySelector('.sf-toolbar-ajax-request-list').innerHTML = '';
-            });
-
-            document.querySelector('.sf-toolbar-ajax-replace-state').innerHTML = Sfjs.getPreference('toolbar/ajax/replace') === 'manual' ? 'Manual' : 'Auto';
-            addEventListener(document.querySelector('.sf-toolbar-ajax-replace-toggle'), 'click', togglePreference);
         };
 
         var startAjaxRequest = function(index) {
@@ -196,16 +223,14 @@
             row.appendChild(durationCell);
 
             request.liveDurationHandle = setInterval(function() {
-                durationCell.textContent = (new Date() - request.start) + 'ms';
+                durationCell.textContent = (new Date() - request.start) + ' ms';
             }, 100);
 
             row.className = 'sf-ajax-request sf-ajax-request-loading';
             tbody.insertBefore(row, null);
 
             var toolbarInfo = document.querySelector('.sf-toolbar-block-ajax .sf-toolbar-info');
-            if (toolbarInfo) {
-              toolbarInfo.scrollTop = toolbarInfo.scrollHeight;
-            }
+            toolbarInfo.scrollTop = toolbarInfo.scrollHeight;
 
             renderAjaxRequests();
         };
@@ -218,7 +243,7 @@
                 return;
             }
 
-            if (Sfjs.getPreference('toolbar/ajax/replace') !== 'manual' && !request.toolbarReplaceFinished && request.profile) {
+            if (request.toolbarReplace && !request.toolbarReplaceFinished && request.profile) {
                 /* Flag as complete because finishAjaxRequest can be called multiple times. */
                 request.toolbarReplaceFinished = true;
                 /* Search up through the DOM to find the toolbar's container ID. */
@@ -262,16 +287,14 @@
             }
 
             if (request.duration) {
-                durationCell.textContent = request.duration + 'ms';
+                durationCell.textContent = request.duration + ' ms';
             }
 
-            if (request.profile) {
+            if (request.profilerUrl) {
                 profilerCell.textContent = '';
                 var profilerLink = document.createElement('a');
-                profilerLink.setAttribute('href', request.profilerUrl || '#');
-                profilerLink.setAttribute('target', '_profiler');
-                profilerLink.textContent = 'Load';
-
+                profilerLink.setAttribute('href', request.profilerUrl);
+                profilerLink.textContent = request.profile;
                 profilerLink.addEventListener("click", function(e){
                     e.preventDefault();
                     for (var elem = request.DOMNode; elem && elem !== document; elem = elem.parentNode) {
@@ -281,7 +304,6 @@
                         }
                     }
                 });
-
                 profilerCell.appendChild(profilerLink);
             }
 
@@ -330,6 +352,7 @@
                         stackElement.profile = r.headers.get('x-debug-token');
                         stackElement.profilerUrl = r.headers.get('x-debug-token-link');
                         stackElement.toolbarReplaceFinished = false;
+                        stackElement.toolbarReplace = '1' === r.headers.get('x-debug-toolbar-replace');
                         finishAjaxRequest(idx);
                     }, function (e){
                         stackElement.error = true;
@@ -349,19 +372,19 @@
 
                 /* prevent logging AJAX calls to static and inline files, like templates */
                 var path = url;
-                if (url.substr(0, 1) === '/') {
+                if (url.slice(0, 1) === '/') {
                     if (0 === url.indexOf('{{ asset('/') }}')) {
-                        path = url.substr({{ strlen( asset('/')) }});
+                        path = url.slice({{ strlen( asset('/')) }});
                     }
                 }
                 else if (0 === url.indexOf('{{ url('/') }}')) {
-                    path = url.substr({{ strlen( url('/')) }});
+                    path = url.slice({{ strlen( url('/')) }});
                 }
 
                 if (!path.match(new RegExp(@json($excluded_ajax_paths)))) {
                     var stackElement = {
                         error: false,
-                        url: path,
+                        url: url,
                         method: method,
                         type: 'xhr',
                         start: new Date()
@@ -409,6 +432,14 @@
 
             renderAjaxRequests: renderAjaxRequests,
 
+            getSfwdt: function(token) {
+                if (!this.sfwdt) {
+                    this.sfwdt = document.getElementById('sfwdt' + token);
+                }
+
+                return this.sfwdt;
+            },
+
             load: function(selector, url, onSuccess, onError, options) {
                 var el = document.getElementById(selector);
 
@@ -439,12 +470,102 @@ function(xhr) { (onError || noop)(xhr, el); },
                 return this;
             },
 
+            showToolbar: function(token) {
+                var sfwdt = this.getSfwdt(token);
+                removeClass(sfwdt, 'sf-display-none');
+
+                if (getPreference('toolbar/displayState') == 'none') {
+                    document.getElementById('sfToolbarMainContent-' + token).style.display = 'none';
+                    document.getElementById('sfToolbarClearer-' + token).style.display = 'none';
+                    document.getElementById('sfMiniToolbar-' + token).style.display = 'block';
+                } else {
+                    document.getElementById('sfToolbarMainContent-' + token).style.display = 'block';
+                    document.getElementById('sfToolbarClearer-' + token).style.display = 'block';
+                    document.getElementById('sfMiniToolbar-' + token).style.display = 'none';
+                }
+            },
+
+            hideToolbar: function(token) {
+                var sfwdt = this.getSfwdt(token);
+                addClass(sfwdt, 'sf-display-none');
+            },
+
+            initToolbar: function(token) {
+                this.showToolbar(token);
+
+                var hideButton = document.getElementById('sfToolbarHideButton-' + token);
+                var hideButtonSvg = hideButton.querySelector('svg');
+                hideButtonSvg.setAttribute('aria-hidden', 'true');
+                hideButtonSvg.setAttribute('focusable', 'false');
+                addEventListener(hideButton, 'click', function (event) {
+                    event.preventDefault();
+
+                    var p = this.parentNode;
+                    p.style.display = 'none';
+                    (p.previousElementSibling || p.previousSibling).style.display = 'none';
+                    document.getElementById('sfMiniToolbar-' + token).style.display = 'block';
+                    setPreference('toolbar/displayState', 'none');
+                });
+
+                var showButton = document.getElementById('sfToolbarMiniToggler-' + token);
+                var showButtonSvg = showButton.querySelector('svg');
+                showButtonSvg.setAttribute('aria-hidden', 'true');
+                showButtonSvg.setAttribute('focusable', 'false');
+                addEventListener(showButton, 'click', function (event) {
+                    event.preventDefault();
+
+                    var elem = this.parentNode;
+                    if (elem.style.display == 'none') {
+                        document.getElementById('sfToolbarMainContent-' + token).style.display = 'none';
+                        document.getElementById('sfToolbarClearer-' + token).style.display = 'none';
+                        elem.style.display = 'block';
+                    } else {
+                        document.getElementById('sfToolbarMainContent-' + token).style.display = 'block';
+                        document.getElementById('sfToolbarClearer-' + token).style.display = 'block';
+                        elem.style.display = 'none'
+                    }
+
+                    setPreference('toolbar/displayState', 'block');
+                });
+            },
+
             loadToolbar: function(token, newToken) {
+                var that = this;
+                var triesCounter = document.getElementById('sfLoadCounter-' + token);
+
+                var options = {
+                    retry: true,
+                    onSend: function (count) {
+                        if (count === 3) {
+                            that.initToolbar(token);
+                        }
+
+                        if (triesCounter) {
+                            triesCounter.textContent = count;
+                        }
+                    },
+                };
+
+                var cancelButton = document.getElementById('sfLoadCancel-' + token);
+                if (cancelButton) {
+                    addEventListener(cancelButton, 'click', function (event) {
+                        event.preventDefault();
+
+                        options.stop = true;
+                        that.hideToolbar(token);
+                    });
+                }
+
                 newToken = (newToken || token);
+
                 this.load(
                     'sfwdt' + token,
                     '{{ route("telescope-toolbar.render", ["token" => "xxxxxx"]) }}'.replace(/xxxxxx/, newToken),
                     function(xhr, el) {
+                        /* Do nothing in the edge case where the toolbar has already been replaced with a new one */
+                        if (!document.getElementById('sfToolbarMainContent-' + newToken)) {
+                            return;
+                        }
 
                         /* Evaluate in global scope scripts embedded inside the toolbar */
                         var i, scripts = [].slice.call(el.querySelectorAll('script'));
@@ -458,15 +579,7 @@ function(xhr, el) {
                             return;
                         }
 
-                        if (getPreference('toolbar/displayState') == 'none') {
-                            document.getElementById('sfToolbarMainContent-' + newToken).style.display = 'none';
-                            document.getElementById('sfToolbarClearer-' + newToken).style.display = 'none';
-                            document.getElementById('sfMiniToolbar-' + newToken).style.display = 'block';
-                        } else {
-                            document.getElementById('sfToolbarMainContent-' + newToken).style.display = 'block';
-                            document.getElementById('sfToolbarClearer-' + newToken).style.display = 'block';
-                            document.getElementById('sfMiniToolbar-' + newToken).style.display = 'none';
-                        }
+                        that.initToolbar(newToken);
 
                         /* Handle toolbar-info position */
                         var toolbarBlocks = [].slice.call(el.querySelectorAll('.sf-toolbar-block'));
@@ -494,32 +607,14 @@ function(xhr, el) {
                                 }
                             };
                         }
-                        addEventListener(document.getElementById('sfToolbarHideButton-' + newToken), 'click', function (event) {
-                            event.preventDefault();
-
-                            var p = this.parentNode;
-                            p.style.display = 'none';
-                            (p.previousElementSibling || p.previousSibling).style.display = 'none';
-                            document.getElementById('sfMiniToolbar-' + newToken).style.display = 'block';
-                            setPreference('toolbar/displayState', 'none');
-                        });
-                        addEventListener(document.getElementById('sfToolbarMiniToggler-' + newToken), 'click', function (event) {
-                            event.preventDefault();
 
-                            var elem = this.parentNode;
-                            if (elem.style.display == 'none') {
-                                document.getElementById('sfToolbarMainContent-' + newToken).style.display = 'none';
-                                document.getElementById('sfToolbarClearer-' + newToken).style.display = 'none';
-                                elem.style.display = 'block';
-                            } else {
-                                document.getElementById('sfToolbarMainContent-' + newToken).style.display = 'block';
-                                document.getElementById('sfToolbarClearer-' + newToken).style.display = 'block';
-                                elem.style.display = 'none'
-                            }
-
-                            setPreference('toolbar/displayState', 'block');
-                        });
                         renderAjaxRequests();
+                        addEventListener(document.querySelector('.sf-toolbar-ajax-clear'), 'click', function() {
+                            requestStack = [];
+                            renderAjaxRequests();
+                            successStreak = 4;
+                            document.querySelector('.sf-toolbar-ajax-request-list').innerHTML = '';
+                        });
                         addEventListener(document.querySelector('.sf-toolbar-block-ajax'), 'mouseenter', function (event) {
                             var elem = document.querySelector('.sf-toolbar-block-ajax .sf-toolbar-info');
                             elem.scrollTop = elem.scrollHeight;
@@ -541,13 +636,12 @@ function(xhr, el) {
                         }
                     },
                     function(xhr) {
-                        if (xhr.status !== 0) {
+                        if (xhr.status !== 0 && !options.stop) {
                             var errorMessage = 'An ' + xhr.status + ' error occurred while loading the Telescope Toolbar. Make sure you configured/installed Telescope correctly.';
                             if (xhr.status === 401 || xhr.status === 403) {
                                 errorMessage = 'You are unauthorized to view Telescope Requests';
                             }
-                            var sfwdt = document.getElementById('sfwdt' + token);
-                            var url = '{{ route("telescope") }}';
+                            var sfwdt = that.getSfwdt(token);
                             sfwdt.innerHTML = '\
                                 <div class="sf-toolbarreset">\
                                     <div class="sf-toolbar-icon"><svg width="24" height="24" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 80 80"><path fill="#AAA" d="M0 40a39.87 39.87 0 0 1 11.72-28.28A40 40 0 1 1 0 40zm34 10a4 4 0 0 1-4-4v-2a2 2 0 1 0-4 0v2a4 4 0 0 1-4 4h-2a2 2 0 1 0 0 4h2a4 4 0 0 1 4 4v2a2 2 0 1 0 4 0v-2a4 4 0 0 1 4-4h2a2 2 0 1 0 0-4h-2zm24-24a6 6 0 0 1-6-6v-3a3 3 0 0 0-6 0v3a6 6 0 0 1-6 6h-3a3 3 0 0 0 0 6h3a6 6 0 0 1 6 6v3a3 3 0 0 0 6 0v-3a6 6 0 0 1 6-6h3a3 3 0 0 0 0-6h-3zm-4 36a4 4 0 1 0 0-8 4 4 0 0 0 0 8zM21 28a3 3 0 1 0 0-6 3 3 0 0 0 0 6z"></path>\</svg></div>\
@@ -557,7 +651,7 @@ function(xhr) {
                             sfwdt.setAttribute('class', 'sf-toolbar sf-error-toolbar');
                         }
                     },
-                    { maxTries: 5 }
+                    options
                 );
 
                 return this;
@@ -576,247 +670,9 @@ function(xhr) {
 
                 return this;
             },
-
-            createTabs: function() {
-                var tabGroups = document.querySelectorAll('.sf-tabs:not([data-processed=true])');
-
-                /* create the tab navigation for each group of tabs */
-                for (var i = 0; i < tabGroups.length; i++) {
-                    var tabs = tabGroups[i].querySelectorAll(':scope > .tab');
-                    var tabNavigation = document.createElement('ul');
-                    tabNavigation.className = 'tab-navigation';
-
-                    var selectedTabId = 'tab-' + i + '-0'; /* select the first tab by default */
-                    for (var j = 0; j < tabs.length; j++) {
-                        var tabId = 'tab-' + i + '-' + j;
-                        var tabTitle = tabs[j].querySelector('.tab-title').innerHTML;
-
-                        var tabNavigationItem = document.createElement('li');
-                        tabNavigationItem.setAttribute('data-tab-id', tabId);
-                        if (hasClass(tabs[j], 'active')) { selectedTabId = tabId; }
-                        if (hasClass(tabs[j], 'disabled')) { addClass(tabNavigationItem, 'disabled'); }
-                        tabNavigationItem.innerHTML = tabTitle;
-                        tabNavigation.appendChild(tabNavigationItem);
-
-                        var tabContent = tabs[j].querySelector('.tab-content');
-                        tabContent.parentElement.setAttribute('id', tabId);
-                    }
-
-                    tabGroups[i].insertBefore(tabNavigation, tabGroups[i].firstChild);
-                    addClass(document.querySelector('[data-tab-id="' + selectedTabId + '"]'), 'active');
-                }
-
-                /* display the active tab and add the 'click' event listeners */
-                for (i = 0; i < tabGroups.length; i++) {
-                    tabNavigation = tabGroups[i].querySelectorAll(':scope > .tab-navigation li');
-
-                    for (j = 0; j < tabNavigation.length; j++) {
-                        tabId = tabNavigation[j].getAttribute('data-tab-id');
-                        document.getElementById(tabId).querySelector('.tab-title').className = 'hidden';
-
-                        if (hasClass(tabNavigation[j], 'active')) {
-                            document.getElementById(tabId).className = 'block';
-                        } else {
-                            document.getElementById(tabId).className = 'hidden';
-                        }
-
-                        tabNavigation[j].addEventListener('click', function(e) {
-                            var activeTab = e.target || e.srcElement;
-
-                            /* needed because when the tab contains HTML contents, user can click */
-                            /* on any of those elements instead of their parent '<li>' element */
-                            while (activeTab.tagName.toLowerCase() !== 'li') {
-                                activeTab = activeTab.parentNode;
-                            }
-
-                            /* get the full list of tabs through the parent of the active tab element */
-                            var tabNavigation = activeTab.parentNode.children;
-                            for (var k = 0; k < tabNavigation.length; k++) {
-                                var tabId = tabNavigation[k].getAttribute('data-tab-id');
-                                document.getElementById(tabId).className = 'hidden';
-                                removeClass(tabNavigation[k], 'active');
-                            }
-
-                            addClass(activeTab, 'active');
-                            var activeTabId = activeTab.getAttribute('data-tab-id');
-                            document.getElementById(activeTabId).className = 'block';
-                        });
-                    }
-
-                    tabGroups[i].setAttribute('data-processed', 'true');
-                }
-            },
-
-            createToggles: function() {
-                var toggles = document.querySelectorAll('.sf-toggle:not([data-processed=true])');
-
-                for (var i = 0; i < toggles.length; i++) {
-                    var elementSelector = toggles[i].getAttribute('data-toggle-selector');
-                    var element = document.querySelector(elementSelector);
-
-                    addClass(element, 'sf-toggle-content');
-
-                    if (toggles[i].hasAttribute('data-toggle-initial') && toggles[i].getAttribute('data-toggle-initial') == 'display') {
-                        addClass(toggles[i], 'sf-toggle-on');
-                        addClass(element, 'sf-toggle-visible');
-                    } else {
-                        addClass(toggles[i], 'sf-toggle-off');
-                        addClass(element, 'sf-toggle-hidden');
-                    }
-
-                    addEventListener(toggles[i], 'click', function(e) {
-                        e.preventDefault();
-
-                        if ('' !== window.getSelection().toString()) {
-                            /* Don't do anything on text selection */
-                            return;
-                        }
-
-                        var toggle = e.target || e.srcElement;
-
-                        /* needed because when the toggle contains HTML contents, user can click */
-                        /* on any of those elements instead of their parent '.sf-toggle' element */
-                        while (!hasClass(toggle, 'sf-toggle')) {
-                            toggle = toggle.parentNode;
-                        }
-
-                        var element = document.querySelector(toggle.getAttribute('data-toggle-selector'));
-
-                        toggleClass(toggle, 'sf-toggle-on');
-                        toggleClass(toggle, 'sf-toggle-off');
-                        toggleClass(element, 'sf-toggle-hidden');
-                        toggleClass(element, 'sf-toggle-visible');
-
-                        /* the toggle doesn't change its contents when clicking on it */
-                        if (!toggle.hasAttribute('data-toggle-alt-content')) {
-                            return;
-                        }
-
-                        if (!toggle.hasAttribute('data-toggle-original-content')) {
-                            toggle.setAttribute('data-toggle-original-content', toggle.innerHTML);
-                        }
-
-                        var currentContent = toggle.innerHTML;
-                        var originalContent = toggle.getAttribute('data-toggle-original-content');
-                        var altContent = toggle.getAttribute('data-toggle-alt-content');
-                        toggle.innerHTML = currentContent !== altContent ? altContent : originalContent;
-                    });
-
-                    /* Prevents from disallowing clicks on links inside toggles */
-                    var toggleLinks = toggles[i].querySelectorAll('a');
-                    for (var j = 0; j < toggleLinks.length; j++) {
-                        addEventListener(toggleLinks[j], 'click', function(e) {
-                            e.stopPropagation();
-                        });
-                    }
-
-                    toggles[i].setAttribute('data-processed', 'true');
-                }
-            },
-
-            createFilters: function() {
-                document.querySelectorAll('[data-filters] [data-filter]').forEach(function (filter) {
-                    var filters = filter.closest('[data-filters]'),
-                        type = 'choice',
-                        name = filter.dataset.filter,
-                        ucName = name.charAt(0).toUpperCase()+name.slice(1),
-                        list = document.createElement('ul'),
-                        values = filters.dataset['filter'+ucName] || filters.querySelectorAll('[data-filter-'+name+']'),
-                        labels = {},
-                        defaults = null,
-                        indexed = {},
-                        processed = {};
-                    if (typeof values === 'string') {
-                        type = 'level';
-                        labels = values.split(',');
-                        values = values.toLowerCase().split(',');
-                        defaults = values.length - 1;
-                    }
-                    addClass(list, 'filter-list');
-                    addClass(list, 'filter-list-'+type);
-                    values.forEach(function (value, i) {
-                        if (value instanceof HTMLElement) {
-                            value = value.dataset['filter'+ucName];
-                        }
-                        if (value in processed) {
-                            return;
-                        }
-                        var option = document.createElement('li'),
-                            label = i in labels ? labels[i] : value,
-                            active = false,
-                            matches;
-                        if ('' === label) {
-                            option.innerHTML = '<em>(none)</em>';
-                        } else {
-                            option.innerText = label;
-                        }
-                        option.dataset.filter = value;
-                        option.setAttribute('title', 1 === (matches = filters.querySelectorAll('[data-filter-'+name+'="'+value+'"]').length) ? 'Matches 1 row' : 'Matches '+matches+' rows');
-                        indexed[value] = i;
-                        list.appendChild(option);
-                        addEventListener(option, 'click', function () {
-                            if ('choice' === type) {
-                                filters.querySelectorAll('[data-filter-'+name+']').forEach(function (row) {
-                                    if (option.dataset.filter === row.dataset['filter'+ucName]) {
-                                        toggleClass(row, 'filter-hidden-'+name);
-                                    }
-                                });
-                                toggleClass(option, 'active');
-                            } else if ('level' === type) {
-                                if (i === this.parentNode.querySelectorAll('.active').length - 1) {
-                                    return;
-                                }
-                                this.parentNode.querySelectorAll('li').forEach(function (currentOption, j) {
-                                    if (j <= i) {
-                                        addClass(currentOption, 'active');
-                                        if (i === j) {
-                                            addClass(currentOption, 'last-active');
-                                        } else {
-                                            removeClass(currentOption, 'last-active');
-                                        }
-                                    } else {
-                                        removeClass(currentOption, 'active');
-                                        removeClass(currentOption, 'last-active');
-                                    }
-                                });
-                                filters.querySelectorAll('[data-filter-'+name+']').forEach(function (row) {
-                                    if (i < indexed[row.dataset['filter'+ucName]]) {
-                                        addClass(row, 'filter-hidden-'+name);
-                                    } else {
-                                        removeClass(row, 'filter-hidden-'+name);
-                                    }
-                                });
-                            }
-                        });
-                        if ('choice' === type) {
-                            active = null === defaults || 0 <= defaults.indexOf(value);
-                        } else if ('level' === type) {
-                            active = i <= defaults;
-                            if (active && i === defaults) {
-                                addClass(option, 'last-active');
-                            }
-                        }
-                        if (active) {
-                            addClass(option, 'active');
-                        } else {
-                            filters.querySelectorAll('[data-filter-'+name+'="'+value+'"]').forEach(function (row) {
-                                toggleClass(row, 'filter-hidden-'+name);
-                            });
-                        }
-                        processed[value] = true;
-                    });
-
-                    if (1 < list.childNodes.length) {
-                        filter.appendChild(list);
-                        filter.dataset.filtered = '';
-                    }
-                });
-            }
         };
     })();
+}
+/*]]>*/</script>
+
 
-    Sfjs.addEventListener(document, 'DOMContentLoaded', function() {
-        Sfjs.createTabs();
-        Sfjs.createToggles();
-    });
-</script>
diff --git a/resources/views/collectors/ajax.blade.php b/resources/views/collectors/ajax.blade.php
index 5bc192f..2001659 100644
--- a/resources/views/collectors/ajax.blade.php
+++ b/resources/views/collectors/ajax.blade.php
@@ -13,7 +13,6 @@
                 <span class="sf-toolbar-header">
                     <b class="sf-toolbar-ajax-info"></b>
                     <b class="sf-toolbar-action">(<a class="sf-toolbar-ajax-clear" href="javascript:void(0);">Clear</a>)</b>
-                    <b class="sf-toolbar-action"><span class="sf-toolbar-ajax-replace-state">Auto</span> (<a class="sf-toolbar-ajax-replace-toggle" href="javascript:void(0);">Toggle</a>)</b>
                 </span>
         </div>
         <div class="sf-toolbar-info-piece">
@@ -34,4 +33,4 @@
         </div>
 
     @endslot
-@endcomponent
\ No newline at end of file
+@endcomponent
diff --git a/resources/views/collectors/config.blade.php b/resources/views/collectors/config.blade.php
index 4645f16..b93361b 100644
--- a/resources/views/collectors/config.blade.php
+++ b/resources/views/collectors/config.blade.php
@@ -1,10 +1,9 @@
-@component('telescope-toolbar::item', ['name' => 'ajax', 'additional_classes' => 'sf-toolbar-block-right'])
+@component('telescope-toolbar::item', ['name' => 'config', 'additional_classes' => 'sf-toolbar-block-right'])
 
     @slot('icon')
 
-        <span class="sf-toolbar-label">
-             @ttIcon('laravel')
-        </span>
+        @ttIcon('laravel')
+
         <span class="sf-toolbar-value">{{ app()->version() }}</span>
 
     @endslot
@@ -26,9 +25,12 @@
                     <b>PHP version</b>
                     <span>{{ phpversion() }}</span>
                 </div>
-
+                <div class="sf-toolbar-info-piece sf-toolbar-info-php">
+                    <b>Laravel version</b>
+                    <span>{{ app()->version() }}</span>
+                </div>
             </div>
         </div>
 
     @endslot
-@endcomponent
\ No newline at end of file
+@endcomponent
diff --git a/resources/views/collectors/request.blade.php b/resources/views/collectors/request.blade.php
index be4c6d9..5175d52 100644
--- a/resources/views/collectors/request.blade.php
+++ b/resources/views/collectors/request.blade.php
@@ -16,7 +16,6 @@
 
     @slot('icon')
         <span class="sf-toolbar-status sf-toolbar-status-{{ $statusColor }}">{{ $statusCode }}</span>
-        @ttIcon('requests')
         <span class="sf-toolbar-value sf-toolbar-info-piece-additional">{{ $data['method'] }} {{ $data['uri'] }}</span>
     @endslot
 
diff --git a/resources/views/collectors/time.blade.php b/resources/views/collectors/time.blade.php
index f809929..1300de3 100644
--- a/resources/views/collectors/time.blade.php
+++ b/resources/views/collectors/time.blade.php
@@ -28,4 +28,4 @@
 
     @endslot
 
-@endcomponent
\ No newline at end of file
+@endcomponent
diff --git a/resources/views/toolbar.blade.php b/resources/views/toolbar.blade.php
index b7f5160..1493d40 100644
--- a/resources/views/toolbar.blade.php
+++ b/resources/views/toolbar.blade.php
@@ -3,14 +3,14 @@
 ?>
 
 <!-- START of Laravel Telescope Toolbar -->
-<div id="sfMiniToolbar-{{ $token }}" class="sf-minitoolbar" data-no-turbolink>
-    <a class="open-button" href="#" title="Show Telescope toolbar" tabindex="-1" id="sfToolbarMiniToggler-{{ $token }}" accesskey="D">
-        @ttIcon('telescope')
-    </a>
+<div id="sfMiniToolbar-{{ $token }}" class="sf-minitoolbar" data-no-turbolink data-turbo="false">
+    <button type="button" title="Show Telescope toolbar" tabindex="-1" id="sfToolbarMiniToggler-{{ $token }}" accesskey="D" aria-expanded="false" aria-controls="sfToolbarMainContent-{{ $token }}">
+        @ttIcon('laravel')
+    </button>
 </div>
 <div id="sfToolbarClearer-{{ $token }}" class="sf-toolbar-clearer"></div>
 
-<div id="sfToolbarMainContent-{{ $token }}" class="sf-toolbarreset clear-fix" data-no-turbolink>
+<div id="sfToolbarMainContent-{{ $token }}" class="sf-toolbarreset notranslate clear-fix" data-no-turbolink>
 
     @include("telescope-toolbar::collectors.ajax")
 
@@ -24,8 +24,8 @@
 
     @include("telescope-toolbar::collectors.config")
 
-    <a class="hide-button" id="sfToolbarHideButton-{{ $token }}" title="Close Toolbar" tabindex="-1" accesskey="D">
-        @ttIcon('telescope')
-    </a>
+    <button class="hide-button" type="button" id="sfToolbarHideButton-{{ $token }}" title="Close Toolbar" tabindex="-1" accesskey="D" aria-expanded="true" aria-controls="sfToolbarMainContent-{{ $token }}">
+        @ttIcon('close')
+    </button>
 </div>
-<!-- END of Laravel Telescope Toolbar -->
\ No newline at end of file
+<!-- END of Laravel Telescope Toolbar -->
diff --git a/resources/views/widget.blade.php b/resources/views/widget.blade.php
index c0dbb7e..52055f9 100644
--- a/resources/views/widget.blade.php
+++ b/resources/views/widget.blade.php
@@ -1,5 +1,5 @@
 <!-- Start of Telescope Toolbar widget !-->
-<div id="sfwdt{{ $token }}" class="sf-toolbar sf-display-none"></div>
+<div id="sfwdt{{ $token }}" class="sf-toolbar sf-display-none" role="region" aria-label="Laravel Telescope Toolbar"></div>
 
 <script @if(isset($csp_script_nonce) && $csp_script_nonce) nonce="{{ $csp_script_nonce }}" @endif>/*<![CDATA[*/
   (function () {
diff --git a/src/Toolbar.php b/src/Toolbar.php
index 35d77fd..c70212e 100644
--- a/src/Toolbar.php
+++ b/src/Toolbar.php
@@ -83,7 +83,7 @@ public function modifyResponse($request, $response)
         if ($request->ajax() || $request->headers->get('X-Livewire')) {
             $response->headers->set('x-debug-token', $this->getDebugToken($request));
             $response->headers->set('x-debug-token-link', route('telescope-toolbar.show', [$this->getDebugToken($request)]));
-
+            $response->headers->set('x-debug-toolbar-replace', config('telescope-toolbar.replace') ? 1 : 0);
             return;
         }