diff --git a/client_v3/src/common/ui/SettingRow/SettingRow.tsx b/client_v3/src/common/ui/SettingRow/SettingRow.tsx
index 8bea59060..165b249d2 100644
--- a/client_v3/src/common/ui/SettingRow/SettingRow.tsx
+++ b/client_v3/src/common/ui/SettingRow/SettingRow.tsx
@@ -26,6 +26,7 @@ type Props = {
     divider?: boolean;
     align?: 'top' | 'center';
     largeTitle?: boolean;
+    inputClassName?: string;
 };
 
 export const SettingRow = (props: Props) => {
@@ -142,7 +143,7 @@ export const SettingRow = (props: Props) => {
                     <div class={s.divider} />
                 </Show>
                 <div
-                    class={cn(s.input, props.largeTitle && s.largeTitle)}
+                    class={cn(s.input, props.inputClassName, props.largeTitle && s.largeTitle)}
                     onClick={handleInputClick}
                 >
                     <Show when={isSwitchVariant()}>
diff --git a/client_v3/src/components/Dhcp/Dhcp.tsx b/client_v3/src/components/Dhcp/Dhcp.tsx
index 9c8e6c675..4b9285583 100644
--- a/client_v3/src/components/Dhcp/Dhcp.tsx
+++ b/client_v3/src/components/Dhcp/Dhcp.tsx
@@ -18,7 +18,7 @@ import {
     setDhcpConfig,
     resetDhcp,
 } from 'panel/stores/dhcp';
-import { addErrorToast } from 'panel/stores/toasts';
+import { addWarningToast } from 'panel/stores/toasts';
 
 import { DhcpToggle } from './blocks/DhcpToggle';
 import { InterfaceSelector } from './blocks/InterfaceSelector';
@@ -78,7 +78,7 @@ export const Dhcp = () => {
             check &&
             (check.v4?.other_server?.found === 'yes' || check.v6?.other_server?.found === 'yes')
         ) {
-            addErrorToast({ error: intl.getMessage('dhcp_warning') });
+            addWarningToast({ error: intl.getMessage('dhcp_warning') });
         }
     });
 
diff --git a/client_v3/src/components/Settings/Settings.module.pcss b/client_v3/src/components/Settings/Settings.module.pcss
index 94189849a..0c5dd977a 100644
--- a/client_v3/src/components/Settings/Settings.module.pcss
+++ b/client_v3/src/components/Settings/Settings.module.pcss
@@ -40,3 +40,7 @@
 .sectionTitle {
     line-height: 32px;
 }
+
+.queryLogSwitch {
+    padding-top: 12px;
+}
diff --git a/client_v3/src/components/Settings/Settings.tsx b/client_v3/src/components/Settings/Settings.tsx
index 150b75708..882b4a4fb 100644
--- a/client_v3/src/components/Settings/Settings.tsx
+++ b/client_v3/src/components/Settings/Settings.tsx
@@ -234,6 +234,7 @@ export const Settings = () => {
                                             enabled: v,
                                         })
                                     }
+                                    inputClassName={s.queryLogSwitch}
                                 />
 
                                 <SettingRow
diff --git a/client_v3/src/helpers/constants.ts b/client_v3/src/helpers/constants.ts
index f84cfff95..c4026da36 100644
--- a/client_v3/src/helpers/constants.ts
+++ b/client_v3/src/helpers/constants.ts
@@ -565,6 +565,7 @@ export const TOAST_TYPES = {
     SUCCESS: 'success',
     ERROR: 'error',
     NOTICE: 'notice',
+    WARNING: 'warning',
 };
 
 export const SUCCESS_TOAST_TIMEOUT = 5000;
@@ -576,6 +577,7 @@ export const TOAST_TIMEOUTS = {
     [TOAST_TYPES.SUCCESS]: SUCCESS_TOAST_TIMEOUT,
     [TOAST_TYPES.ERROR]: FAILURE_TOAST_TIMEOUT,
     [TOAST_TYPES.NOTICE]: FAILURE_TOAST_TIMEOUT,
+    [TOAST_TYPES.WARNING]: FAILURE_TOAST_TIMEOUT,
 };
 
 export const ADDRESS_TYPES = {
diff --git a/client_v3/src/stores/toasts.ts b/client_v3/src/stores/toasts.ts
index 72c53dec1..b61d88063 100644
--- a/client_v3/src/stores/toasts.ts
+++ b/client_v3/src/stores/toasts.ts
@@ -12,7 +12,7 @@ type ToastAction = {
 type ToastNotice = {
     id: string;
     message: any;
-    type: 'error' | 'success' | 'notice';
+    type: 'error' | 'success' | 'notice' | 'warning';
     actionLabel?: string;
     undoId?: string;
     action?: ToastAction;
@@ -80,6 +80,21 @@ export const addSuccessToast = (message: any) => {
     setState('notices', (prev) => [...prev, notice]);
 };
 
+export const addWarningToast = (payload: { error: any; options?: any; action?: ToastAction }) => {
+    const { error, options, action } = payload;
+    const message = error instanceof Error ? error.message : String(error);
+    const notice: ToastNotice = {
+        id: nanoid(),
+        message,
+        options,
+        type: 'warning' as const,
+    };
+    if (action) {
+        notice.action = action;
+    }
+    setState('notices', (prev) => [...prev, notice]);
+};
+
 export const addNoticeToast = (message: any) => {
     setState('notices', (prev) => [
         ...prev,