diff --git a/components.d.ts b/components.d.ts
index 44d756bf8..f8d74a7b1 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -21,7 +21,6 @@ declare module 'vue' {
     FarmPrinterPanel: typeof import('./src/components/panels/FarmPrinterPanel.vue')['default']
     FilamentSensor: typeof import('./src/components/inputs/FilamentSensor.vue')['default']
     FirmwareRetractionSettings: typeof import('./src/components/panels/MachineSettings/FirmwareRetractionSettings.vue')['default']
-    FirmwareRetractionSettingsInput: typeof import('./src/components/inputs/FirmwareRetractionSettingsInput.vue')['default']
     GcodefilesPanel: typeof import('./src/components/panels/GcodefilesPanel.vue')['default']
     HistoryAllPrintStatus: typeof import('./src/components/charts/HistoryAllPrintStatus.vue')['default']
     HistoryFilamentUsage: typeof import('./src/components/charts/HistoryFilamentUsage.vue')['default']
@@ -46,12 +45,10 @@ declare module 'vue' {
     MjpegstreamerAdaptive: typeof import('./src/components/webcams/MjpegstreamerAdaptive.vue')['default']
     MoonrakerStatePanel: typeof import('./src/components/panels/MoonrakerStatePanel.vue')['default']
     MotionSettings: typeof import('./src/components/panels/MachineSettings/MotionSettings.vue')['default']
-    MotionSettingsInput: typeof import('./src/components/inputs/MotionSettingsInput.vue')['default']
     NumberInput: typeof import('./src/components/inputs/NumberInput.vue')['default']
     Panel: typeof import('./src/components/ui/Panel.vue')['default']
     PowerControlPanel: typeof import('./src/components/panels/PowerControlPanel.vue')['default']
     PressureAdvanceSettings: typeof import('./src/components/panels/MachineSettings/PressureAdvanceSettings.vue')['default']
-    PressureAdvanceSettingsInput: typeof import('./src/components/inputs/PressureAdvanceSettingsInput.vue')['default']
     PrinterSelector: typeof import('./src/components/ui/PrinterSelector.vue')['default']
     PrintsettingsPanel: typeof import('./src/components/panels/PrintsettingsPanel.vue')['default']
     SettingsConsoleTab: typeof import('./src/components/settings/SettingsConsoleTab.vue')['default']
diff --git a/src/components/inputs/FirmwareRetractionSettingsInput.vue b/src/components/inputs/FirmwareRetractionSettingsInput.vue
deleted file mode 100644
index cfef5948b..000000000
--- a/src/components/inputs/FirmwareRetractionSettingsInput.vue
+++ /dev/null
@@ -1,109 +0,0 @@
-<style scoped>
-._spin_button_group {
-    width: 24px;
-    margin: -6px -6px 0 -6px;
-}
-</style>
-
-<template>
-    <form @submit.prevent="sendCmd">
-        <v-text-field
-            v-model="value"
-            class="d-flex align-center"
-            :label="label"
-            :suffix="unit"
-            :append-icon="value !== defaultValue ? 'mdi-restart' : ''"
-            :error="(error = value < min || (value > max && max !== null))"
-            :step="step"
-            :min="min"
-            :max="max"
-            :dec="dec"
-            type="number"
-            @click:append="resetLimit"
-            hide-spin-buttons
-            @blur="value = target"
-            hide-details
-            outlined
-            dense>
-            <template v-if="hasSpinner" #append-outer>
-                <div class="_spin_button_group">
-                    <v-btn
-                        :disabled="(value >= max && max !== null) || error"
-                        class="mt-n3"
-                        icon
-                        plain
-                        small
-                        @click="increment">
-                        <v-icon>mdi-chevron-up</v-icon>
-                    </v-btn>
-                    <v-btn :disabled="value <= min || error" class="mb-n3" icon plain small @click="decrement">
-                        <v-icon>mdi-chevron-down</v-icon>
-                    </v-btn>
-                </div>
-            </template>
-        </v-text-field>
-    </form>
-</template>
-
-<script lang="ts">
-import Component from 'vue-class-component'
-import { Mixins, Prop, Watch } from 'vue-property-decorator'
-import { Debounce } from 'vue-debounce-decorator'
-import BaseMixin from '@/components/mixins/base'
-
-@Component
-export default class FirmwareRetractionSettingsInput extends Mixins(BaseMixin) {
-    private value: number = 0
-    private error: boolean | undefined
-
-    @Prop({ type: String, required: true }) declare readonly label: string
-    @Prop({ type: Number, required: false, default: 1 }) declare readonly step: number
-    @Prop({ type: Boolean, required: false, default: false }) declare readonly hasSpinner: number
-    @Prop({ type: Number, required: false, default: 1 }) declare readonly spinnerFactor: number
-    @Prop({ type: Number, required: true, default: 0 }) declare readonly min: number
-    @Prop({ type: Number, default: null }) declare readonly max: number | null
-    @Prop({ type: Number, required: true, default: 0 }) declare readonly dec: number
-    @Prop({ type: Number, required: true, default: 0 }) declare readonly target: number
-    @Prop({ type: Number, required: true, default: 0 }) declare readonly defaultValue: number
-    @Prop({ type: String, required: true }) declare readonly attributeName: string
-    @Prop({ type: String, required: true }) declare readonly unit: string
-
-    @Watch('target')
-    targetChanged(newVal: number): void {
-        this.value = newVal
-    }
-
-    created(): void {
-        this.value = this.target
-    }
-
-    resetLimit(): void {
-        this.value = this.defaultValue
-
-        this.sendCmd()
-    }
-
-    decrement(): void {
-        this.value =
-            this.value > this.min
-                ? Math.round((this.value - this.step * this.spinnerFactor) * 10 ** this.dec) / 10 ** this.dec
-                : this.min
-        this.sendCmd()
-    }
-
-    increment(): void {
-        this.value =
-            this.value < this.max! || this.max === null
-                ? Math.round((this.value + this.step * this.spinnerFactor) * 10 ** this.dec) / 10 ** this.dec
-                : this.max
-        this.sendCmd()
-    }
-
-    @Debounce(500)
-    sendCmd(): void {
-        const gcode = 'SET_RETRACTION ' + this.attributeName + '=' + Math.max(this.min, this.value).toFixed(this.dec)
-        this.$store.dispatch('server/addEvent', { message: gcode, type: 'command' })
-        this.$socket.emit('printer.gcode.script', { script: gcode })
-    }
-}
-</script>
diff --git a/src/components/inputs/MotionSettingsInput.vue b/src/components/inputs/MotionSettingsInput.vue
deleted file mode 100644
index 899ad0d2e..000000000
--- a/src/components/inputs/MotionSettingsInput.vue
+++ /dev/null
@@ -1,110 +0,0 @@
-<style scoped>
-._spin_button_group {
-    width: 24px;
-    margin: -6px -6px 0 -6px;
-}
-</style>
-
-<template>
-    <form @submit.prevent="sendCmd">
-        <v-text-field
-            v-model="value"
-            class="d-flex align-center"
-            :label="label"
-            :suffix="unit"
-            :append-icon="value !== defaultValue ? 'mdi-restart' : ''"
-            :error="(error = value < min || (value > max && max !== null))"
-            :step="step"
-            :min="min"
-            :max="max"
-            :dec="dec"
-            type="number"
-            @click:append="resetLimit"
-            hide-spin-buttons
-            @blur="value = target"
-            hide-details
-            outlined
-            dense>
-            <template v-if="hasSpinner" #append-outer>
-                <div class="_spin_button_group">
-                    <v-btn
-                        :disabled="(value >= max && max !== null) || error"
-                        class="mt-n3"
-                        icon
-                        plain
-                        small
-                        @click="increment">
-                        <v-icon>mdi-chevron-up</v-icon>
-                    </v-btn>
-                    <v-btn :disabled="value <= min || error" class="mb-n3" icon plain small @click="decrement">
-                        <v-icon>mdi-chevron-down</v-icon>
-                    </v-btn>
-                </div>
-            </template>
-        </v-text-field>
-    </form>
-</template>
-
-<script lang="ts">
-import Component from 'vue-class-component'
-import { Mixins, Prop, Watch } from 'vue-property-decorator'
-import { Debounce } from 'vue-debounce-decorator'
-import BaseMixin from '@/components/mixins/base'
-
-@Component
-export default class MotionSettingsInput extends Mixins(BaseMixin) {
-    private value: number = 0
-    private error: boolean | undefined
-
-    @Prop({ type: String, required: true }) declare readonly label: string
-    @Prop({ type: Number, required: false, default: 1 }) declare readonly step: number
-    @Prop({ type: Boolean, required: false, default: false }) declare readonly hasSpinner: number
-    @Prop({ type: Number, required: false, default: 1 }) declare readonly spinnerFactor: number
-    @Prop({ type: Number, required: true, default: 0 }) declare readonly min: number
-    @Prop({ type: Number, default: null }) declare readonly max: number | null
-    @Prop({ type: Number, required: true, default: 0 }) declare readonly dec: number
-    @Prop({ type: Number, required: true, default: 0 }) declare readonly target: number
-    @Prop({ type: Number, required: true, default: 0 }) declare readonly defaultValue: number
-    @Prop({ type: String, required: true }) declare readonly attributeName: string
-    @Prop({ type: String, required: true }) declare readonly unit: string
-
-    @Watch('target')
-    targetChanged(newVal: number): void {
-        this.value = newVal
-    }
-
-    created(): void {
-        this.value = this.target
-    }
-
-    resetLimit(): void {
-        this.value = this.defaultValue
-
-        this.sendCmd()
-    }
-
-    decrement(): void {
-        this.value =
-            this.value > this.min
-                ? Math.round((this.value - this.step * this.spinnerFactor) * 10 ** this.dec) / 10 ** this.dec
-                : this.min
-        this.sendCmd()
-    }
-
-    increment(): void {
-        this.value =
-            this.value < this.max! || this.max === null
-                ? Math.round((this.value + this.step * this.spinnerFactor) * 10 ** this.dec) / 10 ** this.dec
-                : this.max
-        this.sendCmd()
-    }
-
-    @Debounce(500)
-    sendCmd(): void {
-        const gcode =
-            'SET_VELOCITY_LIMIT ' + this.attributeName + '=' + Math.max(this.min, this.value).toFixed(this.dec)
-        this.$store.dispatch('server/addEvent', { message: gcode, type: 'command' })
-        this.$socket.emit('printer.gcode.script', { script: gcode })
-    }
-}
-</script>
diff --git a/src/components/inputs/NumberInput.vue b/src/components/inputs/NumberInput.vue
index 3119b5d8b..5dfd910e8 100644
--- a/src/components/inputs/NumberInput.vue
+++ b/src/components/inputs/NumberInput.vue
@@ -77,20 +77,20 @@ export default class NumberInput extends Mixins(BaseMixin) {
     declare readonly param: string
 
     // props defining incoming data
-    @Prop({ type: Number, required: true, default: 0 })
+    @Prop({ type: Number, required: true })
     declare readonly target: number
 
-    @Prop({ type: Number, required: true, default: 0 })
+    @Prop({ type: Number, required: true })
     declare readonly defaultValue: number
 
     // props for internal processing
-    @Prop({ type: Number, required: true, default: 0 })
+    @Prop({ type: Number, required: true })
     declare readonly min: number
 
     @Prop({ type: Number, default: null })
     declare readonly max: number | null
 
-    @Prop({ type: Number, required: true, default: 0 })
+    @Prop({ type: Number, required: true })
     declare readonly dec: number
 
     @Prop({ type: Number, required: false, default: 1 })
@@ -147,8 +147,7 @@ export default class NumberInput extends Mixins(BaseMixin) {
 
     submit(): void {
         if (this.invalidInput()) return
-        this.$emit('target-changed', this.param, this.value)
-        this.$emit('submit', this.param)
+        this.$emit('submit', { name: this.param, value: this.value })
     }
 
     // input validation //
diff --git a/src/components/inputs/PressureAdvanceSettingsInput.vue b/src/components/inputs/PressureAdvanceSettingsInput.vue
deleted file mode 100644
index ae9ddb727..000000000
--- a/src/components/inputs/PressureAdvanceSettingsInput.vue
+++ /dev/null
@@ -1,117 +0,0 @@
-<style scoped>
-._spin_button_group {
-    width: 24px;
-    margin: -6px -6px 0 -6px;
-}
-</style>
-
-<template>
-    <form @submit.prevent="sendCmd">
-        <v-text-field
-            v-model="value"
-            class="d-flex align-center"
-            :label="label"
-            :suffix="unit"
-            :append-icon="value !== defaultValue ? 'mdi-restart' : ''"
-            :error="(error = value < min || (value > max && max !== null))"
-            :step="step"
-            :min="min"
-            :max="max"
-            :dec="dec"
-            type="number"
-            @click:append="resetLimit"
-            hide-spin-buttons
-            @blur="value = target"
-            hide-details
-            outlined
-            dense>
-            <template v-if="hasSpinner" #append-outer>
-                <div class="_spin_button_group">
-                    <v-btn
-                        :disabled="(value >= max && max !== null) || error"
-                        class="mt-n3"
-                        icon
-                        plain
-                        small
-                        @click="increment">
-                        <v-icon>mdi-chevron-up</v-icon>
-                    </v-btn>
-                    <v-btn :disabled="value <= min || error" class="mb-n3" icon plain small @click="decrement">
-                        <v-icon>mdi-chevron-down</v-icon>
-                    </v-btn>
-                </div>
-            </template>
-        </v-text-field>
-    </form>
-</template>
-
-<script lang="ts">
-import Component from 'vue-class-component'
-import { Mixins, Prop, Watch } from 'vue-property-decorator'
-import { Debounce } from 'vue-debounce-decorator'
-import BaseMixin from '@/components/mixins/base'
-
-@Component
-export default class PressureAdvanceSettingsInput extends Mixins(BaseMixin) {
-    private value: number = 0
-    private error: boolean | undefined
-
-    @Prop({ type: String, required: true }) declare readonly label: string
-    @Prop({ type: Number, required: false, default: 1 }) declare readonly step: number
-    @Prop({ type: Boolean, required: false, default: false }) declare readonly hasSpinner: number
-    @Prop({ type: Number, required: false, default: 1 }) declare readonly spinnerFactor: number
-    @Prop({ type: Number, required: true, default: 0 }) declare readonly min: number
-    @Prop({ type: Number, default: null }) declare readonly max: number | null
-    @Prop({ type: Number, required: true, default: 0 }) declare readonly dec: number
-    @Prop({ type: Number, required: true, default: 0 }) declare readonly target: number
-    @Prop({ type: Number, required: true, default: 0 }) declare readonly defaultValue: number
-    @Prop({ type: String, required: true, default: 'extruder' }) declare readonly extruder: string
-    @Prop({ type: String, required: true }) declare readonly attributeName: string
-    @Prop({ type: String, required: true }) declare readonly unit: string
-
-    @Watch('target')
-    targetChanged(newVal: number): void {
-        this.value = newVal
-    }
-
-    created(): void {
-        this.value = this.target
-    }
-
-    resetLimit(): void {
-        this.value = this.defaultValue
-
-        this.sendCmd()
-    }
-
-    decrement(): void {
-        this.value =
-            this.value > this.min
-                ? Math.round((this.value - this.step * this.spinnerFactor) * 10 ** this.dec) / 10 ** this.dec
-                : this.min
-        this.sendCmd()
-    }
-
-    increment(): void {
-        this.value =
-            this.value < this.max! || this.max === null
-                ? Math.round((this.value + this.step * this.spinnerFactor) * 10 ** this.dec) / 10 ** this.dec
-                : this.max
-        this.sendCmd()
-    }
-
-    @Debounce(500)
-    sendCmd(): void {
-        const gcode =
-            'SET_PRESSURE_ADVANCE ' +
-            'EXTRUDER=' +
-            this.extruder +
-            ' ' +
-            this.attributeName +
-            '=' +
-            Math.max(this.min, this.value).toFixed(this.dec)
-        this.$store.dispatch('server/addEvent', { message: gcode, type: 'command' })
-        this.$socket.emit('printer.gcode.script', { script: gcode })
-    }
-}
-</script>
diff --git a/src/components/panels/MachineSettings/FirmwareRetractionSettings.vue b/src/components/panels/MachineSettings/FirmwareRetractionSettings.vue
index fd0acb0a5..5794271c0 100644
--- a/src/components/panels/MachineSettings/FirmwareRetractionSettings.vue
+++ b/src/components/panels/MachineSettings/FirmwareRetractionSettings.vue
@@ -2,10 +2,12 @@
     <v-card-text>
         <v-row>
             <v-col class="col-12 col-md-6">
-                <firmware-retraction-settings-input
+                <number-input
                     :label="$t('Panels.MachineSettingsPanel.FirmwareRetractionSettings.RetractLength').toString()"
-                    :target="current_retract_length"
-                    :default-value="config_retract_length"
+                    param="RETRACT_LENGTH"
+                    :target="retractLength"
+                    :default-value="defaultRetractLength"
+                    :output-error-msg="true"
                     :has-spinner="true"
                     :spinner-factor="10"
                     :step="0.01"
@@ -13,13 +15,15 @@
                     :max="null"
                     :dec="2"
                     unit="mm"
-                    attribute-name="RETRACT_LENGTH"></firmware-retraction-settings-input>
+                    @submit="sendCmd"></number-input>
             </v-col>
             <v-col class="col-12 col-md-6">
-                <firmware-retraction-settings-input
+                <number-input
                     :label="$t('Panels.MachineSettingsPanel.FirmwareRetractionSettings.RetractSpeed').toString()"
-                    :target="current_retract_speed"
-                    :default-value="config_retract_speed"
+                    param="RETRACT_SPEED"
+                    :target="retractSpeed"
+                    :default-value="defaultRetractSpeed"
+                    :output-error-msg="true"
                     :has-spinner="true"
                     :spinner-factor="5"
                     :step="1"
@@ -27,17 +31,19 @@
                     :max="null"
                     :dec="0"
                     unit="mm/s"
-                    attribute-name="RETRACT_SPEED"></firmware-retraction-settings-input>
+                    @submit="sendCmd"></number-input>
             </v-col>
         </v-row>
         <v-row>
             <v-col class="col-12 col-md-6">
-                <firmware-retraction-settings-input
+                <number-input
                     :label="
                         $t('Panels.MachineSettingsPanel.FirmwareRetractionSettings.UnretractExtraLength').toString()
                     "
-                    :target="current_unretract_extra_length"
-                    :default-value="config_unretract_extra_length"
+                    param="UNRETRACT_EXTRA_LENGTH"
+                    :target="unretractExtraLength"
+                    :default-value="defaultUnretractExtraLength"
+                    :output-error-msg="true"
                     :has-spinner="true"
                     :spinner-factor="10"
                     :step="0.01"
@@ -45,13 +51,15 @@
                     :max="null"
                     :dec="2"
                     unit="mm"
-                    attribute-name="UNRETRACT_EXTRA_LENGTH"></firmware-retraction-settings-input>
+                    @submit="sendCmd"></number-input>
             </v-col>
             <v-col class="col-12 col-md-6">
-                <firmware-retraction-settings-input
+                <number-input
                     :label="$t('Panels.MachineSettingsPanel.FirmwareRetractionSettings.UnretractSpeed').toString()"
-                    :target="current_unretract_speed"
-                    :default-value="config_unretract_speed"
+                    param="UNRETRACT_SPEED"
+                    :target="unretractSpeed"
+                    :default-value="defaultUnretractSpeed"
+                    :output-error-msg="true"
                     :has-spinner="true"
                     :spinner-factor="5"
                     :step="1"
@@ -59,7 +67,7 @@
                     :max="null"
                     :dec="0"
                     unit="mm/s"
-                    attribute-name="UNRETRACT_SPEED"></firmware-retraction-settings-input>
+                    @submit="sendCmd"></number-input>
             </v-col>
         </v-row>
     </v-card-text>
@@ -67,31 +75,32 @@
 
 <script lang="ts">
 import { Component, Mixins } from 'vue-property-decorator'
+import { Debounce } from 'vue-debounce-decorator'
 import BaseMixin from '@/components/mixins/base'
 import Panel from '@/components/ui/Panel.vue'
-import FirmwareRetractionSettingsInput from '@/components/inputs/FirmwareRetractionSettingsInput.vue'
+import NumberInput from '@/components/inputs/NumberInput.vue'
 
 @Component({
-    components: { Panel, FirmwareRetractionSettingsInput },
+    components: { Panel, NumberInput },
 })
 export default class FirmwareRetractionSettings extends Mixins(BaseMixin) {
-    get current_retract_length(): number {
+    get retractLength(): number {
         return Math.floor((this.$store.state.printer?.firmware_retraction?.retract_length ?? 0) * 100) / 100
     }
 
-    get current_retract_speed(): number {
+    get retractSpeed(): number {
         return Math.trunc(this.$store.state.printer?.firmware_retraction?.retract_speed ?? 20)
     }
 
-    get current_unretract_extra_length(): number {
+    get unretractExtraLength(): number {
         return Math.floor((this.$store.state.printer?.firmware_retraction?.unretract_extra_length ?? 0) * 100) / 100
     }
 
-    get current_unretract_speed(): number {
+    get unretractSpeed(): number {
         return Math.trunc(this.$store.state.printer?.firmware_retraction?.unretract_speed ?? 10)
     }
 
-    get config_retract_length(): number {
+    get defaultRetractLength(): number {
         return (
             Math.floor(
                 (this.$store.state.printer?.configfile?.settings?.firmware_retraction?.retract_length ?? 0) * 100
@@ -99,11 +108,11 @@ export default class FirmwareRetractionSettings extends Mixins(BaseMixin) {
         )
     }
 
-    get config_retract_speed(): number {
+    get defaultRetractSpeed(): number {
         return Math.trunc(this.$store.state.printer?.configfile?.settings?.firmware_retraction?.retract_speed ?? 20)
     }
 
-    get config_unretract_extra_length(): number {
+    get defaultUnretractExtraLength(): number {
         return (
             Math.floor(
                 (this.$store.state.printer?.configfile?.settings?.firmware_retraction?.unretract_extra_length ?? 0) *
@@ -112,8 +121,16 @@ export default class FirmwareRetractionSettings extends Mixins(BaseMixin) {
         )
     }
 
-    get config_unretract_speed(): number {
+    get defaultUnretractSpeed(): number {
         return Math.trunc(this.$store.state.printer?.configfile?.settings?.firmware_retraction?.unretract_speed ?? 0)
     }
+
+    @Debounce(500)
+    sendCmd(params: { name: string; value: number }): void {
+        const gcode = `SET_RETRACTION ${params.name}=${params.value}`
+
+        this.$store.dispatch('server/addEvent', { message: gcode, type: 'command' })
+        this.$socket.emit('printer.gcode.script', { script: gcode })
+    }
 }
 </script>
diff --git a/src/components/panels/MachineSettings/MotionSettings.vue b/src/components/panels/MachineSettings/MotionSettings.vue
index aa6616196..1e4525606 100644
--- a/src/components/panels/MachineSettings/MotionSettings.vue
+++ b/src/components/panels/MachineSettings/MotionSettings.vue
@@ -2,10 +2,12 @@
     <v-card-text>
         <v-row>
             <v-col class="col-12 col-md-6">
-                <motion-settings-input
+                <number-input
                     :label="$t('Panels.MachineSettingsPanel.MotionSettings.Velocity').toString()"
-                    :target="current_velocity"
-                    :default-value="max_velocity"
+                    param="VELOCITY"
+                    :target="velocity"
+                    :default-value="defaultVelocity"
+                    :output-error-msg="true"
                     :has-spinner="true"
                     :spinner-factor="5"
                     :step="1"
@@ -13,28 +15,32 @@
                     :max="null"
                     :dec="0"
                     unit="mm/s"
-                    attribute-name="VELOCITY"></motion-settings-input>
+                    @submit="sendCmd"></number-input>
             </v-col>
             <v-col class="col-12 col-md-6">
-                <motion-settings-input
+                <number-input
                     :label="$t('Panels.MachineSettingsPanel.MotionSettings.SquareCornerVelocity').toString()"
-                    :target="current_square_corner_velocity"
-                    :default-value="max_square_corner_velocity"
+                    param="SQUARE_CORNER_VELOCITY"
+                    :target="squareCornerVelocity"
+                    :default-value="defaultSquareCornerVelocity"
+                    :output-error-msg="true"
                     :has-spinner="true"
                     :step="0.1"
                     :min="0.1"
                     :max="null"
                     :dec="1"
                     unit="mm/s"
-                    attribute-name="SQUARE_CORNER_VELOCITY"></motion-settings-input>
+                    @submit="sendCmd"></number-input>
             </v-col>
         </v-row>
         <v-row>
             <v-col class="col-12 col-md-6">
-                <motion-settings-input
+                <number-input
                     :label="$t('Panels.MachineSettingsPanel.MotionSettings.Acceleration').toString()"
-                    :target="current_accel"
-                    :default-value="max_accel"
+                    param="ACCEL"
+                    :target="accel"
+                    :default-value="defaultAccel"
+                    :output-error-msg="true"
                     :has-spinner="true"
                     :spinner-factor="100"
                     :step="1"
@@ -42,13 +48,15 @@
                     :max="null"
                     :dec="0"
                     unit="mm/s²"
-                    attribute-name="ACCEL"></motion-settings-input>
+                    @submit="sendCmd"></number-input>
             </v-col>
             <v-col class="col-12 col-md-6">
-                <motion-settings-input
+                <number-input
                     :label="$t('Panels.MachineSettingsPanel.MotionSettings.MaxAccelToDecel').toString()"
-                    :target="current_accel_to_decel"
-                    :default-value="max_accel_to_decel"
+                    param="ACCEL_TO_DECEL"
+                    :target="accelToDecel"
+                    :default-value="defaultAccelToDecel"
+                    :output-error-msg="true"
                     :has-spinner="true"
                     :spinner-factor="100"
                     :step="1"
@@ -56,7 +64,7 @@
                     :max="null"
                     :dec="0"
                     unit="mm/s²"
-                    attribute-name="ACCEL_TO_DECEL"></motion-settings-input>
+                    @submit="sendCmd"></number-input>
             </v-col>
         </v-row>
     </v-card-text>
@@ -64,47 +72,56 @@
 
 <script lang="ts">
 import { Component, Mixins } from 'vue-property-decorator'
+import { Debounce } from 'vue-debounce-decorator'
 import BaseMixin from '@/components/mixins/base'
 import Panel from '@/components/ui/Panel.vue'
-import MotionSettingsInput from '@/components/inputs/MotionSettingsInput.vue'
+import NumberInput from '@/components/inputs/NumberInput.vue'
 
 @Component({
-    components: { Panel, MotionSettingsInput },
+    components: { Panel, NumberInput },
 })
 export default class MotionSettings extends Mixins(BaseMixin) {
-    get current_velocity(): number {
+    get velocity(): number {
         return Math.trunc(this.$store.state.printer?.toolhead?.max_velocity ?? 300)
     }
 
-    get current_accel(): number {
+    get accel(): number {
         return Math.trunc(this.$store.state.printer?.toolhead?.max_accel ?? 3000)
     }
 
-    get current_accel_to_decel(): number {
-        return Math.trunc(this.$store.state.printer?.toolhead?.max_accel_to_decel ?? 1500)
+    get accelToDecel(): number {
+        return Math.trunc(this.$store.state.printer?.toolhead?.max_accel_to_decel ?? this.accel / 2)
     }
 
-    get current_square_corner_velocity(): number {
+    get squareCornerVelocity(): number {
         return Math.floor((this.$store.state.printer?.toolhead?.square_corner_velocity ?? 8) * 10) / 10
     }
 
-    get max_velocity(): number {
+    get defaultVelocity(): number {
         return Math.trunc(this.$store.state.printer?.configfile?.settings?.printer?.max_velocity ?? 300)
     }
 
-    get max_accel(): number {
+    get defaultAccel(): number {
         return Math.trunc(this.$store.state.printer?.configfile?.settings?.printer?.max_accel ?? 3000)
     }
 
-    get max_accel_to_decel(): number {
+    get defaultAccelToDecel(): number {
         return Math.trunc(this.$store.state.printer?.configfile?.settings?.printer?.max_accel_to_decel ?? 1500)
     }
 
-    get max_square_corner_velocity(): number {
+    get defaultSquareCornerVelocity(): number {
         return (
             Math.floor((this.$store.state.printer?.configfile?.settings?.printer?.square_corner_velocity ?? 8) * 10) /
             10
         )
     }
+
+    @Debounce(500)
+    sendCmd(params: { name: string; value: number }): void {
+        const gcode = `SET_VELOCITY_LIMIT ${params.name}=${params.value}`
+
+        this.$store.dispatch('server/addEvent', { message: gcode, type: 'command' })
+        this.$socket.emit('printer.gcode.script', { script: gcode })
+    }
 }
 </script>
diff --git a/src/components/panels/MachineSettings/PressureAdvanceSettings.vue b/src/components/panels/MachineSettings/PressureAdvanceSettings.vue
index f6aa7f92d..81e9c5e66 100644
--- a/src/components/panels/MachineSettings/PressureAdvanceSettings.vue
+++ b/src/components/panels/MachineSettings/PressureAdvanceSettings.vue
@@ -1,54 +1,58 @@
 <template>
     <v-card-text>
         <v-row>
-            <v-col v-if="all_extruders.length > 1" class="col-12 col-xl-4">
+            <v-col v-if="allExtruders.length > 1" class="col-12 col-xl-4">
                 <div class="d-flex align-center">
                     <v-btn
-                        v-if="selectedExtruder !== active_extruder"
-                        class="mr-2"
+                        v-if="selectedExtruder !== activeExtruder"
                         icon
                         plain
+                        class="mr-2"
                         @click="resetToActiveExtruder">
                         <v-icon>mdi-restart</v-icon>
                     </v-btn>
                     <v-select
                         v-model="selectedExtruder"
                         :label="$t('Panels.MachineSettingsPanel.PressureAdvanceSettings.Extruder').toString()"
-                        :items="all_extruders"
-                        :value="active_extruder"
+                        :items="allExtruders"
+                        :value="activeExtruder"
                         hide-details
                         outlined
                         dense></v-select>
                 </div>
             </v-col>
-            <v-col :class="all_extruders.length > 1 ? 'col-12 col-md-6 col-xl-4' : 'col-12 col-md-6'">
-                <pressure-advance-settings-input
+            <v-col :class="allExtruders.length > 1 ? 'col-12 col-md-6 col-xl-4' : 'col-12 col-md-6'">
+                <number-input
                     :label="$t('Panels.MachineSettingsPanel.PressureAdvanceSettings.Advance').toString()"
-                    :target="current_pressure_advance"
-                    :default-value="default_pressure_advance"
+                    param="ADVANCE"
+                    :target="pressureAdvance"
+                    :default-value="defaultPressureAdvance"
                     :extruder="selectedExtruder"
+                    :output-error-msg="true"
                     :has-spinner="true"
                     :min="0"
                     :max="null"
                     :step="0.001"
                     :dec="3"
                     unit="mm/s"
-                    attribute-name="ADVANCE"></pressure-advance-settings-input>
+                    @submit="sendCmd"></number-input>
             </v-col>
-            <v-col :class="all_extruders.length > 1 ? 'col-12 col-md-6 col-xl-4' : 'col-12 col-md-6'">
-                <pressure-advance-settings-input
+            <v-col :class="allExtruders.length > 1 ? 'col-12 col-md-6 col-xl-4' : 'col-12 col-md-6'">
+                <number-input
                     :label="$t('Panels.MachineSettingsPanel.PressureAdvanceSettings.SmoothTime').toString()"
-                    :target="current_smooth_time"
-                    :default-value="default_smooth_time"
+                    param="SMOOTH_TIME"
+                    :target="smoothTime"
+                    :default-value="defaultSmoothTime"
                     :extruder="selectedExtruder"
+                    :output-error-msg="true"
                     :has-spinner="true"
+                    :spinner-factor="10"
                     :min="0"
                     :max="0.2"
                     :step="0.001"
-                    :spinner-factor="10"
                     :dec="3"
                     unit="s"
-                    attribute-name="SMOOTH_TIME"></pressure-advance-settings-input>
+                    @submit="sendCmd"></number-input>
             </v-col>
         </v-row>
     </v-card-text>
@@ -58,10 +62,11 @@
 import { Component, Mixins } from 'vue-property-decorator'
 import BaseMixin from '@/components/mixins/base'
 import Panel from '@/components/ui/Panel.vue'
-import PressureAdvanceSettingsInput from '@/components/inputs/PressureAdvanceSettingsInput.vue'
+import NumberInput from '@/components/inputs/NumberInput.vue'
+import { Debounce } from 'vue-debounce-decorator'
 
 @Component({
-    components: { Panel, PressureAdvanceSettingsInput },
+    components: { Panel, NumberInput },
 })
 export default class PressureAdvanceSettings extends Mixins(BaseMixin) {
     private extruders: string[] = []
@@ -71,7 +76,7 @@ export default class PressureAdvanceSettings extends Mixins(BaseMixin) {
         this.selectedExtruder = this.$store.state.printer.toolhead?.extruder
     }
 
-    get all_extruders(): string[] {
+    get allExtruders(): string[] {
         Object.keys(this.$store.state.printer).forEach((e) => {
             if (e.startsWith('extruder') && !this.extruders.includes(e)) this.extruders.push(e)
         })
@@ -80,20 +85,20 @@ export default class PressureAdvanceSettings extends Mixins(BaseMixin) {
         return this.extruders
     }
 
-    get active_extruder(): string {
+    get activeExtruder(): string {
         this.resetToActiveExtruder()
         return this.$store.state.printer.toolhead?.extruder
     }
 
-    get current_pressure_advance(): number {
+    get pressureAdvance(): number {
         return Math.floor((this.$store.state.printer?.[this.selectedExtruder]?.pressure_advance ?? 0) * 1000) / 1000
     }
 
-    get current_smooth_time(): number {
+    get smoothTime(): number {
         return Math.floor((this.$store.state.printer?.[this.selectedExtruder]?.smooth_time ?? 0.04) * 1000) / 1000
     }
 
-    get default_pressure_advance(): number {
+    get defaultPressureAdvance(): number {
         return (
             Math.floor(
                 (this.$store.state.printer.configfile?.settings?.[this.selectedExtruder]?.pressure_advance ?? 0) * 1000
@@ -101,7 +106,7 @@ export default class PressureAdvanceSettings extends Mixins(BaseMixin) {
         )
     }
 
-    get default_smooth_time(): number {
+    get defaultSmoothTime(): number {
         return (
             Math.floor(
                 (this.$store.state.printer.configfile?.settings?.[this.selectedExtruder]
@@ -109,5 +114,13 @@ export default class PressureAdvanceSettings extends Mixins(BaseMixin) {
             ) / 1000
         )
     }
+
+    @Debounce(500)
+    sendCmd(params: { name: string; value: number }): void {
+        const gcode = `SET_PRESSURE_ADVANCE EXTRUDER=${this.selectedExtruder} ${params.name}=${params.value}`
+
+        this.$store.dispatch('server/addEvent', { message: gcode, type: 'command' })
+        this.$socket.emit('printer.gcode.script', { script: gcode })
+    }
 }
 </script>