diff --git a/Aircraft/Instruments/adf-radio.xml b/Aircraft/Instruments/adf-radio.xml
index e77f4bc18..8f5b3acf1 100644
--- a/Aircraft/Instruments/adf-radio.xml
+++ b/Aircraft/Instruments/adf-radio.xml
@@ -32,8 +32,8 @@ properties' values.
 <params>
   <adf-freq-selected-prop>/radios/kr-87/outputs/selected-khz</adf-freq-selected-prop>
   <adf-freq-standby-prop>/radios/kr-87/outputs/standby-khz</adf-freq-standby-prop>
-  <adf-morse-id-volume-prop>/radios/kr-87/inputs/on-off-volume</adf-morse-id-volume-prop>
-  <adf-morse-ident-toggle-prop>/radios/kr-87/internal/ident</adf-morse-ident-toggle-prop>
+  <adf-morse-id-volume-prop>/radios/kr-87/inputs/volume</adf-morse-id-volume-prop>
+  <adf-morse-ident-toggle-prop>/radios/kr-87/inputs/ident-btn</adf-morse-ident-toggle-prop>
 </params>
 
  <layers>
@@ -200,7 +200,7 @@ properties' values.
     </transformation>
     <transformation>
      <type>rotation</type>
-     <property>/radios/kr-87/inputs/on-off-volume</property>
+     <property>/radios/kr-87/inputs/volume</property>
      <min>0</min>
      <max>2</max>
      <scale>140</scale>
@@ -377,7 +377,7 @@ properties' values.
   </action>
  
   <action>
-   <name>ident volume on/off</name>
+   <name>ident volume</name>
    <button>0</button>
    <x>37</x>
    <y>-30</y>
diff --git a/Aircraft/Instruments/kr-87adf.xml b/Aircraft/Instruments/kr-87adf.xml
index d9b62254b..6762fa120 100644
--- a/Aircraft/Instruments/kr-87adf.xml
+++ b/Aircraft/Instruments/kr-87adf.xml
@@ -111,10 +111,10 @@ properties' values.
   <layer>
    <name>Selected FRQ display</name>
    <condition>
-    <greater-than>
-     <property>/radios/kr-87/inputs/on-off-volume</property>
-     <value>0.0</value>
-    </greater-than>
+    <equals>
+     <property>/radios/kr-87/inputs/power-btn</property>
+     <value>true</value>
+    </equals>
    </condition>
    <type>text</type>
    <font>led</font>
@@ -251,10 +251,10 @@ properties' values.
   <layer>
    <name>Flight Timer display</name>
    <condition>
-    <greater-than>
-     <property>/radios/kr-87/inputs/on-off-volume</property>
-     <value>0.0</value>
-    </greater-than>
+    <equals>
+     <property>/radios/kr-87/inputs/power-btn</property>
+     <value>true</value>
+    </equals>
     <equals>
     <property>/radios/kr-87/modes/stby</property>
     <value>1</value>
@@ -293,10 +293,10 @@ properties' values.
   <layer>
    <name>Elapsed Timer display</name>
    <condition>
-    <greater-than>
-     <property>/radios/kr-87/inputs/on-off-volume</property>
-     <value>0.0</value>
-    </greater-than>
+    <equals>
+     <property>/radios/kr-87/inputs/power-btn</property>
+     <value>true</value>
+    </equals>
     <equals>
     <property>/radios/kr-87/modes/stby</property>
     <value>1</value>
@@ -464,7 +464,7 @@ properties' values.
     </transformation>
     <transformation>
      <type>rotation</type>
-     <property>/radios/kr-87/inputs/on-off-volume</property>
+     <property>/radios/kr-87/inputs/volume</property>
      <min>0</min>
      <max>2</max>
      <scale>140</scale>
@@ -886,7 +886,7 @@ properties' values.
    <h>16</h>
    <binding>
     <command>property-adjust</command>
-    <property>/radios/kr-87/inputs/on-off-volume</property>
+    <property>/radios/kr-87/inputs/volume</property>
     <step>0.5</step>
     <min>0</min>
     <max>2</max>
@@ -901,7 +901,7 @@ properties' values.
    <h>8</h>
    <binding>
     <command>property-adjust</command>
-    <property>/radios/kr-87/inputs/on-off-volume</property>
+    <property>/radios/kr-87/inputs/volume</property>
     <step>-0.5</step>
     <min>0</min>
     <max>2</max>