diff --git a/addons/uis/apps/images/ios01.png b/addons/uis/apps/images/ios01.png
deleted file mode 100644
index 9f283b6f3..000000000
Binary files a/addons/uis/apps/images/ios01.png and /dev/null differ
diff --git a/addons/uis/apps/images/ios02.png b/addons/uis/apps/images/ios02.png
deleted file mode 100644
index 2e9e3939d..000000000
Binary files a/addons/uis/apps/images/ios02.png and /dev/null differ
diff --git a/addons/uis/apps/images/ios03.png b/addons/uis/apps/images/ios03.png
deleted file mode 100644
index 55c59dc4a..000000000
Binary files a/addons/uis/apps/images/ios03.png and /dev/null differ
diff --git a/addons/uis/apps/images/main_menu.png b/addons/uis/apps/images/main_menu.png
deleted file mode 100644
index 86972bbb3..000000000
Binary files a/addons/uis/apps/images/main_menu.png and /dev/null differ
diff --git a/addons/uis/apps/images/mainui.png b/addons/uis/apps/images/mainui.png
new file mode 100644
index 000000000..169ac87bf
Binary files /dev/null and b/addons/uis/apps/images/mainui.png differ
diff --git a/addons/uis/apps/images/notifications.png b/addons/uis/apps/images/notifications.png
new file mode 100644
index 000000000..9b25198cc
Binary files /dev/null and b/addons/uis/apps/images/notifications.png differ
diff --git a/addons/uis/apps/images/settings1.jpeg b/addons/uis/apps/images/settings1.jpeg
new file mode 100644
index 000000000..9b58180b5
Binary files /dev/null and b/addons/uis/apps/images/settings1.jpeg differ
diff --git a/addons/uis/apps/images/settings2.jpeg b/addons/uis/apps/images/settings2.jpeg
new file mode 100644
index 000000000..f6ea3f16f
Binary files /dev/null and b/addons/uis/apps/images/settings2.jpeg differ
diff --git a/addons/uis/apps/images/sidemenu.jpeg b/addons/uis/apps/images/sidemenu.jpeg
new file mode 100644
index 000000000..3d0ac9a63
Binary files /dev/null and b/addons/uis/apps/images/sidemenu.jpeg differ
diff --git a/addons/uis/apps/images/sitemap.png b/addons/uis/apps/images/sitemap.png
new file mode 100644
index 000000000..fd051dd71
Binary files /dev/null and b/addons/uis/apps/images/sitemap.png differ
diff --git a/addons/uis/apps/images/widget_overview.png b/addons/uis/apps/images/widget_overview.png
deleted file mode 100644
index 0be6f88af..000000000
Binary files a/addons/uis/apps/images/widget_overview.png and /dev/null differ
diff --git a/addons/uis/apps/ios.md b/addons/uis/apps/ios.md
index 2563c92e4..b5db7e8ee 100644
--- a/addons/uis/apps/ios.md
+++ b/addons/uis/apps/ios.md
@@ -5,44 +5,172 @@ title: iOS App
# iOS App
-
-
The openHAB iOS application is a native client for openHAB, compatible with iPhone and iPad.
-It uses the REST API of openHAB to render sitemaps of your openHAB installation for a natural iOS feeling.
-
- 
-
+## openHAB (Primary)
+
+This is the primary openHAB app which contains the latest features and is updated regularly. This includes Apple Watch support, enhanced notifications, widgets and more.
+Requires at least iOS 16 and openHAB 2.x and later.
+
+(Official App Store Link Coming Soon)
+
+
+Beta releases are available on [TestFlight](https://testflight.apple.com/join/0uFYONeF).
+
+## openHAB V1 (Legacy)
+
+This is the legacy app for users on iOS 15 or earlier as well as openHAB system 1.x and later (tested to at least openHAB 4).
+This app only receives security updates and minor fixes and is not intended for most users.
+
+
+
+Beta releases are available on [TestFlight](https://testflight.apple.com/join/563WBakc).
## Features
-- View and control openHAB sitemaps
-- Connect to local openHAB instances on the local network
-- Connect to your openHAB instance remotely, either using a direct connection or via myopenHAB
-- Receive push notifications on your iOS devices via myopenHAB
+- Control your openHAB server directly and through a [openHAB Cloud instance](https://github.com/openhab/openhab-cloud)
+- [Enhanced push notification](#push-notifications) from openHAB Cloud and the openHAB cloud binding
+- [Apple Watch](#apple-watch-configuration) companion app
+- [Widgets](#widgets) (coming soon!)
- Natively supports both iPhone and iPad
-
+
+ 
+ 
+
-## Installation and Setup
+## App Configuration
-The latest release version of the app is always available through the Apple App Store.
+
+
+
+
-The app will start in Demo mode by default.
-A demo home automation setup is shown.
-This allows you to explore the possibilities of a typical openHAB installation.
+### Connection Settings
-To view and control your own devices, navigate to the Settings page, then disable the "Demo mode" checkbox.
-In the "Local URL" field enter the base URL to your openHAB webinterface, either using its IP address (e.g. `http://192.168.1.125:8080`) or hostname (e.g. `http://openhabianpi:8080`).
+The app will try and connect using the Local URL as the primary connection, and if that fails or is not reachable, falls back to the Remote URL.
-You can also connect to openHAB remotely, using either a direct connection or an openHAB Cloud instance like myopenHAB.
-Please see the [article on secure remote access](https://docs.openhab.org/installation/security.html) for more details.
-Simply enter your "Remote URL" in the respective Settings field.
-The openHAB app will henceforth first try connecting to the local URL, then fall back to the remote URL.
+### Demo Mode
+
+This sets up the app to use the openHAB demo server and can be used to experience the app without needing to install openHAB.
+
+#### Local URL
+
+This is the primary connection to your openHAB instance, a fully qualified URL with a IP or host is required.
+
+Example:
+`https://openhab.local:8443`
+
+#### Remote URL
+
+This is the secondary connection to your openHAB instance, a fully qualified URL with a IP or host is required.
+If using the openHAB cloud service, leave this as the default setting of `https://myopenhab.org`.
+When set to the public cloud, the app will also register for push notifications (as long as credentials are correct)
+
+Example:
+`https://myopenhab.org`
+
+### Username / Password
+
+This will be sent if the local or remote server challenges for authentication, or if "Always Send Credentials" is checked on.
+If using the openHAB cloud, these should be set to those login credentials.
+
+### Application Settings
+
+### Certificates
+
+Allows the installation of p12 formatted certificates for use in client side authentication setups.
+
+To install a client certificate, rename the certificate with the extension `.ohp12`, then send it to your iOS device (airdrop, icloud, dropbox, etc..), then open/save and select `openHAB` from the "Open In" menu (you may need to select "More..." to see all apps).
+
+To delete a certificate, swipe left on the certificate name in the certificate menu.
+
+If using openssl v3 to generate certificates, make sure to add `-legacy -certpbe pbeWithSHA1And40BitRC2-CBC` to the pk12 export command.
+See [Apple OpenSSL 3.0.x Issues](https://github.com/openssl/openssl/issues/19871) for more information on V3 compatibility with Apple products.
+
+### Idle Timeout
+
+Useful for wall or fixed installations, will disable the Idle screen timeout.
+
+### Crash Reporting
+
+Sends crash reports to Google / Firebase.
+
+### Main UI Settings
+
+#### WebRTC
+
+Allows audio and video communications in the Main UI for views and widgets that require it.
+
+#### Default Path
+
+Allows the user to enter a path to act as the starting point when the Main UI is loaded.
+Clicking the "+" button will prompt to enter the current path the of Main UI view.
+
+#### Clear Cache
+
+Clears the Main UI web cache.
+
+### Sitemap Settings
+
+#### Realtime Sliders
+
+Allows sitemap sliders to send changes as the control is sliding in realtime.
+
+### Image Cache
+
+Clears the sitemap cached images.
+
+### Icon Type
+
+Select which type of icon the sitemap view will attempt to load for icons.
+
+### Sitemap Sorting
+
+Sort order when presenting multiple sitemaps for selection.
+
+## Apple Watch Configuration
+
+The Apple watch requires a sitemap with the name `watch.sitemap`.
+Note that some advanced sitemap features may not be supported on the Apple watch and its recommended to keep this sitemap simple and appropriate for interaction on a small display.
+
+When using the Watch app, slide left to bring up the configuration view and select "sync" to ensure the local, remote and username/password configurations are synced to the watch.
+
+## Main UI and Sitemap Usage
+
+
+
+Clicking "Home" will navigate to the Main UI from the user's openHAB system. Clicking this when the Main UI is already visible will force a reload the Main UI.
+
+Tiles are the alternative UIs installed on a user's system and will be opened in an embedded browser.
+
+Sitemaps show the available sitemaps on the users system. Selecting a sitemap will present the native sitemap renderer view.
+
+Notifications is a list of push notification retrieved from the openHAB cloud (if configured).
+
+Settings opens the application settings view.
+
+The app will persist the last primary view opened (Main UI or Sitemaps) when the app is opened or restarted.
+
+## Push Notifications
+
+The [openHAB Cloud Connector](https://next.openhab.org/addons/integrations/openhabcloud/) allows users to send push notifications mobile devices registered with an [openHAB Cloud instance](https://github.com/openhab/openhab-cloud) such as [myopenHAB.org](https://www.myopenhab.org).
+
+
+
+
+
+Push Notifications on iOS support:
+
+- Title and message text
+- Image and video attachments
+- Up to 3 action buttons (long press notification)
+- Collapsible / updated notifications
+- Removing notifications
+
+## Widgets
+
+Coming soon !
## Help and Resources
