diff --git a/Assets/Scripts/Camera/OrbitalController.cs b/Assets/Scripts/Camera/OrbitalController.cs
index b8efcda6..e3b71c59 100644
--- a/Assets/Scripts/Camera/OrbitalController.cs
+++ b/Assets/Scripts/Camera/OrbitalController.cs
@@ -230,11 +230,11 @@ namespace OCTOPUS_TWIN
             currentAzimuth += input.mouseX * rotateSpeed;
             currentAzimuth %= 360;
 
-            if(viewMode == ViewMode.PerspectiveView)
-            {
-                currentElevation -= input.mouseY * rotateSpeed;
-                currentElevation = Mathf.Clamp(currentElevation, minElevation, maxElevation);
-            }
+            //if(viewMode == ViewMode.PerspectiveView)
+            //{
+            //    currentElevation -= input.mouseY * rotateSpeed;
+            //    currentElevation = Mathf.Clamp(currentElevation, minElevation, maxElevation);
+            //}
             isRotateOperation = true;
         }
 
diff --git a/Assets/Scripts/ChunilENG/Command/UICommand/ActiveFloorControlPanelCommand.cs b/Assets/Scripts/ChunilENG/Command/UICommand/ActiveFloorControlPanelCommand.cs
deleted file mode 100644
index 353cdc9d..00000000
--- a/Assets/Scripts/ChunilENG/Command/UICommand/ActiveFloorControlPanelCommand.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using ChunilENG.Management;
-using UnityEngine;
-using UVC.UI.Commands;
-
-namespace ChunilENG.UI.Command
-{
-    public class ActiveFloorControlPanelCommand : ICommand
-    {
-        private bool isActive;
-
-        public void Execute(object? parameter = null)
-        {
-            var uiManager = ChunilENGSceneMain.Instance.GetManager<ChunilENGUIManager>();
-
-            if (!isActive)
-            {
-                uiManager.GetCanvas<PopupCanvas>().GetPanel<FloorControlPanel>().Open();
-                isActive = true;
-            }
-            else
-            {
-                uiManager.GetCanvas<PopupCanvas>().GetPanel<FloorControlPanel>().Close();
-                isActive = false;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Assets/Scripts/ChunilENG/Command/UICommand/ActiveFloorControlPanelCommand.cs.meta b/Assets/Scripts/ChunilENG/Command/UICommand/ActiveFloorControlPanelCommand.cs.meta
deleted file mode 100644
index b923619b..00000000
--- a/Assets/Scripts/ChunilENG/Command/UICommand/ActiveFloorControlPanelCommand.cs.meta
+++ /dev/null
@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: 354196db0cc909b49b89c97f06bb1528
\ No newline at end of file
diff --git a/Assets/Scripts/ChunilENG/Command/UICommand/ActiveMachineInfoItemCommand.cs b/Assets/Scripts/ChunilENG/Command/UICommand/ActiveMachineInfoItemCommand.cs
deleted file mode 100644
index 17b50ebf..00000000
--- a/Assets/Scripts/ChunilENG/Command/UICommand/ActiveMachineInfoItemCommand.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using ChunilENG;
-using ChunilENG.Management;
-using ChunilENG.UI;
-using UnityEngine;
-using UVC.UI.Commands;
-
-namespace ChunilENG.UI.Command
-{
-    public class ActiveMachineInfoItemCommand : ICommand
-    {
-        private bool isActive = true;
-        public void Execute(object? parameter = null)
-        {
-            var itemManager = ChunilENGSceneMain.Instance.GetManager<MachineInfoItemManager>();
-            isActive = !isActive;
-            itemManager.ActiveIcons(isActive);
-        }
-    }
-}
-
diff --git a/Assets/Scripts/ChunilENG/Command/UICommand/ActiveMachineInfoItemCommand.cs.meta b/Assets/Scripts/ChunilENG/Command/UICommand/ActiveMachineInfoItemCommand.cs.meta
deleted file mode 100644
index 4a9bd4f0..00000000
--- a/Assets/Scripts/ChunilENG/Command/UICommand/ActiveMachineInfoItemCommand.cs.meta
+++ /dev/null
@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: dc27e9cd507dea347ade0e5e30c38bde
\ No newline at end of file
diff --git a/Assets/Scripts/ChunilENG/Managements/MachineInfoItemManager.cs b/Assets/Scripts/ChunilENG/Managements/MachineInfoItemManager.cs
index 0648823b..39255355 100644
--- a/Assets/Scripts/ChunilENG/Managements/MachineInfoItemManager.cs
+++ b/Assets/Scripts/ChunilENG/Managements/MachineInfoItemManager.cs
@@ -26,7 +26,7 @@ namespace ChunilENG.Management
         public Action<Machine> onClickKPIToMachine;
 
         public float defaultNameHeight = 2f;
-
+        private bool activeIconEnable = true;
         [Header("Scale Settings")]
         [Range(0.1f, 1.5f)] public float minScale;
         [Range(0.5f, 3f)] public float maxScale;
@@ -93,6 +93,7 @@ namespace ChunilENG.Management
         }
         void MachineIconsActive(Machine machine)
         {
+            if (!activeIconEnable) return;
             if(machine == null) return;
             var currentFloor = ChunilENGSceneMain.Instance.building.GetCurFloor();
             var machineInFloor = machine.GetComponentInParent<Floor>();
@@ -151,7 +152,8 @@ namespace ChunilENG.Management
         }
         public void ActiveIcons(bool isActive)
         {
-            foreach(var icon in itemToMachines.Keys)
+            activeIconEnable = isActive;
+            foreach (var icon in itemToMachines.Keys)
             {
                 icon.gameObject.SetActive(isActive);
             }
diff --git a/Assets/Scripts/ChunilENG/UI/LeftSidePanel.cs b/Assets/Scripts/ChunilENG/UI/LeftSidePanel.cs
index b2e985be..14da9b38 100644
--- a/Assets/Scripts/ChunilENG/UI/LeftSidePanel.cs
+++ b/Assets/Scripts/ChunilENG/UI/LeftSidePanel.cs
@@ -1,4 +1,5 @@
-using ChunilENG.UI.Command;
+using ChunilENG.Management;
+using ChunilENG.UI.Command;
 using Cysharp.Threading.Tasks;
 using OCTOPUS_TWIN;
 using OCTOPUS_TWIN.Command;
@@ -99,8 +100,12 @@ namespace ChunilENG.UI
             toolbarModel.AddToggleButton("button_wall_control", false,
                 "Prefabs/UI/Toolbar/images/IMG_WallControl_on",
                 "Prefabs/UI/Toolbar/images/IMG_WallControl_off",
-                (isSelected) => Debug.Log($"내/외벽 조절 UI 활성화 상태 : {(isSelected ? "활성화" : "비활성화")} (OnToggle 콜백)"),
-                new ActiveMachineInfoItemCommand(),
+                (isSelected) => 
+                {
+                    var itemManager = ChunilENGSceneMain.Instance.GetManager<MachineInfoItemManager>();
+                    itemManager.ActiveIcons(!isSelected);
+                },
+                new ActiveWallControlPanelCommand(),
                 "내/외벽 조절 UI를 활성화/비활성화 합니다.");
 
             // 라이브러리