diff --git a/src/components/panels/KlipperWarningsPanel.vue b/src/components/panels/KlipperWarningsPanel.vue
new file mode 100644
index 00000000..0180fedd
--- /dev/null
+++ b/src/components/panels/KlipperWarningsPanel.vue
@@ -0,0 +1,54 @@
+<template>
+    <v-card class="mb-6" v-if="klipperReadyForGui && warnings.length">
+        <v-toolbar flat dense color="orange darken-2">
+            <v-toolbar-title>
+                <span class="subheading">
+                    <v-icon class="mdi mdi-alert-circle" left></v-icon>{{ $t("Panels.KlipperWarningsPanel.KlipperWarnings") }} ({{ warnings.length }})
+                </span>
+            </v-toolbar-title>
+        </v-toolbar>
+        <v-card-text :class="index > 0 ? 'py-0' : 'pt-3 pb-0'" v-for="(warning, index) in warnings" v-bind:key="warning">
+            <v-divider class="my-2" v-if="index"></v-divider>
+            <v-row>
+                <v-col>
+                    <p class="orange--text mb-0" v-if="warning.type === 'deprecated_option'">{{ $t('Panels.KlipperWarningsPanel.DeprecatedOption', { section: warning.section, option: warning.option }) }}</p>
+                    <p class="orange--text mb-0" v-else-if="warning.type === 'deprecated_value'">{{ $t('Panels.KlipperWarningsPanel.DeprecatedValue', { section: warning.section, option: warning.option, value: warning.value }) }}</p>
+                    <p class="orange--text mb-0" v-else>{{ warning.message }}</p>
+                </v-col>
+                <v-col class="col-auto d-flex align-center">
+                    <a :href="getDocsLink(warning)" target="_blank" class="text-decoration-none"><v-icon>mdi-information</v-icon></a>
+                </v-col>
+            </v-row>
+        </v-card-text>
+        <v-divider class="mb-2 mt-3"></v-divider>
+        <v-card-actions class="px-4 pt-2 pb-4 text-center text-lg-left">
+            <v-btn small :href="apiUrl+'/server/files/klipper.log'" target="_blank" color="primary" class=""><v-icon class="mr-2" small>mdi-download</v-icon>{{ $t("Panels.KlipperWarningsPanel.DownloadLog") }}</v-btn>
+        </v-card-actions>
+    </v-card>
+</template>
+
+<script lang="ts">
+import Component from 'vue-class-component'
+import BaseMixin from '../mixins/base'
+import {Mixins} from 'vue-property-decorator'
+import {caseInsensitiveSort} from '@/plugins/helpers'
+
+@Component
+export default class KlipperWarningsPanelPanel extends Mixins(BaseMixin) {
+
+    get warnings() {
+        let warnings = this.$store.state.printer.configfile?.warnings ?? []
+
+        return caseInsensitiveSort(warnings, 'option')
+    }
+
+    getDocsLink(warning: { type: string, option: string, value: string }) {
+        let url = 'https://docs.mainsail.xyz/faq/' + warning.type
+
+        if (warning.type === 'deprecated_option') url += '#' + warning.option
+        else if (warning.type === 'deprecated_value') url += '#' + warning.value
+
+        return url
+    }
+}
+</script>
\ No newline at end of file
diff --git a/src/components/panels/MoonrakerStatePanel.vue b/src/components/panels/MoonrakerStatePanel.vue
index b27d9f9d..75eec099 100644
--- a/src/components/panels/MoonrakerStatePanel.vue
+++ b/src/components/panels/MoonrakerStatePanel.vue
@@ -25,7 +25,7 @@
         </v-card-text>
         <v-divider class="mb-2 mt-3"></v-divider>
         <v-card-actions class="px-4 pt-2 pb-4 text-center text-lg-left">
-            <v-btn small :href="apiUrl+'/server/files/moonraker.log'" target="_blank" color="primary" class=""><v-icon class="mr-2">mdi-download</v-icon>{{ $t("Panels.MoonrakerStatePanel.DownloadLog") }}</v-btn>
+            <v-btn small :href="apiUrl+'/server/files/moonraker.log'" target="_blank" color="primary" class=""><v-icon class="mr-2" small>mdi-download</v-icon>{{ $t("Panels.MoonrakerStatePanel.DownloadLog") }}</v-btn>
         </v-card-actions>
     </v-card>
 </template>
diff --git a/src/components/panels/StatusPanel.vue b/src/components/panels/StatusPanel.vue
index 6744cae2..95daee81 100644
--- a/src/components/panels/StatusPanel.vue
+++ b/src/components/panels/StatusPanel.vue
@@ -9,6 +9,7 @@
         <min-settings-panel></min-settings-panel>
         <moonraker-state-panel></moonraker-state-panel>
         <klippy-state-panel></klippy-state-panel>
+        <klipper-warnings-panel></klipper-warnings-panel>
         <v-card v-if="klipperState === 'ready'" class="mb-6">
             <v-toolbar flat dense>
                 <v-toolbar-title>
@@ -277,9 +278,10 @@ import VueLoadImage from 'vue-load-image'
 import MinSettingsPanel from '@/components/panels/MinSettingsPanel'
 import MoonrakerStatePanel from '@/components/panels/MoonrakerStatePanel'
 import KlippyStatePanel from '@/components/panels/KlippyStatePanel'
+import KlipperWarningsPanel from '@/components/panels/KlipperWarningsPanel'
 
 @Component({
-    components: {KlippyStatePanel, MoonrakerStatePanel, MinSettingsPanel},
+    components: {KlipperWarningsPanel, KlippyStatePanel, MoonrakerStatePanel, MinSettingsPanel},
     VueLoadImage
 })
 export default class StatusPanel extends Mixins(BaseMixin) {
diff --git a/src/locales/en.json b/src/locales/en.json
index 694fa6c0..63bcd02f 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -266,6 +266,12 @@
 			"Restart": "Restart",
 			"FirmwareRestart": "Firmware Restart"
 		},
+		"KlipperWarningsPanel": {
+			"KlipperWarnings": "Klipper Warnings",
+			"DownloadLog": "download log",
+			"DeprecatedOption": "Option '{option}' in section '{section}' is deprecated.",
+			"DeprecatedValue": "Value '{value}' in option '{option}' in section '{section}' is deprecated."
+		},
 		"MiniconsolePanel": {
 			"Headline": "Console",
 			"SetupConsole": "Setup Console",