diff --git a/Essentials/PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs b/Essentials/PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs
index f839db8e..5964a774 100644
--- a/Essentials/PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs
+++ b/Essentials/PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs
@@ -271,11 +271,13 @@ namespace PepperDash.Essentials
             if (CurrentRoom.OnFeedback.BoolValue)
             {
                 TriList.SetBool(UIBoolJoin.TapToBeginVisible, false);
+				SetupActivityFooterWhenRoomOn();
             }
             else
             {
                 TriList.SetBool(UIBoolJoin.StartPageVisible, true);
                 TriList.SetBool(UIBoolJoin.TapToBeginVisible, true);
+				SetupActivityFooterWhenRoomOff();
             }
             ShowCurrentDisplayModeSigsInUse();
 
@@ -288,10 +290,10 @@ namespace PepperDash.Essentials
             TriList.SetSigFalseAction(UIBoolJoin.VolumeDefaultPress, () => CurrentRoom.SetDefaultLevels());
             TriList.SetString(UIStringJoin.AdvancedVolumeSlider1Text, "Room");
             
-            if (TriList is CrestronApp)
-                TriList.BooleanInput[UIBoolJoin.GearButtonVisible].BoolValue = false;
-            else
-                TriList.BooleanInput[UIBoolJoin.GearButtonVisible].BoolValue = true;
+			//if (TriList is CrestronApp)
+			//    TriList.BooleanInput[UIBoolJoin.GearButtonVisible].BoolValue = false;
+			//else
+			//    TriList.BooleanInput[UIBoolJoin.GearButtonVisible].BoolValue = true;
 
             // power-related functions
             // Note: some of these are not directly-related to the huddle space UI, but are held over
@@ -1070,6 +1072,7 @@ namespace PepperDash.Essentials
 				MeetingOrContactMethodModalSrl.GetBoolFeedbackSig(i, 1).SetSigFalseAction(() =>
 				{
 					PopupInterlock.Hide();
+					ActivityCallButtonPressed();
 					var d = CurrentRoom.ScheduleSource as VideoCodecBase;
 					if (d != null)
 						RoomOnAndDialMeeting(mm);
diff --git a/Essentials/PepperDashEssentials/UIDrivers/VC/EssentialsVideoCodecUiDriver.cs b/Essentials/PepperDashEssentials/UIDrivers/VC/EssentialsVideoCodecUiDriver.cs
index 839250ff..1e110711 100644
--- a/Essentials/PepperDashEssentials/UIDrivers/VC/EssentialsVideoCodecUiDriver.cs
+++ b/Essentials/PepperDashEssentials/UIDrivers/VC/EssentialsVideoCodecUiDriver.cs
@@ -33,7 +33,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
         /// <summary>
         /// To drive UI elements outside of this driver that may be dependent on this.
         /// </summary>
-        BoolFeedback InCall;
+		//BoolFeedback InCall;
         BoolFeedback LocalPrivacyIsMuted;
 
         /// <summary>
@@ -120,7 +120,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
             else
                 codec.IsReadyChange += (o, a) => Codec_IsReady();
 
-            InCall = new BoolFeedback(() => false);
+			//InCall = new BoolFeedback(() => false);
             LocalPrivacyIsMuted = new BoolFeedback(() => false);
 
             VCControlsInterlock = new JoinedSigInterlock(triList);
@@ -378,6 +378,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
 		/// </summary>
 		void AcceptIncomingCall(CodecActiveCallItem call)
 		{
+			Parent.PrepareForCodecIncomingCall();
 			Parent.ActivityCallButtonPressed();
 			Codec.AcceptCall(call);
 		}
@@ -902,7 +903,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
 		/// </summary>
         void ShowKeypad()
         {
-			uint join = CodecHasFavorites ? UIBoolJoin.VCKeypadWithFavoritesVisible : UIBoolJoin.VCKeypadVisible;
+			uint join = Codec.IsInCall ? UIBoolJoin.VCKeypadVisible : UIBoolJoin.VCKeypadWithFavoritesVisible;
 			if (IsVisible)
 				VCControlsInterlock.ShowInterlocked(join);
 			else
diff --git a/Release Package/PepperDashEssentials.cpz b/Release Package/PepperDashEssentials.cpz
index 0271d5eb..23ac5e66 100644
Binary files a/Release Package/PepperDashEssentials.cpz and b/Release Package/PepperDashEssentials.cpz differ
diff --git a/Release Package/PepperDashEssentials.dll b/Release Package/PepperDashEssentials.dll
index 5e402da8..5ddaf967 100644
Binary files a/Release Package/PepperDashEssentials.dll and b/Release Package/PepperDashEssentials.dll differ