diff --git a/extensions_samples/modal.html b/extensions_samples/modal.html
index 29cf1b9c..00d0723e 100644
--- a/extensions_samples/modal.html
+++ b/extensions_samples/modal.html
@@ -129,7 +129,7 @@
       target: "webui",
       id: "modalpanel",
       content: {
-        title: "This is tile",
+        title: "This is title",
         id: MODAL_ID_SIMPLE,
         style: "default",
         bt1Txt: "S126",
@@ -225,4 +225,4 @@
   </button>
 
   <div class="container m-2" id="output"></div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/areas/connection.js b/src/areas/connection.js
index 0cfb592b..df27669a 100644
--- a/src/areas/connection.js
+++ b/src/areas/connection.js
@@ -171,7 +171,7 @@ const ConnectionContainer = () => {
                     ")"
                 contentTitle = T("S35") //"restarting";
                 contentIcon = (
-                    <div class="d-inline-block" style="padding:0 20px">
+                    <div class="d-inline-block content-icon">
                         <Loading large />
                     </div>
                 )
@@ -205,7 +205,7 @@ const ConnectionContainer = () => {
                     contentTitle = T("S2") //"Connecting";
                 }
                 contentIcon = (
-                    <div class="d-inline-block" style="padding:0 20px">
+                    <div class="d-inline-block content-icon">
                         <Loading large />
                     </div>
                 )
@@ -216,10 +216,7 @@ const ConnectionContainer = () => {
             <div class="empty fullscreen">
                 <div class="centered text-primary">
                     <div class="empty-icon">
-                        <div
-                            class="d-flex p-centered"
-                            style="flex-wrap:nowrap!important"
-                        >
+                        <div class="d-flex p-centered empty-content">
                             <AppLogo />
                             <Minus size="50px" class="hide-low" />
                             {contentIcon}
diff --git a/src/components/Controls/ButtonImg.js b/src/components/Controls/ButtonImg.js
index 8d5ad622..0ef646e2 100644
--- a/src/components/Controls/ButtonImg.js
+++ b/src/components/Controls/ButtonImg.js
@@ -38,19 +38,12 @@ const ButtonImg = ({
     if (!icon) showlow = true
     return (
         <Button
-            class={` ${icon ? "feather-icon-container" : ""} ${
-                className ? className : ""
-            }`}
+            class={` ${icon ? "feather-icon-container" : ""}  ${nomin ? "" : "icon-button"} text-straight ${className ? className : ""} ${disabled ? "insensitive" : ""}`}
             {...rest}
             disabled={disabled}
-            style={
-                `${
-                    (nomin ? style : "min-width:2rem;" + style) +
-                    ";display:inline-block;white-space: nowrap;"
-                }` + `${disabled ? "pointer;pointer-events: none;" : ""}`
-            }
+            style={style}
         >
-            <div style="overflow:hidden!important;white-space: nowrap;text-overflow:ellipsis!important;cursor: pointer;pointer-events: none;">
+            <div class="insensitive text-straight">
                 {iconRight ? "" : icon}
                 {label && (
                     <label
diff --git a/src/components/Controls/Fields/Input.js b/src/components/Controls/Fields/Input.js
index ffa821e3..ccbea678 100644
--- a/src/components/Controls/Fields/Input.js
+++ b/src/components/Controls/Fields/Input.js
@@ -59,11 +59,10 @@ const Reveal = ({ applyTo }) => {
             {reveal ? (
                 <EyeOff
                     size="1rem"
-                    class="has-error"
-                    style="margin-top:0.15rem"
+                    class="has-error icon-reveal"
                 />
             ) : (
-                <Eye size="1rem" class="has-error" style="margin-top:0.15rem" />
+                <Eye size="1rem" class="has-error icon-reveal" />
             )}
         </div>
     )
@@ -77,7 +76,7 @@ const ClearText = ({ setValue }) => {
     useEffect(() => {}, [])
     return (
         <div class="form-icon clearShortkey" onCLick={clickClear}>
-            <XCircle size="1rem" style="margin-top:0.15rem" />
+            <XCircle size="1rem" class="icon-clear" />
         </div>
     )
 }
diff --git a/src/components/Controls/Progress.js b/src/components/Controls/Progress.js
index 2a6c5a17..be514faf 100644
--- a/src/components/Controls/Progress.js
+++ b/src/components/Controls/Progress.js
@@ -59,7 +59,7 @@ const Progress = ({ progressBar, max = 100, precision = -1 }) => {
     return (
         <center>
             <progress ref={progressValue} value="0" max="100" />
-            <label style="margin-left:15px" ref={progressValueDisplay}></label>
+            <label class="progress-value-label" ref={progressValueDisplay}></label>
         </center>
     )
 }
diff --git a/src/components/ExtraContent/index.js b/src/components/ExtraContent/index.js
index 9280fa29..aede519e 100644
--- a/src/components/ExtraContent/index.js
+++ b/src/components/ExtraContent/index.js
@@ -23,7 +23,12 @@ import { espHttpURL } from "../Helpers"
 import { useUiContextFn } from "../../contexts"
 import { useHttpFn } from "../../hooks"
 import { Play, Pause, Aperture, RefreshCcw } from "preact-feather"
-import { ButtonImg, FullScreenButton, CloseButton, ContainerHelper } from "../Controls"
+import {
+    ButtonImg,
+    FullScreenButton,
+    CloseButton,
+    ContainerHelper,
+} from "../Controls"
 import { T } from "../Translations"
 import { iconsFeather } from "../Images"
 import { iconsTarget } from "../../targets"
@@ -51,17 +56,20 @@ const ExtraContent = ({
     const iconsList = { ...iconsTarget, ...iconsFeather }
     useEffect(() => {
         const handleFullScreenChange = () => {
-          setIsFullScreen(document.fullscreenElement !== null);
-        };
-      
-        document.addEventListener('fullscreenchange', handleFullScreenChange);
-      
+            setIsFullScreen(document.fullscreenElement !== null)
+        }
+
+        document.addEventListener("fullscreenchange", handleFullScreenChange)
+
         return () => {
-          document.removeEventListener('fullscreenchange', handleFullScreenChange);
-        };
-      }, []);
+            document.removeEventListener(
+                "fullscreenchange",
+                handleFullScreenChange
+            )
+        }
+    }, [])
     const loadContent = (init = false) => {
-        if (!init && refreshPausedList[id] ) {
+        if (!init && refreshPausedList[id]) {
             return
         }
         if (pageSource.startsWith("http")) {
@@ -158,8 +166,13 @@ const ExtraContent = ({
                             }
                         },
                         onFail: (error) => {
-                            //TODO:Need to do something ? TBD
-                            console.log("Error", error)
+                            const errorContent =
+                                "<div style='display: flex; justify-content: center; align-items: center; height: 100%; font-family: Arial, sans-serif;'><p>" +
+                                T("S222") +
+                                pageSource +
+                                "</p></div>"
+                            element.current.contentWindow.document.body.innerHTML =
+                                errorContent
                         },
                     }
                 )
@@ -275,13 +288,15 @@ const ExtraContent = ({
                     />
                 )
             default:
+                const handleIframeError = () => {
+                    console.log("Error loading iframe")
+                }
                 return (
                     <iframe
-                        style="z-index:0!important"
                         class={
                             type == "extension"
-                                ? "extensionContainer d-none"
-                                : "content-container d-block"
+                                ? "extensionContainer d-block iframe-container"
+                                : "content-container d-block iframe-container"
                         }
                         ref={element}
                         id={"page_content_" + id}
@@ -321,7 +336,7 @@ const ExtraContent = ({
         //console.log("Panel :", id, "Ref :", panelRef.current)
         return (
             <div class="panel panel-dashboard" id={id} ref={panelRef}>
-             <ContainerHelper id={id} /> 
+                <ContainerHelper id={id} />
                 <div class="navbar">
                     <span class="navbar-section  feather-icon-container">
                         {displayIcon}
@@ -342,7 +357,7 @@ const ExtraContent = ({
                                 }}
                             />
                         )}
-                        <span style="height: 100%;">
+                        <span class="full-height">
                             <FullScreenButton
                                 panelRef={panelRef}
                                 hideOnFullScreen={true}
@@ -358,10 +373,7 @@ const ExtraContent = ({
                         </span>
                     </span>
                 </div>
-                <div
-                    class="panel-body panel-body-dashboard"
-                    style="margin:0px 0px; padding: 0px 0px"
-                >
+                <div class="panel-body panel-body-dashboard no-margin-no-padding">
                     <MainContent />
                 </div>
                 {parseInt(refreshtime) > 0 && type != "extension" && (
diff --git a/src/components/Modal/genericModal.js b/src/components/Modal/genericModal.js
index cd348d01..ee4f27c6 100644
--- a/src/components/Modal/genericModal.js
+++ b/src/components/Modal/genericModal.js
@@ -44,10 +44,7 @@ const showModal = ({
         modals.addModal({
             id,
             title: (
-                <div
-                    class="text-primary feather-icon-container"
-                    style="line-height:24px!important"
-                >
+                <div class="text-primary feather-icon-container modal_title">
                     {icon}
                     <label>{title}</label>
                 </div>
diff --git a/src/components/Modal/index.js b/src/components/Modal/index.js
index 881c767e..8cc50457 100644
--- a/src/components/Modal/index.js
+++ b/src/components/Modal/index.js
@@ -44,7 +44,7 @@ const ModalContainer = ({ id }) => {
         )
     }
     return (
-        <div class="modals-container" id={id} style="z-index:20000;">
+        <div class="modals-container" id={id}>
             {modals.modalList &&
                 modals.modalList.length > 0 &&
                 modals.modalList.map((modal, index) => {
@@ -62,7 +62,6 @@ const ModalContainer = ({ id }) => {
                         <SpectreModal
                             class={`active`}
                             id={"modal-" + modal.id}
-                            style="z-index:999999"
                             key={index}
                             tabIndex="-1"
                         >
diff --git a/src/components/Modal/keepConnectedModal.js b/src/components/Modal/keepConnectedModal.js
index c156c817..47129cb4 100644
--- a/src/components/Modal/keepConnectedModal.js
+++ b/src/components/Modal/keepConnectedModal.js
@@ -54,10 +54,7 @@ const showKeepConnected = () => {
         modals.addModal({
             id: id,
             title: (
-                <div
-                    class="text-primary feather-icon-container"
-                    style="line-height:24px!important"
-                >
+                <div class="text-primary feather-icon-container modal_title">
                     <HelpCircle />
                     <label>{T("S145")}</label>
                 </div>
diff --git a/src/components/Modal/logginModal.js b/src/components/Modal/logginModal.js
index 5170ccf7..32f4e2d2 100644
--- a/src/components/Modal/logginModal.js
+++ b/src/components/Modal/logginModal.js
@@ -85,10 +85,7 @@ const showLogin = () => {
         modals.addModal({
             id: id,
             title: (
-                <div
-                    class="text-primary feather-icon-container"
-                    style="line-height:24px!important"
-                >
+                <div class="text-primary feather-icon-container modal_title">
                     <Lock />
                     <label>{T("S145")}</label>
                 </div>
diff --git a/src/components/Modal/progressModal.js b/src/components/Modal/progressModal.js
index 7396576c..4e35a29c 100644
--- a/src/components/Modal/progressModal.js
+++ b/src/components/Modal/progressModal.js
@@ -31,10 +31,7 @@ const showProgressModal = ({ modals, title, button1, content }) => {
         modals.addModal({
             id: id,
             title: (
-                <div
-                    class="text-primary feather-icon-container"
-                    style="line-height:24px!important"
-                >
+                <div class="text-primary feather-icon-container modal_title">
                     <Info />
                     <label>{title}</label>
                 </div>
diff --git a/src/components/Panels/ExtraControls.js b/src/components/Panels/ExtraControls.js
index f5f72ddb..dc5bde20 100644
--- a/src/components/Panels/ExtraControls.js
+++ b/src/components/Panels/ExtraControls.js
@@ -313,7 +313,7 @@ const ExtraControlsPanel = () => {
                     <strong class="text-ellipsis">{T("P96")}</strong>
                 </span>
                 <span class="navbar-section">
-                    <span style="height: 100%;">
+                    <span class="full-height">
                         <FullScreenButton
                             panelRef={panelRef}
                             hideOnFullScreen={true}
diff --git a/src/components/Panels/Files.js b/src/components/Panels/Files.js
index 2d96e53a..21967a1d 100644
--- a/src/components/Panels/Files.js
+++ b/src/components/Panels/Files.js
@@ -649,7 +649,7 @@ const FilesPanel = () => {
                 </span>
 
                 <span class="navbar-section">
-                    <span style="height: 100%;">
+                    <span class="full-height">
                         {fileSystem != "" && !isLoading && (
                             <PanelMenu items={menu} />
                         )}
@@ -781,11 +781,10 @@ const FilesPanel = () => {
                                 }}
                             >
                                 <div
-                                    class="form-control  file-line-name file-line-action"
-                                    style="height:2rem!important"
+                                    class="form-control go-previous file-line-name file-line-action"
                                 >
                                     <CornerRightUp />
-                                    <label class="p-2">...</label>
+                                    <label class="go-previous-text">...</label>
                                 </div>
                             </div>
                         )}
@@ -917,7 +916,7 @@ const FilesPanel = () => {
             </div>
             <div class="files-list-footer">
                 {!isLoading && filesList && filesList.occupation && (
-                    <div style=" display: flex; align-items:center; flex-wrap: wrap; justify-content: space-between;">
+                    <div class="filelist-occupation">
                         <div class="flex-pack">
                             {T("S98")}:{filesList.total}
                         </div>
diff --git a/src/components/Panels/Jog.js b/src/components/Panels/Jog.js
index e844c4c7..a89f182d 100644
--- a/src/components/Panels/Jog.js
+++ b/src/components/Panels/Jog.js
@@ -22,7 +22,13 @@ import { useHttpFn } from "../../hooks"
 import { espHttpURL } from "../Helpers"
 import { useUiContext, useUiContextFn } from "../../contexts"
 import { T } from "../Translations"
-import { Button, ButtonImg, FullScreenButton, CloseButton, ContainerHelper } from "../Controls"
+import {
+    Button,
+    ButtonImg,
+    FullScreenButton,
+    CloseButton,
+    ContainerHelper,
+} from "../Controls"
 import { useEffect, useState, useRef } from "preact/hooks"
 import { showModal } from "../Modal"
 import { useTargetContext } from "../../targets"
@@ -358,7 +364,7 @@ const JogPanel = () => {
 
     return (
         <div id={id} class="panel panel-dashboard" id={id} ref={panelRef}>
-            <ContainerHelper id={id} /> 
+            <ContainerHelper id={id} />
             <div class="navbar">
                 <span class="navbar-section feather-icon-container">
                     <Move />
@@ -1766,10 +1772,7 @@ const JogPanel = () => {
                         </Button>
                     </div>
                 </div>
-                <div
-                    class="jog-extra-buttons-container"
-                    style="margin-right:8px"
-                >
+                <div class="jog-extra-buttons-container">
                     <ButtonImg
                         m1
                         tooltip
diff --git a/src/components/Panels/JogCNC.js b/src/components/Panels/JogCNC.js
index af95651f..d10471e6 100644
--- a/src/components/Panels/JogCNC.js
+++ b/src/components/Panels/JogCNC.js
@@ -632,7 +632,6 @@ const JogPanel = () => {
                             <select
                                 id="selectAxisList"
                                 class="form-select"
-                                style="border-color: #5755d9!important"
                                 onchange={(e) => {
                                     onChangeAxis(e)
                                 }}
@@ -755,7 +754,7 @@ const JogPanel = () => {
                                 sendZeroCommand("")
                             }}
                         >
-                            <label style="font-size:150%; vertical-align: top;">
+                            <label class="text-like-icon">
                                 &Oslash;
                             </label>
                             <MoreHorizontal />
diff --git a/src/components/Panels/JogPlotter.js b/src/components/Panels/JogPlotter.js
index 16ffe7cb..d8df00a1 100644
--- a/src/components/Panels/JogPlotter.js
+++ b/src/components/Panels/JogPlotter.js
@@ -428,11 +428,11 @@ const JogPanel = () => {
                                             "Y"
                                         ))) && (
                                     <Button
+                                        class="button-minimal"
                                         lg
                                         m2
                                         tooltip
                                         nomin
-                                        style="min-width:2.5rem"
                                         data-tooltip={T(buttonsInfos.T.tooltip)}
                                         id="btnjogup"
                                         onclick={(e) => {
@@ -453,11 +453,11 @@ const JogPanel = () => {
                                             "Y"
                                         ))) && (
                                     <ButtonImg
+                                        class="button-minimal"
                                         m2
                                         lg
                                         tooltip
                                         nomin
-                                        style="min-width:2.5rem"
                                         data-tooltip={T(buttonsInfos.L.tooltip)}
                                         id="btnjogleft"
                                         label={buttonsInfos.L.label}
@@ -489,10 +489,10 @@ const JogPanel = () => {
                                             "Y"
                                         ))) && (
                                     <ButtonImg
+                                        class="button-minimal"
                                         lg
                                         m2
                                         nomin
-                                        style="min-width:2.5rem"
                                         label={buttonsInfos.R.label}
                                         tooltip
                                         data-tooltip={T(buttonsInfos.R.tooltip)}
@@ -513,10 +513,10 @@ const JogPanel = () => {
                                             "Y"
                                         ))) && (
                                     <ButtonImg
+                                        class="button-minimal"
                                         lg
                                         m2
                                         nomin
-                                        style="min-width:2.5rem"
                                         tooltip
                                         data-tooltip={T(buttonsInfos.B.tooltip)}
                                         id="btnjogdown"
diff --git a/src/components/Panels/LaserCNC.js b/src/components/Panels/LaserCNC.js
index 690ea2d0..ea78e9f4 100644
--- a/src/components/Panels/LaserCNC.js
+++ b/src/components/Panels/LaserCNC.js
@@ -251,7 +251,7 @@ const LaserPanel = () => {
                     <strong class="text-ellipsis">{T("CN35")}</strong>
                 </span>
                 <span class="navbar-section">
-                    <span style="height: 100%;">
+                    <span class="full-height">
                         <FullScreenButton
                             panelRef={panelRef}
                             hideOnFullScreen={true}
diff --git a/src/components/Panels/Macros.js b/src/components/Panels/Macros.js
index 9a94f29d..18800923 100644
--- a/src/components/Panels/Macros.js
+++ b/src/components/Panels/Macros.js
@@ -154,7 +154,7 @@ const MacrosPanel = () => {
                     <strong class="text-ellipsis">{T("macros")}</strong>
                 </span>
                 <span class="navbar-section">
-                    <span style="height: 100%;">
+                    <span class="full-height">
                         <FullScreenButton panelRef={panelRef} />
                         <CloseButton
                             panelRef={panelRef}
diff --git a/src/components/Panels/Notifications.js b/src/components/Panels/Notifications.js
index d1c46c48..65a71b1e 100644
--- a/src/components/Panels/Notifications.js
+++ b/src/components/Panels/Notifications.js
@@ -116,7 +116,7 @@ const NotificationsPanel = () => {
                     <strong class="text-ellipsis">{T("notification")}</strong>
                 </span>
                 <span class="navbar-section">
-                    <span style="height: 100%;">
+                    <span class="full-height">
                         <PanelMenu items={menu} />
                         <FullScreenButton
                             panelRef={panelRef}
diff --git a/src/components/Panels/OverridesCNC.js b/src/components/Panels/OverridesCNC.js
index bc2bd0f3..7c0fe1ae 100644
--- a/src/components/Panels/OverridesCNC.js
+++ b/src/components/Panels/OverridesCNC.js
@@ -189,7 +189,7 @@ const OverridesPanel = () => {
                     <strong class="text-ellipsis">{T("CN65")}</strong>
                 </span>
                 <span class="navbar-section">
-                    <span style="height: 100%;">
+                    <span class="full-height">
                         <FullScreenButton
                             panelRef={panelRef}
                             hideOnFullScreen={true}
diff --git a/src/components/Panels/ProbeCNC.js b/src/components/Panels/ProbeCNC.js
index fd09f17d..3b38a200 100644
--- a/src/components/Panels/ProbeCNC.js
+++ b/src/components/Panels/ProbeCNC.js
@@ -383,7 +383,7 @@ const ProbePanel = () => {
                     <strong class="text-ellipsis">{T("CN37")}</strong>
                 </span>
                 <span class="navbar-section">
-                    <span style="height: 100%;">
+                    <span class="full-height">
                         <FullScreenButton
                             panelRef={panelRef}
                             hideOnFullScreen={true}
diff --git a/src/components/Panels/SpindleCNC.js b/src/components/Panels/SpindleCNC.js
index 929be9da..00f0dac6 100644
--- a/src/components/Panels/SpindleCNC.js
+++ b/src/components/Panels/SpindleCNC.js
@@ -256,7 +256,7 @@ const SpindlePanel = () => {
                     <strong class="text-ellipsis">{T("CN36")}</strong>
                 </span>
                 <span class="navbar-section">
-                    <span style="height: 100%;">
+                    <span class="full-height">
                         <FullScreenButton
                             panelRef={panelRef}
                             hideOnFullScreen={true}
diff --git a/src/components/Panels/Status.js b/src/components/Panels/Status.js
index fbf761de..b23b486d 100644
--- a/src/components/Panels/Status.js
+++ b/src/components/Panels/Status.js
@@ -306,7 +306,7 @@ const StatusPanel = () => {
                     <strong class="text-ellipsis">{T("P97")}</strong>
                 </span>
                 <span class="navbar-section">
-                    <span style="height: 100%;">
+                    <span class="full-height">
                         <FullScreenButton
                             panelRef={panelRef}
                             hideOnFullScreen={true}
diff --git a/src/components/Panels/StatusCNC.js b/src/components/Panels/StatusCNC.js
index 7d2e7805..b065ce2b 100644
--- a/src/components/Panels/StatusCNC.js
+++ b/src/components/Panels/StatusCNC.js
@@ -239,7 +239,7 @@ const StatusPanel = () => {
                     <strong class="text-ellipsis">{T("CN34")}</strong>
                 </span>
                 <span class="navbar-section">
-                    <span style="height: 100%;">
+                    <span class="full-height">
                         <FullScreenButton
                             panelRef={panelRef}
                             hideOnFullScreen={true}
diff --git a/src/components/Panels/Temperatures.js b/src/components/Panels/Temperatures.js
index ea582c32..7e26299a 100644
--- a/src/components/Panels/Temperatures.js
+++ b/src/components/Panels/Temperatures.js
@@ -306,7 +306,7 @@ const TemperaturesPanel = () => {
                     <strong class="text-ellipsis">{T("P29")}</strong>
                 </span>
                 <span class="navbar-section">
-                    <span style="height: 100%;">
+                    <span class="full-height">
                         <FullScreenButton
                             panelRef={panelRef}
                             hideOnFullScreen={true}
diff --git a/src/components/Panels/Terminal.js b/src/components/Panels/Terminal.js
index da31bbb1..60f82484 100644
--- a/src/components/Panels/Terminal.js
+++ b/src/components/Panels/Terminal.js
@@ -223,7 +223,7 @@ const TerminalPanel = () => {
                     <strong class="text-ellipsis">{T("Terminal")}</strong>
                 </span>
                 <span class="navbar-section">
-                    <span style="height: 100%;">
+                    <span class="full-height">
                         <PanelMenu items={menu} />
                         <FullScreenButton
                             panelRef={panelRef}
diff --git a/src/style/components/_control.scss b/src/style/components/_control.scss
index 116b8ca5..6a892afa 100644
--- a/src/style/components/_control.scss
+++ b/src/style/components/_control.scss
@@ -560,6 +560,86 @@ a label {
 }
 
 .nested-button {
-   color:blue!important;
-   background-color: #f1f1fc;
+    color: blue !important;
+    background-color: #f1f1fc;
+}
+
+.insensitive {
+    pointer-events: none;
+}
+.text-straigth {
+    overflow: hidden !important;
+    white-space: nowrap;
+    text-overflow: ellipsis !important;
+}
+
+.icon-btn {
+    min-width: 2rem;
+}
+
+.filelist-occupation {
+    display: flex;
+    align-items: center;
+    flex-wrap: wrap;
+    justify-content: space-between;
+}
+
+.text-like-icon {
+    font-size: 1.4rem;
+    vertical-align: top;
+}
+
+.button-mininal {
+    min-width: 2.5rem;
+}
+
+.icon-clear,
+.icon-reveal {
+    margin-top: 0.15rem;
+}
+
+.iframe-container {
+    z-index: 0 !important;
+}
+
+.go-previous {
+    height: 2rem !important;
+}
+
+.go-previous-text {
+    font-size: 1.4rem;
+}
+
+.progress-value-label {
+    margin-left: 15px;
+}
+
+.full-width {
+    width: 100%;
+}
+
+.full-height {
+    height: 100%;
+}
+
+.content-icon {
+    padding: 0 20px;
+}
+
+.empty-content {
+    flex-wrap: nowrap !important;
+}
+
+.no-margin-no-padding {
+    margin: 0 !important;
+    padding: 0 !important;
+}
+
+.modal_title {
+    line-height: 24px !important;
+}
+
+
+.modals-container {
+    z-index:20000;
 }
\ No newline at end of file
diff --git a/src/tabs/interface/index.js b/src/tabs/interface/index.js
index fce38c7e..14822b1f 100644
--- a/src/tabs/interface/index.js
+++ b/src/tabs/interface/index.js
@@ -47,8 +47,8 @@ const generateValidationGlobal = (
     fieldData,
     isFlashFS,
     isSDFS,
-    interfaceSettings,
     connectionSettings,
+    interfaceSettings,
     setShowSave,
     checkSaveStatus
 ) => {
@@ -59,6 +59,11 @@ const generateValidationGlobal = (
     }
 
     if (fieldData.shortkey && interfaceSettings) {
+        console.log(
+            "shortkeys",
+            interfaceSettings.current,
+            connectionSettings.current
+        )
         if (fieldData.value.length > 0) {
             if (fieldData.value.endsWith("+")) {
                 validation.message = T("S214")
@@ -199,7 +204,11 @@ const generateValidationGlobal = (
                     }
                 }
             }
-            if (fieldData.name == "type" && fieldData.value == "camera" && interfaceSettings) {
+            if (
+                fieldData.name == "type" &&
+                fieldData.value == "camera" &&
+                interfaceSettings
+            ) {
                 //Update camera source automaticaly
                 //Note: is there a less complexe way to do ?
                 const sourceId = fieldData.id.split("-")[0]
@@ -253,7 +262,8 @@ const generateValidationGlobal = (
     }
     if (
         (typeof isFlashFS != "undefined" || typeof isSDFS != "undefined") &&
-        typeof setShowSave != "undefined" && typeof checkSaveStatus != "undefined"
+        typeof setShowSave != "undefined" &&
+        typeof checkSaveStatus != "undefined"
     ) {
         if (isFlashFS || isSDFS) {
             setShowSave(checkSaveStatus())
diff --git a/src/targets/CNC/style/_index.scss b/src/targets/CNC/style/_index.scss
index 541b5f1a..0ac194d7 100644
--- a/src/targets/CNC/style/_index.scss
+++ b/src/targets/CNC/style/_index.scss
@@ -160,3 +160,7 @@
     color: #5755d9;
     background-color: #f1f1fc;
 }
+
+#selectAxisList{
+    border-color: #5755d9!important
+}
\ No newline at end of file
diff --git a/src/targets/Printer3D/style/_index.scss b/src/targets/Printer3D/style/_index.scss
index 1824a7fe..5a17bc1f 100644
--- a/src/targets/Printer3D/style/_index.scss
+++ b/src/targets/Printer3D/style/_index.scss
@@ -277,6 +277,7 @@ path.std:hover {
     display: flex;
     width: 100%;
     justify-content: space-evenly;
+    margin-right:8px;
 }
 
 .print-buttons-container,
diff --git a/src/targets/translations/en.json b/src/targets/translations/en.json
index 2e511790..45576e7b 100644
--- a/src/targets/translations/en.json
+++ b/src/targets/translations/en.json
@@ -226,6 +226,7 @@
     "S219": "TFT",
     "S220": "Makerbase",
     "S221": "Bigtreetech",
+    "S222": "Error loading file:",
     "btn+X": "X+",
     "btn-X": "X-",
     "btnHX": "Home X",