diff --git a/src/BtnCmdColPickDialogue.vue b/src/BtnCmdColPickDialogue.vue
index 4cef3e8..5bcd54b 100644
--- a/src/BtnCmdColPickDialogue.vue
+++ b/src/BtnCmdColPickDialogue.vue
@@ -72,6 +72,9 @@
                 if(this.colField == "ChartLineColor"){
                     this.passedObject.OMColor = this.currColor;
                 }
+                if(this.colField == "inputIconAboveColor"){
+                    this.passedObject.inputIconAboveColor = this.currColor;
+                }
                 this.$emit('exit', true);
                 this.show = false;
                 return;
@@ -90,6 +93,9 @@
             if(this.colField == "ChartLineColor"){
                 this.currColor = this.passedObject.OMColor;
             }
+            if(this.colField == "inputIconAboveColor"){
+                this.currColor = this.passedObject.inputIconAboveColor;
+            }
         }
     }
 </script>
\ No newline at end of file
diff --git a/src/BtnCmdDataFunctions.js b/src/BtnCmdDataFunctions.js
index d60af87..9fc8d31 100644
--- a/src/BtnCmdDataFunctions.js
+++ b/src/BtnCmdDataFunctions.js
@@ -151,6 +151,10 @@ export default {
 						inputControlVals: [],
 						inputControlRange:[],
 						inputControlSteps: 1,
+						inputIconAbove: '',
+						inputIconAboveSize: 25,
+						inputIconAboveColor: 'normal',
+						inputIconAboveColor: '',
 						bPanelActivated: false,
 						chartLabel: 'Custom Chart',
 						chartOMDataArr: [],
diff --git a/src/BtnCmdMMPanel.vue b/src/BtnCmdMMPanel.vue
index d8b4d21..d080778 100644
--- a/src/BtnCmdMMPanel.vue
+++ b/src/BtnCmdMMPanel.vue
@@ -1,59 +1,79 @@
 <template>
 	<div>
-	<v-card v-if="passedObject.panelMMPrefix.length > 0" :key="'mmVal' + passedObject.panelMMPrefix + passedObject.panelID + passedObject.panelHSize + passedObject.panelWSize" :flat="passedObject.borderless" :height="passedObject.panelHSize" :width="passedObject.panelWSize" :color="passedObject.panelColor" style="height: 100%; width: 100%">
+	<v-card v-if="passedObject.panelMMPrefix" :key="'mmVal' + passedObject.panelMMPrefix + passedObject.panelID + passedObject.panelHSize + passedObject.panelWSize" :flat="passedObject.borderless" :height="passedObject.panelHSize" :width="passedObject.panelWSize" :color="passedObject.panelColor" style="height: 100%; width: 100%">
 		<v-row align="center" style="height: 100%; width: 100%" class="pa-0 ma-0">
-		<v-card-text v-if="passedObject.panelMMOrientation == 'V'" class="text-center pa-0 ma-0" align="center">
-			<v-row dense>
-				<v-col class="d-flex flex-column pa-0 ma-0">
-					<strong :style="'color: ' + passedObject.panelMMPrefixColor" :class="`text-${passedObject.panelMMTextSize}`">
-						{{ passedObject.panelMMPrefix }}
-					</strong>
-				</v-col>
-			</v-row>
-			<v-row v-if="passedObject.panelType == 'mmValue'" dense>
-				<v-col class="d-flex flex-column pa-0 ma-0">
-					<span :style="'color: ' + passedObject.panelMMValueColor" :class="`text-${passedObject.panelMMTextSize}`">
-						{{ matchedMMVal }}
-					</span>
-				</v-col>
-			</v-row>
-		</v-card-text>
-		<v-card-text v-else class="text-center pa-0 ma-0">
-			<v-row dense justify="center" align="center">
-				<v-col class="d-flex flex-column pa-0 ma-0" justify="center" align="center">
-					<strong :style="'color: ' + passedObject.panelMMPrefixColor" :class="`text-${passedObject.panelMMTextSize}`" justify="center" align="center">
-						{{ passedObject.panelMMPrefix }}
-					</strong>
-				</v-col>
-				<v-col v-if="passedObject.panelType == 'mmValue'" class="d-flex flex-column pa-0 ma-0">
-					<span :style="'color: ' + passedObject.panelMMValueColor" :class="`text-${passedObject.panelMMTextSize}`">
-						{{ matchedMMVal }}
-					</span>
-				</v-col>
-			</v-row>
-		</v-card-text>
+			<v-card-text v-if="passedObject.panelMMOrientation == 'V'" class="text-center pa-0 ma-0" align="center">
+				<v-row v-if="passedObject.inputIconAbove" justify="center" align="center" class="d-flex pa-0 ma-0">
+					<v-col cols="12" justify="center">
+						<v-layout column align-center><span justify="center"><v-icon :size="passedObject.inputIconAboveSize" :color="passedObject.inputIconAboveColor">{{ passedObject.inputIconAbove }}</v-icon></span></v-layout>
+					</v-col>
+				</v-row>
+				<v-row dense>
+					<v-col class="d-flex flex-column pa-0 ma-0">
+						<strong :style="'color: ' + passedObject.panelMMPrefixColor" :class="`text-${passedObject.panelMMTextSize}`">
+							{{ passedObject.panelMMPrefix }}
+						</strong>
+					</v-col>
+				</v-row>
+				<v-row v-if="passedObject.panelType == 'mmValue'" dense>
+					<v-col class="d-flex flex-column pa-0 ma-0">
+						<span :style="'color: ' + passedObject.panelMMValueColor" :class="`text-${passedObject.panelMMTextSize}`">
+							{{ matchedMMVal }}
+						</span>
+					</v-col>
+				</v-row>
+			</v-card-text>
+			<v-card-text v-else class="text-center pa-0 ma-0">
+				<v-row v-if="passedObject.inputIconAbove" justify="center" align="center" class="d-flex pa-0 ma-0">
+					<v-col cols="12" justify="center">
+						<v-layout column align-center><span justify="center"><v-icon :size="passedObject.inputIconAboveSize" :color="passedObject.inputIconAboveColor">{{ passedObject.inputIconAbove }}</v-icon></span></v-layout>
+					</v-col>
+				</v-row>
+				<v-row dense justify="center" align="center">
+					<v-col class="d-flex flex-column pa-0 ma-0" justify="center" align="center">
+						<strong :style="'color: ' + passedObject.panelMMPrefixColor" :class="`text-${passedObject.panelMMTextSize}`" justify="center" align="center">
+							{{ passedObject.panelMMPrefix }}
+						</strong>
+					</v-col>
+					<v-col v-if="passedObject.panelType == 'mmValue'" class="d-flex flex-column pa-0 ma-0">
+						<span :style="'color: ' + passedObject.panelMMValueColor" :class="`text-${passedObject.panelMMTextSize}`">
+							{{ matchedMMVal }}
+						</span>
+					</v-col>
+				</v-row>
+			</v-card-text>
 		</v-row>
 	</v-card>
-	<v-card v-if="passedObject.panelMMPrefix.length == 0" :key="'mmVal' + passedObject.panelMMPrefix + passedObject.panelID + passedObject.panelHSize + passedObject.panelWSize" :flat="passedObject.borderless" :height="passedObject.panelHSize" :width="passedObject.panelWSize" :color="passedObject.panelColor" style="height: 100%; width: 100%">
+	<v-card v-else :key="'mmVal' + passedObject.panelMMPrefix + passedObject.panelID + passedObject.panelHSize + passedObject.panelWSize" :flat="passedObject.borderless" :height="passedObject.panelHSize" :width="passedObject.panelWSize" :color="passedObject.panelColor" style="height: 100%; width: 100%">
 		<v-row align="center" style="height: 100%; width: 100%" class="pa-0 ma-0">
-		<v-card-text v-if="passedObject.panelMMOrientation == 'V'" class="text-center pa-0 ma-0" align="center">
-			<v-row v-if="passedObject.panelType == 'mmValue'" dense>
-				<v-col class="d-flex flex-column pa-0 ma-0">
-					<span :style="'color: ' + passedObject.panelMMValueColor" :class="`text-${passedObject.panelMMTextSize}`">
-						{{ matchedMMVal }}
-					</span>
-				</v-col>
-			</v-row>
-		</v-card-text>
-		<v-card-text v-else class="text-center pa-0 ma-0">
-			<v-row dense>
-				<v-col v-if="passedObject.panelType == 'mmValue'" class="d-flex flex-column pa-0 ma-0">
-					<span :style="'color: ' + passedObject.panelMMValueColor" :class="`text-${passedObject.panelMMTextSize}`">
-						{{ matchedMMVal }}
-					</span>
-				</v-col>
-			</v-row>
-		</v-card-text>
+			<v-card-text v-if="passedObject.panelMMOrientation == 'V'" class="text-center pa-0 ma-0" align="center">
+				<v-row v-if="passedObject.inputIconAbove" justify="center" align="center" class="d-flex pa-0 ma-0">
+					<v-col cols="12" justify="center">
+						<v-layout column align-center><span justify="center"><v-icon :size="passedObject.inputIconAboveSize" :color="passedObject.inputIconAboveColor">{{ passedObject.inputIconAbove }}</v-icon></span></v-layout>
+					</v-col>
+				</v-row>
+				<v-row v-if="passedObject.panelType == 'mmValue'" dense>
+					<v-col class="d-flex flex-column pa-0 ma-0">
+						<span :style="'color: ' + passedObject.panelMMValueColor" :class="`text-${passedObject.panelMMTextSize}`">
+							{{ matchedMMVal }}
+						</span>
+					</v-col>
+				</v-row>
+			</v-card-text>
+			<v-card-text v-else class="text-center pa-0 ma-0">
+				<v-row v-if="passedObject.inputIconAbove" justify="center" align="center" class="d-flex pa-0 ma-0">
+					<v-col cols="12" justify="center">
+						<v-layout column align-center><span justify="center"><v-icon :size="passedObject.inputIconAboveSize" :color="passedObject.inputIconAboveColor">{{ passedObject.inputIconAbove }}</v-icon></span></v-layout>
+					</v-col>
+				</v-row>
+				<v-row dense>
+					<v-col v-if="passedObject.panelType == 'mmValue'" class="d-flex flex-column pa-0 ma-0">
+						<span :style="'color: ' + passedObject.panelMMValueColor" :class="`text-${passedObject.panelMMTextSize}`">
+							{{ matchedMMVal }}
+						</span>
+					</v-col>
+				</v-row>
+			</v-card-text>
 		</v-row>
 	</v-card>
 	</div>		
diff --git a/src/BtnCmdMMPanelDialogue.vue b/src/BtnCmdMMPanelDialogue.vue
index 6343cb2..9132768 100644
--- a/src/BtnCmdMMPanelDialogue.vue
+++ b/src/BtnCmdMMPanelDialogue.vue
@@ -31,6 +31,35 @@
                             </v-tooltip>
                         </v-col>
                     </v-row>
+                    <v-row dense>
+                        <v-col cols="7">
+                            <v-tooltip bottom>
+                                <template v-slot:activator="{ on, attrs }">
+                                    <v-text-field v-bind="attrs" v-on="on" label="Top Icon [mdi-*]" v-model="passedObject.inputIconAbove" placeholder="mdi-"></v-text-field>
+                                </template>
+                                <span>Material design icon name (Format = mdi-[icon name])</span>
+                            </v-tooltip>
+                        </v-col>
+                        <v-col cols="1">
+                            <v-tooltip bottom>
+                                <template v-slot:activator="{ on, attrs }">
+                                    <a v-bind="attrs" v-on="on" href="https://pictogrammers.com/library/mdi/" target="_blank">
+                                        <v-icon v-if="passedObject.inputIconAbove" class="mr-1 pt-3">{{ passedObject.inputIconAbove }}</v-icon>
+                                        <v-icon v-else class="mr-1 pt-3">mdi-cog</v-icon>
+                                    </a>
+                                </template>
+                                <span>Click to open Material Design Icons web page</span>
+                            </v-tooltip>
+                        </v-col>
+                        <v-col cols="4">
+                            <v-tooltip bottom>
+                                <template v-slot:activator="{ on, attrs }">
+                                    <v-text-field v-bind="attrs" v-on="on" label="Icon Size" v-model="passedObject.inputIconAboveSize" placeholder="25" number></v-text-field>
+                                </template>
+                                <span>Size (num [def=25])</span>
+                            </v-tooltip>
+                        </v-col>
+                    </v-row>
                     <v-row dense v-if="passedObject.panelType == 'mmValue'" >
                         <v-col cols="11">
                             <v-tooltip bottom>
@@ -117,6 +146,22 @@
                             </v-tooltip>
                         </v-col>
                     </v-row>
+                    <v-row v-if="passedObject.inputIconAbove">
+                        <v-col>
+                            <v-row dense><v-col><span style="font-weight: bold">Icon Colour</span></v-col></v-row>
+                        </v-col>
+                        <v-col>
+                            <v-tooltip bottom>
+                                <template v-slot:activator="{ on, attrs }">
+                                    <v-row dense>
+                                        <v-col align-self="center"><v-icon @click="setColor('inputIconAboveColor')" v-on="on" :color="passedObject.inputIconAboveColor">{{ passedObject.inputIconAbove }}</v-icon></v-col>
+                                        <v-col cols="3" align-self="center"><div align="center" style="cursor:pointer"><v-btn x-small @click="passedObject.inputIconAboveColor = ''">Reset</v-btn></div></v-col>
+                                    </v-row>
+                                </template>
+                                <span>Click to edit icon colour</span>
+                            </v-tooltip>
+                        </v-col>
+                    </v-row>
                     <v-row>
                         <v-col cols="12">
                             <v-tooltip bottom>
@@ -207,7 +252,7 @@
                         this.alertReqVal = false;
                     }
                 }else if (this.passedObject.panelType != 'mmValue'){
-                    if(this.passedObject.panelMMPrefix) {
+                    if(this.passedObject.panelMMPrefix || this.passedObject.inputIconAbove) {
                         //req fields met so exit
                         this.passedObject.panelMMPath = this.tmpModelPath;
                         this.$emit('exit', true);
diff --git a/src/BtnCmdMainPanel.vue b/src/BtnCmdMainPanel.vue
index 74ed46a..c04847f 100644
--- a/src/BtnCmdMainPanel.vue
+++ b/src/BtnCmdMainPanel.vue
@@ -421,7 +421,7 @@
 						<a href="https://www.npmjs.com/package/vuedraggable" target="_blank">vuedraggable</a><br>
 						Plus re-uses components and code from <strong>DWC</strong>.<br>
 						<a href="https://github.com/MintyTrebor/BtnCmd/wiki" target="_blank">BtnCmd Wiki</a><br>
-						<a href="https://materialdesignicons.com/" target="_blank">Material Design Icon Library</a><br>
+						<a href="https://pictogrammers.com/library/mdi/" target="_blank">Material Design Icon Library</a><br>
 					</v-alert>
 				</v-row>
 				<BtnCmdSettingsDialogue v-if="showEdit" v-model="showEdit" :passedObject="objectToPass" :bMQTT="btnCmd.globalSettings.enableMQTT" :enableSBCC="btnCmd.globalSettings.enableSBCC" :SBCCCombinedJson="tmpSBCCSet"></BtnCmdSettingsDialogue>
@@ -970,9 +970,9 @@ export default {
 			bSBCCInstalled: false,
 			showSBCCEdit: false,
 			tmpSBCCDef: {},
-			btnCmdVersion: '01.02.06',
+			btnCmdVersion: '01.02.07',
 			btnCmd : {
-				btnCmdVersion: '01.02.06',
+				btnCmdVersion: '01.02.07',
 				btnCmdIDUpdateRun: true,
 				systemSettings: {
 					lastID: 1,
@@ -1114,6 +1114,9 @@ export default {
 						inputControlVals: [],
 						inputControlRange:[],
 						inputControlSteps: 1,
+						inputIconAbove: '',
+						inputIconAboveSize: 25,
+						inputIconAboveColor: '',
 						bPanelActivated: false,
 						chartLabel: 'Custom Chart',
 						chartOMDataArr: [],
diff --git a/src/BtnCmdPanelSettingsDialogue.vue b/src/BtnCmdPanelSettingsDialogue.vue
index 9b8aa04..b7d964d 100644
--- a/src/BtnCmdPanelSettingsDialogue.vue
+++ b/src/BtnCmdPanelSettingsDialogue.vue
@@ -12,7 +12,7 @@
             </v-row> -->
             <v-card-title>
 				<v-toolbar dark dense>
-                    <v-toolbar-title>Edit Panel {{isCNCMode}}</v-toolbar-title>
+                    <v-toolbar-title>Add / Edit Panel Type</v-toolbar-title>
                     <v-spacer></v-spacer>
                     <v-btn color="blue darken-1" text @click="validateData()">
                         <span v-if="passedObject.panelType == 'altwebcam' || passedObject.panelType == 'mmValue' || passedObject.panelType == 'txtLabel' || passedObject.panelType == 'vInput' || passedObject.panelType == 'BtnCmdChart'">Click to Enter Settings</span>
@@ -149,9 +149,9 @@
                 {text: 'Object Model Value', value: 'mmValue', disabled: false, hSize: 100, wSize: 300},
                 {text: 'Remote Source', value: 'remSrc', disabled: false, hSize: 145, wSize: 500},
                 {text: 'Speed', value: 'speed', disabled: false, hSize: 230, wSize: 320},
-                {text: 'Static Text / Label', value: 'txtLabel', disabled: false, hSize: 100, wSize: 300},
                 {text: 'Status Panel', value: 'status-panel', disabled: this.isCNCMode, hSize: 288, wSize: 534},
-                {text: 'Temperature Chart', value: 'temperature-chart', disabled: this.isCNCMode, hSize: 240, wSize: 280}, 
+                {text: 'Temperature Chart', value: 'temperature-chart', disabled: this.isCNCMode, hSize: 240, wSize: 280},
+                {text: 'Text / Icon / Blank', value: 'txtLabel', disabled: false, hSize: 100, wSize: 300}, 
                 {text: 'Tools', value: 'tools-panel', disabled: false, hSize: 235, wSize: 661},
                 {text: 'Custom Panel', value: 'custom', disabled: this.createMode, hSize: 250, wSize: 250},
                 
diff --git a/src/BtnCmdSettingsDialogue.vue b/src/BtnCmdSettingsDialogue.vue
index 41e3acf..b2bd3fa 100644
--- a/src/BtnCmdSettingsDialogue.vue
+++ b/src/BtnCmdSettingsDialogue.vue
@@ -52,12 +52,12 @@
                         <v-col cols="1">
                             <v-tooltip bottom>
                                 <template v-slot:activator="{ on, attrs }">
-                                    <a v-bind="attrs" v-on="on" href="https://materialdesignicons.com/" target="_blank">
+                                    <a v-bind="attrs" v-on="on" href="https://pictogrammers.com/library/mdi/" target="_blank">
                                         <v-icon v-if="passedObject.btnIcon.length>0" class="mr-1 pt-3">{{ passedObject.btnIcon }}</v-icon>
                                         <v-icon v-if="passedObject.btnIcon.length==0" class="mr-1 pt-3">mdi-cog</v-icon>
                                     </a>
                                 </template>
-                                <span>Go To https://materialdesignicons.com</span>
+                                <span>Click to open Material Design Icons web page</span>
                             </v-tooltip>
                         </v-col>
                     </v-row>
diff --git a/src/BtnCmdTabSettingsDialogue.vue b/src/BtnCmdTabSettingsDialogue.vue
index 2ad6d86..46ae219 100644
--- a/src/BtnCmdTabSettingsDialogue.vue
+++ b/src/BtnCmdTabSettingsDialogue.vue
@@ -36,12 +36,12 @@
                         <v-col cols="1">
                             <v-tooltip bottom>
                                 <template v-slot:activator="{ on, attrs }">
-                                    <a v-bind="attrs" v-on="on" href="https://materialdesignicons.com/" target="_blank">
+                                    <a v-bind="attrs" v-on="on" href="https://pictogrammers.com/library/mdi/" target="_blank">
                                         <v-icon v-if="passedObject.icon.length>0" class="mr-1 pt-3">{{ passedObject.icon }}</v-icon>
                                         <v-icon v-if="passedObject.icon.length==0" class="mr-1 pt-3">mdi-cog</v-icon>
                                     </a>
                                 </template>
-                                <span>Go To https://materialdesignicons.com</span>
+                                <span>Click to open Material Design Icons web page</span>
                             </v-tooltip>
                         </v-col>
                     </v-row>
diff --git a/src/BtnCmdVInputDialogue.vue b/src/BtnCmdVInputDialogue.vue
index 55a0ecf..663f438 100644
--- a/src/BtnCmdVInputDialogue.vue
+++ b/src/BtnCmdVInputDialogue.vue
@@ -141,6 +141,35 @@
                                 <v-text-field :label="getSuffixLabel()" v-model="tmpPassedObject.inputSuffixText"></v-text-field>
                             </v-col>
                         </v-row>
+                        <v-row dense>
+                        <v-col cols="7">
+                            <v-tooltip bottom>
+                                <template v-slot:activator="{ on, attrs }">
+                                    <v-text-field v-bind="attrs" v-on="on" label="Top Icon [mdi-*]" v-model="tmpPassedObject.inputIconAbove" placeholder="mdi-"></v-text-field>
+                                </template>
+                                <span>Material design icon name (Format = mdi-[icon name])</span>
+                            </v-tooltip>
+                        </v-col>
+                        <v-col cols="1">
+                            <v-tooltip bottom>
+                                <template v-slot:activator="{ on, attrs }">
+                                    <a v-bind="attrs" v-on="on" href="https://pictogrammers.com/library/mdi/" target="_blank">
+                                        <v-icon v-if="tmpPassedObject.inputIconAbove" class="mr-1 pt-3">{{ tmpPassedObject.inputIconAbove }}</v-icon>
+                                        <v-icon v-else class="mr-1 pt-3">mdi-cog</v-icon>
+                                    </a>
+                                </template>
+                                <span>Click to open Material Design Icons web page</span>
+                            </v-tooltip>
+                        </v-col>
+                        <v-col cols="4">
+                            <v-tooltip bottom>
+                                <template v-slot:activator="{ on, attrs }">
+                                    <v-text-field v-bind="attrs" v-on="on" label="Icon Size" v-model="tmpPassedObject.inputIconAboveSize" placeholder="25" number></v-text-field>
+                                </template>
+                                <span>Size (num [def=25])</span>
+                            </v-tooltip>
+                        </v-col>
+                    </v-row>
                         <v-row dense>
                             <v-col cols="12">
                                 <v-text-field label="Hover Text" v-model="tmpPassedObject.panelHoverText"></v-text-field>
@@ -228,6 +257,22 @@
                                 </v-tooltip>
                             </v-col>
                         </v-row>
+                        <v-row v-if="tmpPassedObject.inputIconAbove">
+                            <v-col>
+                                <v-row dense><v-col><span style="font-weight: bold">Icon Colour</span></v-col></v-row>
+                            </v-col>
+                            <v-col>
+                                <v-tooltip bottom>
+                                    <template v-slot:activator="{ on, attrs }">
+                                        <v-row dense>
+                                            <v-col align-self="center"><v-icon @click="setColor('inputIconAboveColor')" v-on="on" :color="tmpPassedObject.inputIconAboveColor">{{ tmpPassedObject.inputIconAbove }}</v-icon></v-col>
+                                            <v-col cols="3" align-self="center"><div align="center" style="cursor:pointer"><v-btn x-small @click="tmpPassedObject.inputIconAboveColor = ''">Reset</v-btn></div></v-col>
+                                        </v-row>
+                                    </template>
+                                    <span>Click to edit icon colour</span>
+                                </v-tooltip>
+                            </v-col>
+                        </v-row>
                         <v-row>
                             <v-col cols="6">
                                 <v-tooltip bottom>
@@ -292,11 +337,11 @@
             },
             bAddButtonDisabled(){
                 if(this.tmpListItem){
-                    if(this.tmpListItem.length > 0){
+                    //if(this.tmpListItem.length() > 0){
                         if(isNaN(this.tmpListItem) && this.tmpPassedObject.inputType == 'number'){
                             return true;
                         }else{return false}
-                    }else{return true}
+                    //}else{return true}
                 }else{return true}
             },
             bICTType(){
diff --git a/src/BtnCmdVInputPanel.vue b/src/BtnCmdVInputPanel.vue
index 9ca71f9..9190f6a 100644
--- a/src/BtnCmdVInputPanel.vue
+++ b/src/BtnCmdVInputPanel.vue
@@ -10,9 +10,19 @@
 		<v-card :id="`gip-${passedObject.panelID}`" class="pa-1 ma-0" :key="'vInput' + passedObject.inputPrefixText + passedObject.inputSuffixText + passedObject.inputVarName + passedObject.panelID + passedObject.panelHSize + passedObject.panelWSize" :flat="passedObject.borderless" :height="passedObject.panelHSize" :width="passedObject.panelWSize" :color="passedObject.panelColor" style="height: 100%; width: 100%">
 			<v-row align="center" style="height: 98%; width: 98%" class="pa-0 ma-0">
 				<v-card-text class="text-center pa-0 ma-0">
+					<v-row v-if="passedObject.inputIconAbove && passedObject.inputDispType != 'slider' && passedObject.inputType != 'boolean'" justify="center" align="center" class="d-flex pa-0 ma-0">
+						<v-col cols="12" justify="center">
+							<v-layout column align-center><span justify="center"><v-icon :size="passedObject.inputIconAboveSize" :color="passedObject.inputIconAboveColor">{{ passedObject.inputIconAbove }}</v-icon></span></v-layout>
+						</v-col>
+					</v-row>
 					<v-row v-if="passedObject.inputType == 'number' && passedObject.inputDispType == 'slider'" dense justify="center" align="center">
 						<v-col class="d-flex flex-column pa-0 ma-0" justify="center" align="center" cols="10">
-							<v-row v-if="passedObject.panelHoverText.length >= 1" justify="center" align="center">
+							<v-row v-if="passedObject.inputIconAbove" justify="center" align="center" class="d-flex pa-0 ma-0 mt-n16">
+								<v-col cols="12" justify="center">
+									<v-layout column align-center><span justify="center"><v-icon :size="passedObject.inputIconAboveSize" :color="passedObject.inputIconAboveColor">{{ passedObject.inputIconAbove }}</v-icon></span></v-layout>
+								</v-col>
+							</v-row>
+							<v-row v-if="passedObject.panelHoverText" justify="center" align="center">
 								<v-tooltip bottom :style="`position: absolute; z-index:${LZIndex+1}`">
 									<template v-slot:activator="{ on, attrs }">
 										<v-row justify="center" align="center" style="height: 100%;" v-bind="attrs" v-on="on">
@@ -29,7 +39,7 @@
 					</v-row>
 					<v-row v-if="passedObject.inputDispType == 'selection'" dense justify="center" align="center">
 						<v-col class="d-flex flex-column pa-0 ma-0" justify="center" align="center" cols="10">
-							<v-row v-if="passedObject.panelHoverText.length >= 1" justify="center" align="center">
+							<v-row v-if="passedObject.panelHoverText" justify="center" align="center">
 								<v-tooltip bottom :style="`position: absolute; z-index:${LZIndex+1}`">
 									<template v-slot:activator="{ on, attrs }">
 										<v-row justify="center" align="center" style="height: 100%;" v-bind="attrs" v-on="on">
@@ -46,12 +56,12 @@
 					</v-row>
 					<v-row v-if="passedObject.inputType != 'boolean' && passedObject.inputDispType == 'input'" dense justify="center" align="center">
 						<v-col class="d-flex flex-column pa-0 ma-0" justify="center" align="center" cols="10">
-							<v-row dense v-if="passedObject.panelHoverText.length >= 1" justify="center" align="center" style="height: 100%; width: 100%">
+							<v-row dense v-if="passedObject.panelHoverText" justify="center" align="center" style="height: 100%; width: 100%">
 								<v-tooltip bottom :style="`position: absolute; z-index:${LZIndex+1}`">
 									<template v-slot:activator="{ on, attrs }">
 										<v-row justify="center" align="center" style="height: 100%; width: 100%!important;" v-bind="attrs" v-on="on">
-											<v-text-field v-if="bPauseUpdates" ref="txtRef1" flat solo dense hide-details :style="`color: ${passedObject.panelMMPrefixColor};`" :class="`text-${passedObject.panelMMTextSize}`" :type="passedObject.inputType" :clearable="passedObject.inputEnableClear" :prefix="passedObject.inputPrefixText" :suffix="passedObject.inputSuffixText" v-model="newValTemp" :value="newValTemp" :background-color="passedObject.panelColor" :elevation="1" @keyup.enter="clearTextInputFocus($event, newValTemp)"></v-text-field>
-											<v-text-field v-else flat solo dense hide-details :style="`color: ${passedObject.panelMMPrefixColor};`" :class="`text-${passedObject.panelMMTextSize}`" :type="passedObject.inputType" :clearable="passedObject.inputEnableClear" :prefix="passedObject.inputPrefixText" :suffix="passedObject.inputSuffixText" v-model="matchedVarVal" :value="matchedVarVal" :background-color="passedObject.panelColor" :elevation="1" @focus="setPauseUpdateText" ></v-text-field>
+											<v-text-field v-if="bPauseUpdates" ref="txtRef1" flat solo dense hide-details :style="`color: ${passedObject.panelMMPrefixColor};`" :class="`text-${passedObject.panelMMTextSize}`" :type="passedObject.inputType" :clearable="passedObject.inputEnableClear" :prefix="passedObject.inputPrefixText" :suffix="passedObject.inputSuffixText" v-model="newValTemp" :value="newValTemp" background-color="#FFFFFF00" :elevation="1" @keyup.enter="clearTextInputFocus($event, newValTemp)"></v-text-field>
+											<v-text-field v-else flat solo dense hide-details :style="`color: ${passedObject.panelMMPrefixColor};`" :class="`text-${passedObject.panelMMTextSize}`" :type="passedObject.inputType" :clearable="passedObject.inputEnableClear" :prefix="passedObject.inputPrefixText" :suffix="passedObject.inputSuffixText" v-model="matchedVarVal" :value="matchedVarVal" background-color="#FFFFFF00" :elevation="1" @focus="setPauseUpdateText" ></v-text-field>
 										</v-row>
 									</template>
 									<span >{{ passedObject.panelHoverText }}</span>
@@ -59,15 +69,20 @@
 							</v-row>
 							<v-row dense v-else justify="center" align="center" style="height: 100%; width: 100%">
 								<v-row justify="center" align="center" style="height: 100%; width: 100%!important;">
-									<v-text-field v-if="bPauseUpdates" ref="txtRef1" flat solo dense hide-details :style="`color: ${passedObject.panelMMPrefixColor};`" :class="`text-${passedObject.panelMMTextSize}`" :type="passedObject.inputType" :clearable="passedObject.inputEnableClear" :prefix="passedObject.inputPrefixText" :suffix="passedObject.inputSuffixText" v-model="newValTemp" :value="newValTemp" :background-color="passedObject.panelColor" :elevation="1" @keyup.enter="clearTextInputFocus($event, newValTemp)"></v-text-field>
-									<v-text-field v-else flat solo dense hide-details :style="`color: ${passedObject.panelMMPrefixColor};`" :class="`text-${passedObject.panelMMTextSize}`" :type="passedObject.inputType" :clearable="passedObject.inputEnableClear" :prefix="passedObject.inputPrefixText" :suffix="passedObject.inputSuffixText" v-model="matchedVarVal" :value="matchedVarVal" :background-color="passedObject.panelColor" :elevation="1" @focus="setPauseUpdateText"></v-text-field>
+									<v-text-field v-if="bPauseUpdates" ref="txtRef1" flat solo dense hide-details :style="`color: ${passedObject.panelMMPrefixColor};`" :class="`text-${passedObject.panelMMTextSize}`" :type="passedObject.inputType" :clearable="passedObject.inputEnableClear" :prefix="passedObject.inputPrefixText" :suffix="passedObject.inputSuffixText" v-model="newValTemp" :value="newValTemp" background-color="#FFFFFF00" :elevation="1" @keyup.enter="clearTextInputFocus($event, newValTemp)"></v-text-field>
+									<v-text-field v-else flat solo dense hide-details :style="`color: ${passedObject.panelMMPrefixColor};`" :class="`text-${passedObject.panelMMTextSize}`" :type="passedObject.inputType" :clearable="passedObject.inputEnableClear" :prefix="passedObject.inputPrefixText" :suffix="passedObject.inputSuffixText" v-model="matchedVarVal" :value="matchedVarVal" background-color="#FFFFFF00" :elevation="1" @focus="setPauseUpdateText"></v-text-field>
 								</v-row>
 							</v-row>
 						</v-col>
 					</v-row>
 					<v-row v-if="passedObject.inputType == 'boolean'" dense justify="center" align="center">
 						<v-col class="d-flex flex-column pa-0 ma-0" justify="center" align="center" cols="10">
-							<v-row v-if="passedObject.panelHoverText.length >= 1" justify="center" align="center">
+							<v-row v-if="passedObject.inputIconAbove" justify="center" align="center" class="d-flex pa-0 ma-0 mb-n4">
+								<v-col cols="12" justify="center">
+									<v-layout column align-center><span justify="center"><v-icon :size="passedObject.inputIconAboveSize" :color="passedObject.inputIconAboveColor">{{ passedObject.inputIconAbove }}</v-icon></span></v-layout>
+								</v-col>
+							</v-row>
+							<v-row v-if="passedObject.panelHoverText" justify="center" align="center" class="d-flex pa-0 ma-0">
 								<v-tooltip bottom :style="`position: absolute; z-index:${LZIndex+1}`">
 									<template v-slot:activator="{ on, attrs }">
 										<v-row v-if="bHasPrefix && bHasSuffix" justify="center" align="center" style="height: 100%;" v-bind="attrs" v-on="on">
@@ -104,7 +119,7 @@
 									<span >{{ passedObject.panelHoverText }}</span>
 								</v-tooltip>
 							</v-row>
-							<v-row v-else justify="center" align="center">
+							<v-row v-else justify="center" align="center" class="d-flex pa-0 ma-0">
 								<v-row v-if="bHasPrefix && bHasSuffix" justify="center" align="center" style="height: 100%;">
 									<v-col cols="3" justify="right">
 										<span v-bind="attrs" v-on="on" :style="'color: ' + passedObject.panelMMPrefixColor + ';'" :class="`text-${passedObject.panelMMTextSize}`">{{passedObject.inputPrefixText}}</span>
@@ -169,7 +184,7 @@ export default {
 		bHasPrefix(){
 			if(this.passedObject.inputPrefixText){
 				let tempText = this.passedObject.inputPrefixText.replace(/ /g, "");
-				if(tempText.length > 0){
+				if(tempText){
 					return true;
 				}else {
 					return false;
@@ -181,7 +196,7 @@ export default {
 		bHasSuffix(){
 			if(this.passedObject.inputSuffixText){
 				let tempText = this.passedObject.inputSuffixText.replace(/ /g, "");
-				if(tempText.length > 0){
+				if(tempText){
 					return true;
 				}else {
 					return false;
@@ -198,7 +213,7 @@ export default {
 			}
 		},
 		overlayBackgroundColor(){
-			if(this.passedObject.panelColor.length > 0){
+			if(this.passedObject.panelColor){
 				return this.passedObject.panelColor
 			}else{
 				if(!this.darkTheme){
diff --git a/src/plugin.json b/src/plugin.json
index 09b0092..14cdb5c 100644
--- a/src/plugin.json
+++ b/src/plugin.json
@@ -3,10 +3,10 @@
     "id": "BtnCmd",
     "name": "BtnCmd",
     "author": "Minty Trebor",
-    "version": "01.02.04",
+    "version": "01.02.07",
     "license": "GPL-3.0-or-later",
     "homepage": "https://github.com/MintyTrebor",
-    "dwcVersion": "3.5",
+    "dwcVersion": "auto",
     "dependencies": {
       "precompiled-mqtt": "^4.3.7",
       "deepmerge": "^4.2.2",