diff --git a/src/app/properties.rs b/src/app/properties.rs
index f97fbf6f1..58f0d6ba0 100644
--- a/src/app/properties.rs
+++ b/src/app/properties.rs
@@ -265,7 +265,7 @@ impl OpenCADStudio {
                         .or_else(|| active_model_vport.map(|viewport| viewport.ucsicon_lower))
                         .unwrap_or(self.show_ucs_icon);
                     let ucs_icon_at_origin = active_entity_viewport
-                        .map(|viewport| viewport.ucs_icon_at_origin)
+                        .map(|viewport| viewport.status.ucs_icon_at_origin)
                         .or_else(|| active_model_vport.map(|viewport| viewport.ucsicon_origin))
                         .unwrap_or(self.ucs_icon_at_origin);
                     let ucs_per_viewport = active_entity_viewport
diff --git a/src/app/update/command.rs b/src/app/update/command.rs
index f64699b76..ad703e3ef 100644
--- a/src/app/update/command.rs
+++ b/src/app/update/command.rs
@@ -3112,7 +3112,7 @@ pub(super) fn on_tab_close(&mut self, idx: usize) -> Task<Message> {
                                 .and_then(|handle| self.tabs[i].scene.document.get_entity(handle))
                                 .and_then(|entity| match entity {
                                     acadrust::EntityType::Viewport(viewport) => {
-                                        Some(viewport.ucs_icon_at_origin)
+                                        Some(viewport.status.ucs_icon_at_origin)
                                     }
                                     _ => None,
                                 })
@@ -3137,7 +3137,7 @@ pub(super) fn on_tab_close(&mut self, idx: usize) -> Task<Message> {
                                     if let Some(acadrust::EntityType::Viewport(viewport)) =
                                         self.tabs[i].scene.document.get_entity_mut(handle)
                                     {
-                                        viewport.ucs_icon_at_origin = next;
+                                        viewport.status.ucs_icon_at_origin = next;
                                     }
                                 } else if let Some(viewport) = self.tabs[i]
                                     .scene