diff --git a/OsmAnd.xcodeproj/project.pbxproj b/OsmAnd.xcodeproj/project.pbxproj
index a1b231a962..1b04104d2c 100644
--- a/OsmAnd.xcodeproj/project.pbxproj
+++ b/OsmAnd.xcodeproj/project.pbxproj
@@ -1403,8 +1403,6 @@
 		A5A500282F50000100000028 /* ConstellationInfoBottomSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5A500272F50000100000027 /* ConstellationInfoBottomSheet.swift */; };
 		A5A5002A2F5000010000002A /* DateTimeSelectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5A500292F50000100000029 /* DateTimeSelectionView.swift */; };
 		A5A5002C2F5000010000002C /* StarMapButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5A5002B2F5000010000002B /* StarMapButton.swift */; };
-		A5A5002E2F5000010000002E /* StarMapResetButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5A5002D2F5000010000002D /* StarMapResetButton.swift */; };
-		A5A500302F50000100000030 /* StarMapTimeControlButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5A5002F2F5000010000002F /* StarMapTimeControlButton.swift */; };
 		A5A500322F50000100000032 /* StarCompassButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5A500312F50000100000031 /* StarCompassButton.swift */; };
 		A5A502022F51000100000102 /* AstroContextMenuItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5A501022F51000100000102 /* AstroContextMenuItem.swift */; };
 		A5A502032F51000100000103 /* AstroContextUiState.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5A501032F51000100000103 /* AstroContextUiState.swift */; };
@@ -1707,6 +1705,10 @@
 		CE4075A52FC48C40004224AA /* ProfileIconCollectionHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE4075A42FC48C2F004224AA /* ProfileIconCollectionHandler.swift */; };
 		CE71B88C2FEFAB0C008B0759 /* StarMapSearchEmptyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE71B88B2FEFAB0C008B0759 /* StarMapSearchEmptyView.swift */; };
 		CE7339672FF6D01900A9B191 /* TrackPointsKDIndex.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE7339662FF6D01900A9B191 /* TrackPointsKDIndex.swift */; };
+		CE762AEE2FFE0A2A001BF551 /* StarMapMagnitudeFilterButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE762AED2FFE0A2A001BF551 /* StarMapMagnitudeFilterButton.swift */; };
+		CE762AF02FFE0F32001BF551 /* StarMapMagnitudeSliderPanel.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE762AEF2FFE0F32001BF551 /* StarMapMagnitudeSliderPanel.swift */; };
+		CE762AF22FFE1197001BF551 /* StarMapGlassBackground.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE762AF12FFE1197001BF551 /* StarMapGlassBackground.swift */; };
+		CE762AF42FFE251B001BF551 /* StarMapTimeControlCard.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE762AF32FFE251B001BF551 /* StarMapTimeControlCard.swift */; };
 		CE7818262FC07944005CCF47 /* WikipediaContextMenuCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE7818252FC07944005CCF47 /* WikipediaContextMenuCell.swift */; };
 		CE7AC1A82FE02A2600495411 /* OATrackPreviewMapRenderer.mm in Sources */ = {isa = PBXBuildFile; fileRef = CE7AC19A2FE02A2600495411 /* OATrackPreviewMapRenderer.mm */; };
 		CE7AC1A92FE02A2600495411 /* TrackBitmapDrawer.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE7AC19B2FE02A2600495411 /* TrackBitmapDrawer.swift */; };
@@ -1723,6 +1725,8 @@
 		CE7CE0EE2FED645D001709F0 /* StarMapMyDataViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE7CE0ED2FED645D001709F0 /* StarMapMyDataViewController.swift */; };
 		CE7CE0F02FED8435001709F0 /* StarMapSearchExploreAdapter.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE7CE0EF2FED8435001709F0 /* StarMapSearchExploreAdapter.swift */; };
 		CE7F960C30025BA0000F2F22 /* StarMapObjectContextMenuBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE7F960B30025BA0000F2F22 /* StarMapObjectContextMenuBuilder.swift */; };
+		CE8215E52FFF6376002A8617 /* StarMapArControlCard.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE8215E42FFF6376002A8617 /* StarMapArControlCard.swift */; };
+		CE8215E72FFF6AF9002A8617 /* StarMapPlainButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE8215E62FFF6AF9002A8617 /* StarMapPlainButton.swift */; };
 		CE83DB4A2FEE4B20002D7685 /* StarMapSearchSortFilterChipsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE83DB492FEE4B20002D7685 /* StarMapSearchSortFilterChipsView.swift */; };
 		CE83DB4C2FEE4B20002D7685 /* StarMapSearchSortFilterChipsProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE83DB4B2FEE4B20002D7685 /* StarMapSearchSortFilterChipsProvider.swift */; };
 		CE8A82A92FCFE11F00EADFD8 /* MapVariantReplacementManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE8A82A82FCFE11F00EADFD8 /* MapVariantReplacementManager.swift */; };
@@ -3268,8 +3272,6 @@
 		DAEC05FB2296C6C500045298 /* ic_custom_show@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = DAEC05EC2296C6C400045298 /* ic_custom_show@3x.png */; };
 		DAEC05FD2296C6C500045298 /* ic_custom_date@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DAEC05ED2296C6C400045298 /* ic_custom_date@2x.png */; };
 		DAEC05FF2296C6C500045298 /* ic_custom_date@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = DAEC05EE2296C6C500045298 /* ic_custom_date@3x.png */; };
-		DAEC06042296CA7C00045298 /* ic_navbar_close@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DAEC06012296CA7B00045298 /* ic_navbar_close@2x.png */; };
-		DAEC06062296CA7C00045298 /* ic_navbar_close@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = DAEC06022296CA7C00045298 /* ic_navbar_close@3x.png */; };
 		DAECA4FA26CFE62600241B0B /* OABaseWidgetView.m in Sources */ = {isa = PBXBuildFile; fileRef = DAECA4F926CFE62600241B0B /* OABaseWidgetView.m */; };
 		DAEDAAA12865A0F100CE54D0 /* OAGenerateBackupInfoTask.m in Sources */ = {isa = PBXBuildFile; fileRef = DAEDAAA02865A0F100CE54D0 /* OAGenerateBackupInfoTask.m */; };
 		DAF2F804254825BA00967935 /* map_plan_route_point_movable@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = DAF2F7FB254825B600967935 /* map_plan_route_point_movable@3x.png */; };
@@ -5266,8 +5268,6 @@
 		A5A500272F50000100000027 /* ConstellationInfoBottomSheet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConstellationInfoBottomSheet.swift; sourceTree = "<group>"; };
 		A5A500292F50000100000029 /* DateTimeSelectionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DateTimeSelectionView.swift; sourceTree = "<group>"; };
 		A5A5002B2F5000010000002B /* StarMapButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StarMapButton.swift; sourceTree = "<group>"; };
-		A5A5002D2F5000010000002D /* StarMapResetButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StarMapResetButton.swift; sourceTree = "<group>"; };
-		A5A5002F2F5000010000002F /* StarMapTimeControlButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StarMapTimeControlButton.swift; sourceTree = "<group>"; };
 		A5A500312F50000100000031 /* StarCompassButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StarCompassButton.swift; sourceTree = "<group>"; };
 		A5A501022F51000100000102 /* AstroContextMenuItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AstroContextMenuItem.swift; sourceTree = "<group>"; };
 		A5A501032F51000100000103 /* AstroContextUiState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AstroContextUiState.swift; sourceTree = "<group>"; };
@@ -5759,6 +5759,10 @@
 		CE4075A42FC48C2F004224AA /* ProfileIconCollectionHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileIconCollectionHandler.swift; sourceTree = "<group>"; };
 		CE71B88B2FEFAB0C008B0759 /* StarMapSearchEmptyView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StarMapSearchEmptyView.swift; sourceTree = "<group>"; };
 		CE7339662FF6D01900A9B191 /* TrackPointsKDIndex.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrackPointsKDIndex.swift; sourceTree = "<group>"; };
+		CE762AED2FFE0A2A001BF551 /* StarMapMagnitudeFilterButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StarMapMagnitudeFilterButton.swift; sourceTree = "<group>"; };
+		CE762AEF2FFE0F32001BF551 /* StarMapMagnitudeSliderPanel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StarMapMagnitudeSliderPanel.swift; sourceTree = "<group>"; };
+		CE762AF12FFE1197001BF551 /* StarMapGlassBackground.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StarMapGlassBackground.swift; sourceTree = "<group>"; };
+		CE762AF32FFE251B001BF551 /* StarMapTimeControlCard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StarMapTimeControlCard.swift; sourceTree = "<group>"; };
 		CE7818252FC07944005CCF47 /* WikipediaContextMenuCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WikipediaContextMenuCell.swift; sourceTree = "<group>"; };
 		CE7AC1992FE02A2600495411 /* OATrackPreviewMapRenderer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OATrackPreviewMapRenderer.h; sourceTree = "<group>"; };
 		CE7AC19A2FE02A2600495411 /* OATrackPreviewMapRenderer.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = OATrackPreviewMapRenderer.mm; sourceTree = "<group>"; };
@@ -5776,6 +5780,8 @@
 		CE7CE0ED2FED645D001709F0 /* StarMapMyDataViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StarMapMyDataViewController.swift; sourceTree = "<group>"; };
 		CE7CE0EF2FED8435001709F0 /* StarMapSearchExploreAdapter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StarMapSearchExploreAdapter.swift; sourceTree = "<group>"; };
 		CE7F960B30025BA0000F2F22 /* StarMapObjectContextMenuBuilder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StarMapObjectContextMenuBuilder.swift; sourceTree = "<group>"; };
+		CE8215E42FFF6376002A8617 /* StarMapArControlCard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StarMapArControlCard.swift; sourceTree = "<group>"; };
+		CE8215E62FFF6AF9002A8617 /* StarMapPlainButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StarMapPlainButton.swift; sourceTree = "<group>"; };
 		CE83DB492FEE4B20002D7685 /* StarMapSearchSortFilterChipsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StarMapSearchSortFilterChipsView.swift; sourceTree = "<group>"; };
 		CE83DB4B2FEE4B20002D7685 /* StarMapSearchSortFilterChipsProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StarMapSearchSortFilterChipsProvider.swift; sourceTree = "<group>"; };
 		CE8A82A82FCFE11F00EADFD8 /* MapVariantReplacementManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapVariantReplacementManager.swift; sourceTree = "<group>"; };
@@ -8144,8 +8150,6 @@
 		DAEC05EC2296C6C400045298 /* ic_custom_show@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "ic_custom_show@3x.png"; path = "Resources/Icons/ic_custom_show@3x.png"; sourceTree = "<group>"; };
 		DAEC05ED2296C6C400045298 /* ic_custom_date@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "ic_custom_date@2x.png"; path = "Resources/Icons/ic_custom_date@2x.png"; sourceTree = "<group>"; };
 		DAEC05EE2296C6C500045298 /* ic_custom_date@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "ic_custom_date@3x.png"; path = "Resources/Icons/ic_custom_date@3x.png"; sourceTree = "<group>"; };
-		DAEC06012296CA7B00045298 /* ic_navbar_close@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "ic_navbar_close@2x.png"; path = "Resources/Icons/ic_navbar_close@2x.png"; sourceTree = "<group>"; };
-		DAEC06022296CA7C00045298 /* ic_navbar_close@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "ic_navbar_close@3x.png"; path = "Resources/Icons/ic_navbar_close@3x.png"; sourceTree = "<group>"; };
 		DAECA4F826CFE62600241B0B /* OABaseWidgetView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OABaseWidgetView.h; sourceTree = "<group>"; };
 		DAECA4F926CFE62600241B0B /* OABaseWidgetView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OABaseWidgetView.m; sourceTree = "<group>"; };
 		DAEDAA9F2865A0F100CE54D0 /* OAGenerateBackupInfoTask.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OAGenerateBackupInfoTask.h; sourceTree = "<group>"; };
@@ -9922,8 +9926,6 @@
 				84F3A8A11B4DA93100D16EBC /* ic_map_pin_small@3x.png */,
 				84185A621AA8ADFF00F70328 /* ic_map_pin@2x.png */,
 				84185A631AA8ADFF00F70328 /* ic_map_pin@3x.png */,
-				DAEC06012296CA7B00045298 /* ic_navbar_close@2x.png */,
-				DAEC06022296CA7C00045298 /* ic_navbar_close@3x.png */,
 				DAB854A923054C7A002566A6 /* ic_navbar_search@2x.png */,
 				DAB854AA23054C7B002566A6 /* ic_navbar_search@3x.png */,
 				8431E7851B383A190063C9AF /* ic_operator@2x.png */,
@@ -10671,10 +10673,14 @@
 				A5A501002F51000100000100 /* contextmenu */,
 				A5A503202F51000200000320 /* search */,
 				A5A500292F50000100000029 /* DateTimeSelectionView.swift */,
+				CE8215E62FFF6AF9002A8617 /* StarMapPlainButton.swift */,
 				A5A5002B2F5000010000002B /* StarMapButton.swift */,
-				A5A5002D2F5000010000002D /* StarMapResetButton.swift */,
-				A5A5002F2F5000010000002F /* StarMapTimeControlButton.swift */,
+				CE762AF32FFE251B001BF551 /* StarMapTimeControlCard.swift */,
 				A5A500312F50000100000031 /* StarCompassButton.swift */,
+				CE762AED2FFE0A2A001BF551 /* StarMapMagnitudeFilterButton.swift */,
+				CE762AEF2FFE0F32001BF551 /* StarMapMagnitudeSliderPanel.swift */,
+				CE8215E42FFF6376002A8617 /* StarMapArControlCard.swift */,
+				CE762AF12FFE1197001BF551 /* StarMapGlassBackground.swift */,
 				A5A5000F2F5000010000000F /* StarView.swift */,
 				A5A500112F50000100000011 /* StarMapARModeHelper.swift */,
 				A5A500132F50000100000013 /* StarMapCameraHelper.swift */,
@@ -16879,7 +16885,6 @@
 				DA5A82AC26C563A700F274C7 /* OARouteStatisticsModeCell.xib in Resources */,
 				DA8DB8E4218DA8AA00EBF914 /* ic_ruler_center_light@2x.png in Resources */,
 				DA5A848E26C563A900F274C7 /* OARoutePlanningHudViewController.xib in Resources */,
-				DAEC06062296CA7C00045298 /* ic_navbar_close@3x.png in Resources */,
 				DA5A829326C563A700F274C7 /* OADestinationCollectionViewCell.xib in Resources */,
 				DA2EC78329FBBE0400ECEB37 /* warnings_railways_us@3x.png in Resources */,
 				DA5A827A26C563A700F274C7 /* OAHeaderRoundCell.xib in Resources */,
@@ -17165,7 +17170,6 @@
 				0A8D1A1026FBA1750042444C /* ic_small_profile_straight_line@3x.png in Resources */,
 				84E441B91AF8A07500F87542 /* add_waypoint_to_track@3x.png in Resources */,
 				C508678C2D9D5E32000B7219 /* SegmentTextTableViewCell.xib in Resources */,
-				DAEC06042296CA7C00045298 /* ic_navbar_close@2x.png in Resources */,
 				DA2EC77329FBBE0400ECEB37 /* warnings_pedestrian@3x.png in Resources */,
 				0CBDD091245038EC00C94BC2 /* map_marker_direction_arrow_p2_color_pin_1@2x.png in Resources */,
 				DAF345A122F4482C009E2EB6 /* ic_custom_compound_action_hide_top@2x.png in Resources */,
@@ -17609,8 +17613,6 @@
 				A5A500282F50000100000028 /* ConstellationInfoBottomSheet.swift in Sources */,
 				A5A5002A2F5000010000002A /* DateTimeSelectionView.swift in Sources */,
 				A5A5002C2F5000010000002C /* StarMapButton.swift in Sources */,
-				A5A5002E2F5000010000002E /* StarMapResetButton.swift in Sources */,
-				A5A500302F50000100000030 /* StarMapTimeControlButton.swift in Sources */,
 				A5A500322F50000100000032 /* StarCompassButton.swift in Sources */,
 				A5A502022F51000100000102 /* AstroContextMenuItem.swift in Sources */,
 				A5A502032F51000100000103 /* AstroContextUiState.swift in Sources */,
@@ -17710,6 +17712,7 @@
 				DA5A84CE26C563A900F274C7 /* OAQuickActionSelectionBottomSheetViewController.mm in Sources */,
 				4656BD362C4855D200B69928 /* ColorizationType.swift in Sources */,
 				DA5A816026C563A700F274C7 /* OAParkingPositionPlugin.mm in Sources */,
+				CE762AEE2FFE0A2A001BF551 /* StarMapMagnitudeFilterButton.swift in Sources */,
 				2C8E8A562D5104E600746A69 /* OAArabicNormalizer.mm in Sources */,
 				C596D5832E8D634300D13D93 /* AutoZoom3DAngleViewController.swift in Sources */,
 				DA5A843226C563A800F274C7 /* OATransportDetailsTableViewController.mm in Sources */,
@@ -17950,6 +17953,7 @@
 				DA5A812626C563A700F274C7 /* CoreResourcesFromBundleProvider.mm in Sources */,
 				DA5A84B126C563A900F274C7 /* OATargetOptionsBottomSheetViewController.mm in Sources */,
 				DA2F790C2A273D39002B9B83 /* WidgetsInitializer.swift in Sources */,
+				CE762AF42FFE251B001BF551 /* StarMapTimeControlCard.swift in Sources */,
 				DA5A847C26C563A900F274C7 /* OATurnPathHelper.mm in Sources */,
 				329E56BA2C88321100DC7B7C /* ProfileAppearanceViewAngleViewController.swift in Sources */,
 				DA5A84F626C563A900F274C7 /* OAMapLayersConfiguration.m in Sources */,
@@ -18030,6 +18034,7 @@
 				3260870E2F324DE20038A34B /* PoiRowParams.swift in Sources */,
 				DA5A813226C563A700F274C7 /* OACoreResourcesTransportRouteIconProvider.mm in Sources */,
 				46AB58A729C4C979003B2FB9 /* OAWikipediaImagesSettingsViewController.m in Sources */,
+				CE762AF22FFE1197001BF551 /* StarMapGlassBackground.swift in Sources */,
 				C588D1EF298D1ECE001FEDBD /* OASearchHistoryTableGroup.m in Sources */,
 				DA5A824D26C563A700F274C7 /* OAScreenAlertsViewController.m in Sources */,
 				FA73410D2BBAED8600CBF7EC /* LeftIconRightStackTitleDescriptionButtonView.swift in Sources */,
@@ -18532,6 +18537,7 @@
 				27C768E42E6833F100540266 /* CustomInputDeviceProfile.swift in Sources */,
 				DA5A817F26C563A700F274C7 /* OAUnsupportedAction.m in Sources */,
 				0513AA382A9B530A00CFA2A0 /* OADestinationBarWidget.mm in Sources */,
+				CE762AF02FFE0F32001BF551 /* StarMapMagnitudeSliderPanel.swift in Sources */,
 				32FE7AA72B65138800F82728 /* OAGPXImportUIHelper.mm in Sources */,
 				FA86F41A2AE7CB8D00DC3B2B /* BLEBikeSCDDevice.swift in Sources */,
 				FA86F4152AE7C56E00DC3B2B /* UserDefaults+Extension.swift in Sources */,
@@ -18586,6 +18592,7 @@
 				DA5A840126C563A800F274C7 /* OAQuickSearchButtonListItem.mm in Sources */,
 				FA327BFE2BB418F900CFADCF /* MissingMapsCalculator.mm in Sources */,
 				DA5A854426C563A900F274C7 /* OADownloadsItem.mm in Sources */,
+				CE8215E52FFF6376002A8617 /* StarMapArControlCard.swift in Sources */,
 				326087132F3251B00038A34B /* PoiAdditionalUiRules.swift in Sources */,
 				27D33B512E7454EA00AD4F70 /* BaseMapScrollAction.swift in Sources */,
 				FAB744112FB4672B0001FFF8 /* AlertPresenter.swift in Sources */,
@@ -18746,6 +18753,7 @@
 				320F71272A823FB20071C0E7 /* PopularArticles.swift in Sources */,
 				DA5A850B26C563A900F274C7 /* OAButton.m in Sources */,
 				DA5A81C126C563A700F274C7 /* OAPOIParser.m in Sources */,
+				CE8215E72FFF6AF9002A8617 /* StarMapPlainButton.swift in Sources */,
 				D7B76D0D2FD16070004EE3E9 /* OrganizeByStepSizeViewController.swift in Sources */,
 				FAF6C89B2AD013F400A3ED94 /* UIColor+Extension.swift in Sources */,
 				DA5A824C26C563A700F274C7 /* OANavigationLanguageViewController.m in Sources */,
diff --git a/Resources/Images.xcassets/Colors/Map buttons/mapButtonBorderColor.colorset/Contents.json b/Resources/Images.xcassets/Colors/Map buttons/mapButtonBorderColor.colorset/Contents.json
new file mode 100644
index 0000000000..e07f474632
--- /dev/null
+++ b/Resources/Images.xcassets/Colors/Map buttons/mapButtonBorderColor.colorset/Contents.json	
@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x4D",
+          "green" : "0x4D",
+          "red" : "0x4D"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x4D",
+          "green" : "0x4D",
+          "red" : "0x4D"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Resources/Images.xcassets/Icons/ic_navbar_close.imageset/Contents.json b/Resources/Images.xcassets/Icons/ic_navbar_close.imageset/Contents.json
new file mode 100644
index 0000000000..6d1212439c
--- /dev/null
+++ b/Resources/Images.xcassets/Icons/ic_navbar_close.imageset/Contents.json
@@ -0,0 +1,25 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "ic_navbar_close@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "ic_navbar_close@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
diff --git a/Resources/Icons/ic_navbar_close@2x.png b/Resources/Images.xcassets/Icons/ic_navbar_close.imageset/ic_navbar_close@2x.png
similarity index 100%
rename from Resources/Icons/ic_navbar_close@2x.png
rename to Resources/Images.xcassets/Icons/ic_navbar_close.imageset/ic_navbar_close@2x.png
diff --git a/Resources/Icons/ic_navbar_close@3x.png b/Resources/Images.xcassets/Icons/ic_navbar_close.imageset/ic_navbar_close@3x.png
similarity index 100%
rename from Resources/Icons/ic_navbar_close@3x.png
rename to Resources/Images.xcassets/Icons/ic_navbar_close.imageset/ic_navbar_close@3x.png
diff --git a/Sources/Constants/OAColors.h b/Sources/Constants/OAColors.h
index 2050769c38..4c91be28e3 100644
--- a/Sources/Constants/OAColors.h
+++ b/Sources/Constants/OAColors.h
@@ -43,11 +43,6 @@
 #define color_dialog_buttons_dark 0xff8800
 #define color_on_map_icon_color 0x505050
 
-#define color_on_map_icon_background_color_tap_light 0xE6E6E6
-#define color_on_map_icon_background_color_tap_dark 0x595959
-
-#define color_on_map_icon_border_color 0x4D4D4D
-
 #define color_sky_day 0x8cbed6
 #define color_sky_night 0x05142e
 
diff --git a/Sources/Controllers/Map/OAHudButton.m b/Sources/Controllers/Map/OAHudButton.m
index 57728f6e29..2d7cbe807b 100644
--- a/Sources/Controllers/Map/OAHudButton.m
+++ b/Sources/Controllers/Map/OAHudButton.m
@@ -54,11 +54,11 @@ - (void)commonInit
 {
     self.unpressedColorDay = [UIColor colorNamed:ACColorNameMapButtonBgColorDefault].light;
     self.unpressedColorNight = [UIColor colorNamed:ACColorNameMapButtonBgColorDefault].dark;
-    self.pressedColorDay = UIColorFromRGB(color_on_map_icon_background_color_tap_light);
-    self.pressedColorNight = UIColorFromRGB(color_on_map_icon_background_color_tap_dark);
+    self.pressedColorDay = [UIColor colorNamed:ACColorNameMapButtonBgColorTap].light;
+    self.pressedColorNight = [UIColor colorNamed:ACColorNameMapButtonBgColorTap].dark;
     self.tintColorDay = [UIColor colorNamed:ACColorNameMapButtonIconColorDefault].light;
     self.tintColorNight = [UIColor colorNamed:ACColorNameMapButtonIconColorDefault].dark;
-    self.borderColor = UIColorFromRGB(color_on_map_icon_border_color);
+    self.borderColor = [UIColor colorNamed:ACColorNameMapButtonBorderColor];
     self.borderWidthDay = 0;
     self.borderWidthNight = 2;
     
diff --git a/Sources/Controllers/RoutePlanning/OARoutePlanningHudViewController.xib b/Sources/Controllers/RoutePlanning/OARoutePlanningHudViewController.xib
index c43f046cf5..de012f1e42 100644
--- a/Sources/Controllers/RoutePlanning/OARoutePlanningHudViewController.xib
+++ b/Sources/Controllers/RoutePlanning/OARoutePlanningHudViewController.xib
@@ -513,7 +513,7 @@
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="onx-Gz-iEg">
                             <rect key="frame" x="0.0" y="0.0" width="64" height="42"/>
                             <color key="backgroundColor" white="0.0" alpha="0.80377358490566042" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                            <state key="normal" image="ic_navbar_close.png"/>
+                            <state key="normal" image="ic_navbar_close"/>
                             <connections>
                                 <action selector="closePressed:" destination="-1" eventType="touchUpInside" id="qhF-wP-sgx"/>
                             </connections>
@@ -556,7 +556,7 @@
         <image name="ic_custom_routes" width="30" height="30"/>
         <image name="ic_custom_straight_line.png" width="30" height="30"/>
         <image name="ic_custom_undo.png" width="30" height="30"/>
-        <image name="ic_navbar_close.png" width="28" height="28"/>
+        <image name="ic_navbar_close" width="28" height="28"/>
         <namedColor name="customSeparator">
             <color red="0.79607843137254897" green="0.7803921568627451" blue="0.81960784313725488" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
diff --git a/Sources/Controllers/TargetMenu/Mapillary/OAMapillaryImageViewController.xib b/Sources/Controllers/TargetMenu/Mapillary/OAMapillaryImageViewController.xib
index 1ba3fd1384..4358ce2628 100644
--- a/Sources/Controllers/TargetMenu/Mapillary/OAMapillaryImageViewController.xib
+++ b/Sources/Controllers/TargetMenu/Mapillary/OAMapillaryImageViewController.xib
@@ -88,7 +88,7 @@
                             <rect key="frame" x="0.0" y="16" width="44" height="44"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                             <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                            <state key="normal" image="ic_navbar_close.png"/>
+                            <state key="normal" image="ic_navbar_close"/>
                             <connections>
                                 <action selector="closePressed:" destination="-1" eventType="touchUpInside" id="gZd-S4-022"/>
                             </connections>
@@ -102,6 +102,6 @@
     </objects>
     <resources>
         <image name="ic_action_wifi_off.png" width="30" height="30"/>
-        <image name="ic_navbar_close.png" width="28" height="28"/>
+        <image name="ic_navbar_close" width="28" height="28"/>
     </resources>
 </document>
diff --git a/Sources/DownloadMapSource/OADownloadMapProgressViewController.xib b/Sources/DownloadMapSource/OADownloadMapProgressViewController.xib
index e8ccf39082..fd379e41c0 100644
--- a/Sources/DownloadMapSource/OADownloadMapProgressViewController.xib
+++ b/Sources/DownloadMapSource/OADownloadMapProgressViewController.xib
@@ -64,7 +64,7 @@
                         <constraint firstAttribute="width" constant="28" id="NPl-hq-TuC"/>
                     </constraints>
                     <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                    <state key="normal" image="ic_navbar_close.png"/>
+                    <state key="normal" image="ic_navbar_close"/>
                     <connections>
                         <action selector="navBarCancelButtonPressed:" destination="-1" eventType="touchUpInside" id="p67-N5-hcJ"/>
                     </connections>
@@ -140,6 +140,6 @@
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
     </objects>
     <resources>
-        <image name="ic_navbar_close.png" width="28" height="28"/>
+        <image name="ic_navbar_close" width="28" height="28"/>
     </resources>
 </document>
diff --git a/Sources/Helpers/MigrationManager.swift b/Sources/Helpers/MigrationManager.swift
index 8a1651e65c..f746482d03 100644
--- a/Sources/Helpers/MigrationManager.swift
+++ b/Sources/Helpers/MigrationManager.swift
@@ -22,6 +22,7 @@ final class MigrationManager: NSObject {
         case migrationHudButtonPositionsKey
         case migrateRouteRecalculationValues
         case migrateLocationIconSizeAndCourseIconSize
+        case migrateAstronomyPreferences
     }
     
     private struct HudMigrationScenario {
@@ -104,6 +105,10 @@ final class MigrationManager: NSObject {
                 migrateLocationIconSizeAndCourseIconSize()
                 defaults.set(true, forKey: MigrationKey.migrateLocationIconSizeAndCourseIconSize.rawValue)
             }
+            if !defaults.bool(forKey: MigrationKey.migrateAstronomyPreferences.rawValue) {
+                migrateAstronomyPreferences()
+                defaults.set(true, forKey: MigrationKey.migrateAstronomyPreferences.rawValue)
+            }
         }
     }
     
@@ -600,6 +605,12 @@ final class MigrationManager: NSObject {
         }
     }
 
+    private func migrateAstronomyPreferences() {
+        if let plugin = OAPluginsHelper.getPlugin(AstronomyPlugin.self) as? AstronomyPlugin {
+            plugin.migrateLegacyStarWatcherSettingsIfNeeded()
+        }
+    }
+
     // MARK: - Import old versions
 
     func changeJsonMigrationToV2(_ json: [String: String]) -> [String: String] {
@@ -610,7 +621,8 @@ final class MigrationManager: NSObject {
             "top_widget_panel_order": "widget_top_panel_order",
             "bottom_widget_panel_order": "widget_bottom_panel_order",
             "shared_string_automatic": "driving_region_automatic",
-            "external_input_device": "selected_external_input_device"
+            "external_input_device": "selected_external_input_device",
+            "star_watcher_settings": "astronomy_settings"
         ]
 
         let changeWidgetIds = [
diff --git a/Sources/Plugins/Astronomy/AstroConfigureViewBottomSheet.swift b/Sources/Plugins/Astronomy/AstroConfigureViewBottomSheet.swift
index 1e1b64355d..6bed1bf9ee 100644
--- a/Sources/Plugins/Astronomy/AstroConfigureViewBottomSheet.swift
+++ b/Sources/Plugins/Astronomy/AstroConfigureViewBottomSheet.swift
@@ -93,7 +93,7 @@ final class AstroConfigureViewBottomSheet: UIViewController, UISheetPresentation
     }
 
     private func configureNavigationBar() {
-        let imageClose = OAUtilities.resize(UIImage.templateImageNamed("ic_navbar_close"),
+        let imageClose = OAUtilities.resize(.icNavbarClose,
                                             newSize: CGSize(width: 24, height: 24))?.withRenderingMode(.alwaysTemplate)
         let closeButton = UIBarButtonItem(image: imageClose, style: .plain, target: self, action: #selector(closeAction))
         closeButton.tintColor = .label
diff --git a/Sources/Plugins/Astronomy/AstroUtils.swift b/Sources/Plugins/Astronomy/AstroUtils.swift
index 6e48735d60..56cc955c1c 100644
--- a/Sources/Plugins/Astronomy/AstroUtils.swift
+++ b/Sources/Plugins/Astronomy/AstroUtils.swift
@@ -60,18 +60,18 @@ private final class AstroRedFilterOverlayView: UIView {
         super.init(coder: coder)
         commonInit()
     }
-
-    private func commonInit() {
-        isUserInteractionEnabled = false
-        backgroundColor = .red
-        layer.compositingFilter = "multiplyBlendMode"
-    }
-
+    
     override func layoutSubviews() {
         super.layoutSubviews()
         layer.cornerRadius = superview?.layer.cornerRadius ?? 0
         layer.masksToBounds = layer.cornerRadius > 0
     }
+
+    private func commonInit() {
+        isUserInteractionEnabled = false
+        backgroundColor = .mapNightFilter
+        layer.compositingFilter = "multiplyBlendMode"
+    }
 }
 
 enum AstroRedFilter {
@@ -111,6 +111,17 @@ enum AstroRedFilter {
 }
 
 enum AstroUtils {
+    struct Twilight {
+        let sunrise: Date?
+        let sunset: Date?
+        let civilDawn: Date?
+        let civilDusk: Date?
+        let nauticalDawn: Date?
+        let nauticalDusk: Date?
+        let astroDawn: Date?
+        let astroDusk: Date?
+    }
+    
     private static let customStarLock = NSLock()
 
     static let solarSystemWikidataIds: [String: Body] = [
@@ -126,17 +137,6 @@ enum AstroUtils {
         "Q339": Body.pluto
     ]
 
-    struct Twilight {
-        let sunrise: Date?
-        let sunset: Date?
-        let civilDawn: Date?
-        let civilDusk: Date?
-        let nauticalDawn: Date?
-        let nauticalDusk: Date?
-        let astroDawn: Date?
-        let astroDusk: Date?
-    }
-
     static func astronomyTime(from date: Date) -> Time {
         Time.companion.fromMillisecondsSince1970(millis: Int64(date.timeIntervalSince1970 * 1000.0))
     }
@@ -303,19 +303,6 @@ enum AstroUtils {
         return formatter.string(from: date)
     }
 
-    private static func filterRiseSetDate(_ date: Date?, windowStart: Date?, windowEnd: Date?) -> Date? {
-        guard let date else {
-            return nil
-        }
-        if let windowStart, date < windowStart {
-            return nil
-        }
-        if let windowEnd, date > windowEnd {
-            return nil
-        }
-        return date
-    }
-
     static func bodyName(_ body: Body) -> String {
         bodyDisplayName(body)
     }
@@ -352,17 +339,17 @@ enum AstroUtils {
 
     static func color(for body: Body) -> UIColor {
         if body === Body.sun {
-            return UIColor(red: 1.0, green: 0.69, blue: 0.20, alpha: 1.0)
+            return .solarSun
         } else if body === Body.moon {
-            return UIColor(white: 0.88, alpha: 1.0)
+            return .solarMoon
         } else if body === Body.mars {
-            return UIColor(red: 0.95, green: 0.36, blue: 0.22, alpha: 1.0)
+            return .solarMars
         } else if body === Body.jupiter {
-            return UIColor(red: 0.95, green: 0.73, blue: 0.48, alpha: 1.0)
+            return .solarJupiter
         } else if body === Body.saturn {
-            return UIColor(red: 0.95, green: 0.82, blue: 0.52, alpha: 1.0)
+            return .solarSaturn
         } else if body === Body.neptune || body === Body.uranus {
-            return UIColor(red: 0.42, green: 0.73, blue: 1.0, alpha: 1.0)
+            return .solarUranusNeptune
         } else {
             return UIColor(red: 0.87, green: 0.90, blue: 1.0, alpha: 1.0)
         }
@@ -371,16 +358,15 @@ enum AstroUtils {
     static func color(for type: SkyObjectType, magnitude: Double?) -> UIColor {
         switch type {
         case .STAR:
-            let brightness = max(0.45, min(1.0, 1.0 - ((magnitude ?? 2.0) / 8.0)))
-            return UIColor(red: brightness, green: brightness, blue: 1.0, alpha: 1.0)
+            return .starDot
         case .GALAXY, .GALAXY_CLUSTER:
-            return UIColor(red: 0.52, green: 0.74, blue: 1.0, alpha: 1.0)
+            return .deepSkyGalaxyDot
         case .NEBULA:
-            return UIColor(red: 0.85, green: 0.45, blue: 0.95, alpha: 1.0)
+            return .deepSkyNebulaDot
         case .OPEN_CLUSTER, .GLOBULAR_CLUSTER:
-            return UIColor(red: 0.50, green: 0.95, blue: 0.78, alpha: 1.0)
+            return .deepSkyClusterDot
         case .BLACK_HOLE:
-            return UIColor(red: 0.95, green: 0.45, blue: 0.35, alpha: 1.0)
+            return .deepSkyBlackHoleDot
         case .CONSTELLATION:
             return UIColor(red: 0.80, green: 0.86, blue: 1.0, alpha: 1.0)
         case .SUN, .MOON, .PLANET:
@@ -478,4 +464,17 @@ enum AstroUtils {
         formatter.timeStyle = .short
         return formatter.string(from: date)
     }
+    
+    private static func filterRiseSetDate(_ date: Date?, windowStart: Date?, windowEnd: Date?) -> Date? {
+        guard let date else {
+            return nil
+        }
+        if let windowStart, date < windowStart {
+            return nil
+        }
+        if let windowEnd, date > windowEnd {
+            return nil
+        }
+        return date
+    }
 }
diff --git a/Sources/Plugins/Astronomy/AstronomyPlugin.swift b/Sources/Plugins/Astronomy/AstronomyPlugin.swift
index ddf6b8ebb0..19f1429207 100644
--- a/Sources/Plugins/Astronomy/AstronomyPlugin.swift
+++ b/Sources/Plugins/Astronomy/AstronomyPlugin.swift
@@ -8,13 +8,50 @@
 
 import UIKit
 
-@objc(AstronomyPlugin)
-final class AstronomyPlugin: OAPlugin {
-    let dataProvider: AstroDataDbProvider
+@objc final class AstronomyPlugin: OAPlugin {
+    private enum PreferenceId {
+        static let settings = "astronomy_settings"
+        static let legacySettings = "star_watcher_settings"
+        static let recent = "astronomy_recently_viewed"
+    }
+
+    let dataProvider = AstroDataDbProvider()
+    
+    var astroSettings: AstronomyPluginSettings { astronomySettingsStorage }
+    var recentSearchChips: [StarMapRecentChip] = []
+
+    private let settingsPref: OACommonString = OAAppSettings.sharedManager()
+        .registerStringPreference(PreferenceId.settings, defValue: "")
+        .makeProfile()
+        .makeShared()
+
+    private let legacySettingsPref: OACommonString = OAAppSettings.sharedManager()
+        .registerStringPreference(PreferenceId.legacySettings, defValue: "")
+        .makeProfile()
+
+    private let recentPref: OACommonString = OAAppSettings.sharedManager()
+        .registerStringPreference(PreferenceId.recent, defValue: "")
+        .makeGlobal()
+
+    private lazy var astronomySettingsStorage = AstronomyPluginSettings(settingsPref: settingsPref, recentPref: recentPref)
 
     override init() {
-        dataProvider = AstroDataDbProvider()
         super.init()
+        recentSearchChips = astronomySettingsStorage.recentChips()
+    }
+
+    func saveRecentSearchChips() {
+        astronomySettingsStorage.setRecentChips(recentSearchChips)
+    }
+
+    func migrateLegacyStarWatcherSettingsIfNeeded() {
+        for appMode in OAApplicationMode.allPossibleValues() {
+            guard legacySettingsPref.isSet(for: appMode), !settingsPref.isSet(for: appMode) else {
+                continue
+            }
+            settingsPref.set(legacySettingsPref.get(appMode), mode: appMode)
+        }
+        astronomySettingsStorage.reloadFromPreference()
     }
 
     override func getId() -> String? {
diff --git a/Sources/Plugins/Astronomy/AstronomyPluginSettings.swift b/Sources/Plugins/Astronomy/AstronomyPluginSettings.swift
index 53513157f8..1c08a9621f 100644
--- a/Sources/Plugins/Astronomy/AstronomyPluginSettings.swift
+++ b/Sources/Plugins/Astronomy/AstronomyPluginSettings.swift
@@ -9,7 +9,7 @@
 import Foundation
 import UIKit
 
-struct AstronomyPluginSettings {
+final class AstronomyPluginSettings {
     enum DirectionColor: Int, CaseIterable {
         case BLUE
         case GREEN
@@ -39,29 +39,72 @@ struct AstronomyPluginSettings {
         }
     }
 
-    struct FavoriteConfig: Equatable {
+    struct FavoriteConfig: Equatable, Codable {
         var id: String
     }
 
-    struct DirectionConfig: Equatable {
+    struct DirectionConfig: Equatable, Codable {
         var id: String
         var colorIndex: Int = 0
+
+        init(id: String, colorIndex: Int = 0) {
+            self.id = id
+            self.colorIndex = colorIndex
+        }
+
+        init(from decoder: Decoder) throws {
+            let container = try decoder.container(keyedBy: CodingKeys.self)
+            id = try container.decode(String.self, forKey: .id)
+            colorIndex = try container.decodeIfPresent(Int.self, forKey: .colorIndex) ?? 0
+        }
     }
 
-    struct CelestialPathConfig: Equatable {
+    struct CelestialPathConfig: Equatable, Codable {
         var id: String
     }
 
-    struct CommonConfig: Equatable {
+    struct CommonConfig: Equatable, Codable {
         var showRegularMap = false
+
+        init(showRegularMap: Bool = false) {
+            self.showRegularMap = showRegularMap
+        }
+
+        init(from decoder: Decoder) throws {
+            let container = try decoder.container(keyedBy: CodingKeys.self)
+            showRegularMap = try container.decodeIfPresent(Bool.self, forKey: .showRegularMap) ?? false
+        }
     }
-    
-    struct RecentlyViewedItem: Equatable {
-        let id: String
-        let label: String
+
+    struct MapViewPosition: Equatable, Codable {
+        var azimuth: Double
+        var altitude: Double
+        var viewAngle: Double
+        var roll: Double = 0
+        var panX: Double = 0
+        var panY: Double = 0
+
+        init(azimuth: Double, altitude: Double, viewAngle: Double, roll: Double = 0, panX: Double = 0, panY: Double = 0) {
+            self.azimuth = azimuth
+            self.altitude = altitude
+            self.viewAngle = viewAngle
+            self.roll = roll
+            self.panX = panX
+            self.panY = panY
+        }
+
+        init(from decoder: Decoder) throws {
+            let container = try decoder.container(keyedBy: CodingKeys.self)
+            azimuth = try container.decode(Double.self, forKey: .azimuth)
+            altitude = try container.decode(Double.self, forKey: .altitude)
+            viewAngle = try container.decode(Double.self, forKey: .viewAngle)
+            roll = try container.decodeIfPresent(Double.self, forKey: .roll) ?? 0
+            panX = try container.decodeIfPresent(Double.self, forKey: .panX) ?? 0
+            panY = try container.decodeIfPresent(Double.self, forKey: .panY) ?? 0
+        }
     }
 
-    struct StarMapConfig: Equatable {
+    struct StarMapConfig: Equatable, Codable {
         var showAzimuthalGrid = true
         var showEquatorialGrid = false
         var showEclipticLine = false
@@ -89,136 +132,271 @@ struct AstronomyPluginSettings {
         var favorites: [FavoriteConfig] = []
         var directions: [DirectionConfig] = []
         var celestialPaths: [CelestialPathConfig] = []
-        var recentlyViewed: [RecentlyViewedItem] = []
-    }
-
-    static let storageKey = "astronomy_settings"
-    private static let keyCommon = "common"
-    private static let keyShowRegularMap = "showRegularMap"
-    private static let keyStarMap = "star_map"
-    private static let keyShowAzimuthal = "showAzimuthalGrid"
-    private static let keyShowEquatorial = "showEquatorialGrid"
-    private static let keyShowEcliptic = "showEclipticLine"
-    private static let keyShowMeridian = "showMeridianLine"
-    private static let keyShowEquator = "showEquatorLine"
-    private static let keyShowGalactic = "showGalacticLine"
-    private static let keyShowSun = "showSun"
-    private static let keyShowMoon = "showMoon"
-    private static let keyShowPlanets = "showPlanets"
-    private static let keyShowFavorites = "showFavorites"
-    private static let keyShowDirections = "showDirections"
-    private static let keyShowCelestialPaths = "showCelestialPaths"
-    private static let keyShowRedFilter = "showRedFilter"
-    private static let keyShowConstellations = "showConstellations"
-    private static let keyShowStars = "showStars"
-    private static let keyShowGalaxies = "showGalaxies"
-    private static let keyShowNebulae = "showNebulae"
-    private static let keyShowOpenClusters = "showOpenClusters"
-    private static let keyShowGlobularClusters = "showGlobularClusters"
-    private static let keyShowGalaxyClusters = "showGalaxyClusters"
-    private static let keyShowBlackHoles = "showBlackHoles"
-    private static let keyIs2DMode = "is2DMode"
-    private static let keyShowMagnitudeFilter = "showMagnitudeFilter"
-    private static let keyMagnitudeFilter = "magnitudeFilter"
-    private static let keyFavorites = "favorites"
-    private static let keyDirections = "directions"
-    private static let keyCelestialPaths = "celestialPaths"
-    private static let keyId = "id"
-    private static let keyColorIndex = "colorIndex"
-    private static let keyLabel = "label"
-    private static let keyRecentlyViewed = "recentlyViewed"
-    private static let storageQueue = DispatchQueue(label: "net.osmand.astronomy.settings")
+        var savedMapPosition: MapViewPosition?
+
+        init(
+            showAzimuthalGrid: Bool = true,
+            showEquatorialGrid: Bool = false,
+            showEclipticLine: Bool = false,
+            showMeridianLine: Bool = false,
+            showEquatorLine: Bool = false,
+            showGalacticLine: Bool = false,
+            showFavorites: Bool = true,
+            showDirections: Bool = true,
+            showCelestialPaths: Bool = true,
+            showRedFilter: Bool = false,
+            showSun: Bool = true,
+            showMoon: Bool = true,
+            showPlanets: Bool = true,
+            showConstellations: Bool = false,
+            showStars: Bool = false,
+            showGalaxies: Bool = false,
+            showNebulae: Bool = false,
+            showOpenClusters: Bool = false,
+            showGlobularClusters: Bool = false,
+            showGalaxyClusters: Bool = false,
+            showBlackHoles: Bool = false,
+            is2DMode: Bool = false,
+            showMagnitudeFilter: Bool = false,
+            magnitudeFilter: Double? = nil,
+            favorites: [FavoriteConfig] = [],
+            directions: [DirectionConfig] = [],
+            celestialPaths: [CelestialPathConfig] = [],
+            savedMapPosition: MapViewPosition? = nil
+        ) {
+            self.showAzimuthalGrid = showAzimuthalGrid
+            self.showEquatorialGrid = showEquatorialGrid
+            self.showEclipticLine = showEclipticLine
+            self.showMeridianLine = showMeridianLine
+            self.showEquatorLine = showEquatorLine
+            self.showGalacticLine = showGalacticLine
+            self.showFavorites = showFavorites
+            self.showDirections = showDirections
+            self.showCelestialPaths = showCelestialPaths
+            self.showRedFilter = showRedFilter
+            self.showSun = showSun
+            self.showMoon = showMoon
+            self.showPlanets = showPlanets
+            self.showConstellations = showConstellations
+            self.showStars = showStars
+            self.showGalaxies = showGalaxies
+            self.showNebulae = showNebulae
+            self.showOpenClusters = showOpenClusters
+            self.showGlobularClusters = showGlobularClusters
+            self.showGalaxyClusters = showGalaxyClusters
+            self.showBlackHoles = showBlackHoles
+            self.is2DMode = is2DMode
+            self.showMagnitudeFilter = showMagnitudeFilter
+            self.magnitudeFilter = magnitudeFilter
+            self.favorites = favorites
+            self.directions = directions
+            self.celestialPaths = celestialPaths
+            self.savedMapPosition = savedMapPosition
+        }
+
+        init(from decoder: Decoder) throws {
+            let container = try decoder.container(keyedBy: CodingKeys.self)
+            showAzimuthalGrid = try container.decodeIfPresent(Bool.self, forKey: .showAzimuthalGrid) ?? true
+            showEquatorialGrid = try container.decodeIfPresent(Bool.self, forKey: .showEquatorialGrid) ?? false
+            showEclipticLine = try container.decodeIfPresent(Bool.self, forKey: .showEclipticLine) ?? false
+            showMeridianLine = try container.decodeIfPresent(Bool.self, forKey: .showMeridianLine) ?? false
+            showEquatorLine = try container.decodeIfPresent(Bool.self, forKey: .showEquatorLine) ?? false
+            showGalacticLine = try container.decodeIfPresent(Bool.self, forKey: .showGalacticLine) ?? false
+            showFavorites = try container.decodeIfPresent(Bool.self, forKey: .showFavorites) ?? true
+            showDirections = try container.decodeIfPresent(Bool.self, forKey: .showDirections) ?? true
+            showCelestialPaths = try container.decodeIfPresent(Bool.self, forKey: .showCelestialPaths) ?? true
+            showRedFilter = try container.decodeIfPresent(Bool.self, forKey: .showRedFilter) ?? false
+            showSun = try container.decodeIfPresent(Bool.self, forKey: .showSun) ?? true
+            showMoon = try container.decodeIfPresent(Bool.self, forKey: .showMoon) ?? true
+            showPlanets = try container.decodeIfPresent(Bool.self, forKey: .showPlanets) ?? true
+            showConstellations = try container.decodeIfPresent(Bool.self, forKey: .showConstellations) ?? false
+            showStars = try container.decodeIfPresent(Bool.self, forKey: .showStars) ?? false
+            showGalaxies = try container.decodeIfPresent(Bool.self, forKey: .showGalaxies) ?? false
+            showNebulae = try container.decodeIfPresent(Bool.self, forKey: .showNebulae) ?? false
+            showOpenClusters = try container.decodeIfPresent(Bool.self, forKey: .showOpenClusters) ?? false
+            showGlobularClusters = try container.decodeIfPresent(Bool.self, forKey: .showGlobularClusters) ?? false
+            showGalaxyClusters = try container.decodeIfPresent(Bool.self, forKey: .showGalaxyClusters) ?? false
+            showBlackHoles = try container.decodeIfPresent(Bool.self, forKey: .showBlackHoles) ?? false
+            is2DMode = try container.decodeIfPresent(Bool.self, forKey: .is2DMode) ?? false
+            showMagnitudeFilter = try container.decodeIfPresent(Bool.self, forKey: .showMagnitudeFilter) ?? false
+            magnitudeFilter = try container.decodeIfPresent(Double.self, forKey: .magnitudeFilter)
+            favorites = try container.decodeIfPresent([FavoriteConfig].self, forKey: .favorites) ?? []
+            directions = try container.decodeIfPresent([DirectionConfig].self, forKey: .directions) ?? []
+            celestialPaths = try container.decodeIfPresent([CelestialPathConfig].self, forKey: .celestialPaths) ?? []
+            savedMapPosition = try container.decodeIfPresent(MapViewPosition.self, forKey: .savedMapPosition)
+        }
+
+        func encode(to encoder: Encoder) throws {
+            var container = encoder.container(keyedBy: CodingKeys.self)
+            try container.encode(showAzimuthalGrid, forKey: .showAzimuthalGrid)
+            try container.encode(showEquatorialGrid, forKey: .showEquatorialGrid)
+            try container.encode(showEclipticLine, forKey: .showEclipticLine)
+            try container.encode(showMeridianLine, forKey: .showMeridianLine)
+            try container.encode(showEquatorLine, forKey: .showEquatorLine)
+            try container.encode(showGalacticLine, forKey: .showGalacticLine)
+            try container.encode(showFavorites, forKey: .showFavorites)
+            try container.encode(showDirections, forKey: .showDirections)
+            try container.encode(showCelestialPaths, forKey: .showCelestialPaths)
+            try container.encode(showRedFilter, forKey: .showRedFilter)
+            try container.encode(showSun, forKey: .showSun)
+            try container.encode(showMoon, forKey: .showMoon)
+            try container.encode(showPlanets, forKey: .showPlanets)
+            try container.encode(showConstellations, forKey: .showConstellations)
+            try container.encode(showStars, forKey: .showStars)
+            try container.encode(showGalaxies, forKey: .showGalaxies)
+            try container.encode(showNebulae, forKey: .showNebulae)
+            try container.encode(showOpenClusters, forKey: .showOpenClusters)
+            try container.encode(showGlobularClusters, forKey: .showGlobularClusters)
+            try container.encode(showGalaxyClusters, forKey: .showGalaxyClusters)
+            try container.encode(showBlackHoles, forKey: .showBlackHoles)
+            try container.encode(is2DMode, forKey: .is2DMode)
+            try container.encode(showMagnitudeFilter, forKey: .showMagnitudeFilter)
+            
+            try container.encodeIfPresent(magnitudeFilter, forKey: .magnitudeFilter)
+            if !favorites.isEmpty {
+                try container.encode(favorites, forKey: .favorites)
+            }
+            if !directions.isEmpty {
+                try container.encode(directions, forKey: .directions)
+            }
+            if !celestialPaths.isEmpty {
+                try container.encode(celestialPaths, forKey: .celestialPaths)
+            }
+            try container.encodeIfPresent(savedMapPosition, forKey: .savedMapPosition)
+        }
+
+        private enum CodingKeys: String, CodingKey {
+            case showAzimuthalGrid
+            case showEquatorialGrid
+            case showEclipticLine
+            case showMeridianLine
+            case showEquatorLine
+            case showGalacticLine
+            case showFavorites
+            case showDirections
+            case showCelestialPaths
+            case showRedFilter
+            case showSun
+            case showMoon
+            case showPlanets
+            case showConstellations
+            case showStars
+            case showGalaxies
+            case showNebulae
+            case showOpenClusters
+            case showGlobularClusters
+            case showGalaxyClusters
+            case showBlackHoles
+            case is2DMode
+            case showMagnitudeFilter
+            case magnitudeFilter
+            case favorites
+            case directions
+            case celestialPaths
+            case savedMapPosition
+        }
+    }
+
+    private struct SettingsStorage: Codable {
+        var common: CommonConfig?
+        var starMap: StarMapConfig?
+
+        enum CodingKeys: String, CodingKey {
+            case common
+            case starMap = "star_map"
+        }
+    }
+
+    private struct RecentChipDTO: Codable {
+        var label: String
+        var objectId: String?
+    }
+
+    private static let encoder = JSONEncoder()
+    private static let decoder = JSONDecoder()
 
     var common = CommonConfig()
     var starMap = StarMapConfig()
 
-    static func load() -> AstronomyPluginSettings {
-        storageQueue.sync {
-            loadUnlocked()
-        }
-    }
+    private let settingsPref: OACommonString?
+    private let recentPref: OACommonString?
+    private let lock = NSLock()
 
-    func save() {
-        Self.storageQueue.sync {
-            Self.saveUnlocked(self)
-        }
+    init(settingsPref: OACommonString, recentPref: OACommonString? = nil) {
+        self.settingsPref = settingsPref
+        self.recentPref = recentPref
+        reloadFromPreference()
     }
-    
-    mutating func addRecentlyViewed(id: String, label: String) {
-        updateStarMapConfig { config in
-            var updated = config
-            updated.recentlyViewed.removeAll { $0.id == id }
-            updated.recentlyViewed.insert(RecentlyViewedItem(id: id, label: label), at: 0)
-            updated.recentlyViewed = Array(updated.recentlyViewed.prefix(8))
-            return updated
-        }
+
+    init() {
+        self.settingsPref = nil
+        self.recentPref = nil
     }
 
-    private static func loadUnlocked() -> AstronomyPluginSettings {
-        guard let root = settingsJsonUnlocked() else {
-            return AstronomyPluginSettings()
-        }
-        var settings = AstronomyPluginSettings()
-        settings.common = parseCommonConfig(root[Self.keyCommon] as? [String: Any])
-        settings.starMap = parseStarMapConfig(root[Self.keyStarMap] as? [String: Any])
-        return settings
+    func copyForUI() -> AstronomyPluginSettings {
+        let copy = AstronomyPluginSettings()
+        copy.common = common
+        copy.starMap = starMap
+        return copy
     }
 
-    private static func saveUnlocked(_ settings: AstronomyPluginSettings) {
-        var root: [String: Any] = [:]
-        root[Self.keyCommon] = [
-            Self.keyShowRegularMap: settings.common.showRegularMap
-        ]
-        root[Self.keyStarMap] = Self.serializeStarMapConfig(settings.starMap)
-        guard let data = try? JSONSerialization.data(withJSONObject: root),
-              let string = String(data: data, encoding: .utf8) else {
-            return
-        }
-        UserDefaults.standard.set(string, forKey: Self.storageKey)
+    func reloadFromPreference() {
+        lock.lock()
+        defer { lock.unlock() }
+        let storage = readStorageUnlocked()
+        common = storage.common ?? CommonConfig()
+        starMap = storage.starMap ?? StarMapConfig()
     }
 
-    func getCommonConfig() -> CommonConfig {
-        common
+    func commonConfig() -> CommonConfig {
+        lock.lock()
+        defer { lock.unlock() }
+        let config = readStorageUnlocked().common ?? CommonConfig()
+        common = config
+        return config
     }
 
-    mutating func setCommonConfig(_ config: CommonConfig) {
-        self = Self.storageQueue.sync {
-            var settings = Self.loadUnlocked()
-            settings.common = config
-            Self.saveUnlocked(settings)
-            return settings
-        }
+    func setCommonConfig(_ config: CommonConfig) {
+        lock.lock()
+        defer { lock.unlock() }
+        var storage = readStorageUnlocked()
+        storage.common = config
+        writeStorageUnlocked(storage)
+        common = config
     }
 
-    func getStarMapConfig() -> StarMapConfig {
-        starMap
+    func starMapConfig() -> StarMapConfig {
+        lock.lock()
+        defer { lock.unlock() }
+        let config = readStorageUnlocked().starMap ?? StarMapConfig()
+        starMap = config
+        return config
     }
 
-    mutating func setStarMapConfig(_ config: StarMapConfig) {
-        self = Self.storageQueue.sync {
-            var settings = Self.loadUnlocked()
-            settings.starMap = config
-            Self.saveUnlocked(settings)
-            return settings
-        }
+    func setStarMapConfig(_ config: StarMapConfig) {
+        lock.lock()
+        defer { lock.unlock() }
+        var storage = readStorageUnlocked()
+        storage.starMap = config
+        writeStorageUnlocked(storage)
+        starMap = config
     }
 
-    @discardableResult
-    mutating func updateStarMapConfig(_ transform: (StarMapConfig) -> StarMapConfig) -> StarMapConfig {
-        let result = Self.storageQueue.sync {
-            var settings = Self.loadUnlocked()
-            let updated = transform(settings.starMap)
-            if updated != settings.starMap {
-                settings.starMap = updated
-                Self.saveUnlocked(settings)
-            }
-            return (settings, updated)
+    @discardableResult func updateStarMapConfig(_ transform: (StarMapConfig) -> StarMapConfig) -> StarMapConfig {
+        lock.lock()
+        defer { lock.unlock() }
+        var storage = readStorageUnlocked()
+        let current = storage.starMap ?? StarMapConfig()
+        let updated = transform(current)
+        if updated != current {
+            storage.starMap = updated
+            writeStorageUnlocked(storage)
         }
-        self = result.0
-        return result.1
+        starMap = updated
+        return updated
     }
 
-    mutating func addFavorite(id: String) {
+    func addFavorite(id: String) {
         updateStarMapConfig { config in
             guard !config.favorites.contains(where: { $0.id == id }) else {
                 return config
@@ -229,7 +407,7 @@ struct AstronomyPluginSettings {
         }
     }
 
-    mutating func removeFavorite(id: String) {
+    func removeFavorite(id: String) {
         updateStarMapConfig { config in
             var updated = config
             updated.favorites.removeAll { $0.id == id }
@@ -237,7 +415,7 @@ struct AstronomyPluginSettings {
         }
     }
 
-    mutating func addDirection(id: String) -> Int {
+    func addDirection(id: String) -> Int {
         var resultColor = 0
         updateStarMapConfig { config in
             if let direction = config.directions.first(where: { $0.id == id }) {
@@ -254,7 +432,7 @@ struct AstronomyPluginSettings {
         return resultColor
     }
 
-    mutating func removeDirection(id: String) {
+    func removeDirection(id: String) {
         updateStarMapConfig { config in
             var updated = config
             updated.directions.removeAll { $0.id == id }
@@ -262,7 +440,7 @@ struct AstronomyPluginSettings {
         }
     }
 
-    mutating func addCelestialPath(id: String) {
+    func addCelestialPath(id: String) {
         updateStarMapConfig { config in
             guard !config.celestialPaths.contains(where: { $0.id == id }) else {
                 return config
@@ -273,7 +451,7 @@ struct AstronomyPluginSettings {
         }
     }
 
-    mutating func removeCelestialPath(id: String) {
+    func removeCelestialPath(id: String) {
         updateStarMapConfig { config in
             var updated = config
             updated.celestialPaths.removeAll { $0.id == id }
@@ -281,173 +459,72 @@ struct AstronomyPluginSettings {
         }
     }
 
-    private static func settingsJsonUnlocked() -> [String: Any]? {
-        guard let json = UserDefaults.standard.string(forKey: storageKey),
-              !json.isEmpty,
-              let data = json.data(using: .utf8),
-              let root = try? JSONSerialization.jsonObject(with: data) as? [String: Any] else {
-            return nil
-        }
-        return root
-    }
+    // MARK: - Recently viewed (global, all profiles)
 
-    private static func parseCommonConfig(_ json: [String: Any]?) -> CommonConfig {
-        CommonConfig(showRegularMap: bool(json?[keyShowRegularMap], fallback: false))
+    func recentChips() -> [StarMapRecentChip] {
+        lock.lock()
+        defer { lock.unlock() }
+        return readRecentChipsUnlocked()
     }
 
-    private static func parseStarMapConfig(_ json: [String: Any]?) -> StarMapConfig {
-        var nextColor = 0
-        return StarMapConfig(showAzimuthalGrid: bool(json?[keyShowAzimuthal], fallback: true),
-                             showEquatorialGrid: bool(json?[keyShowEquatorial], fallback: false),
-                             showEclipticLine: bool(json?[keyShowEcliptic], fallback: false),
-                             showMeridianLine: bool(json?[keyShowMeridian], fallback: false),
-                             showEquatorLine: bool(json?[keyShowEquator], fallback: false),
-                             showGalacticLine: bool(json?[keyShowGalactic], fallback: false),
-                             showFavorites: bool(json?[keyShowFavorites], fallback: true),
-                             showDirections: bool(json?[keyShowDirections], fallback: true),
-                             showCelestialPaths: bool(json?[keyShowCelestialPaths], fallback: true),
-                             showRedFilter: bool(json?[keyShowRedFilter], fallback: false),
-                             showSun: bool(json?[keyShowSun], fallback: true),
-                             showMoon: bool(json?[keyShowMoon], fallback: true),
-                             showPlanets: bool(json?[keyShowPlanets], fallback: true),
-                             showConstellations: bool(json?[keyShowConstellations], fallback: false),
-                             showStars: bool(json?[keyShowStars], fallback: false),
-                             showGalaxies: bool(json?[keyShowGalaxies], fallback: false),
-                             showNebulae: bool(json?[keyShowNebulae], fallback: false),
-                             showOpenClusters: bool(json?[keyShowOpenClusters], fallback: false),
-                             showGlobularClusters: bool(json?[keyShowGlobularClusters], fallback: false),
-                             showGalaxyClusters: bool(json?[keyShowGalaxyClusters], fallback: false),
-                             showBlackHoles: bool(json?[keyShowBlackHoles], fallback: false),
-                             is2DMode: bool(json?[keyIs2DMode], fallback: false),
-                             showMagnitudeFilter: bool(json?[keyShowMagnitudeFilter], fallback: false),
-                             magnitudeFilter: double(json?[keyMagnitudeFilter]),
-                             favorites: parseItems(json?[keyFavorites]) { FavoriteConfig(id: $0) },
-                             directions: parseItems(json?[keyDirections]) { item, id in
-                                 defer { nextColor += 1 }
-                                 return DirectionConfig(id: id,
-                                                        colorIndex: int(item[keyColorIndex], fallback: nextColor % DirectionColor.allCases.count))
-                             },
-                             celestialPaths: parseItems(json?[keyCelestialPaths]) { CelestialPathConfig(id: $0) },
-                             recentlyViewed: parseRecentlyItems(json?[keyRecentlyViewed]))
+    func setRecentChips(_ chips: [StarMapRecentChip]) {
+        lock.lock()
+        defer { lock.unlock() }
+        writeRecentChipsUnlocked(chips)
     }
 
-    private static func serializeStarMapConfig(_ config: StarMapConfig) -> [String: Any] {
-        var json: [String: Any] = [
-            keyShowAzimuthal: config.showAzimuthalGrid,
-            keyShowEquatorial: config.showEquatorialGrid,
-            keyShowEcliptic: config.showEclipticLine,
-            keyShowMeridian: config.showMeridianLine,
-            keyShowEquator: config.showEquatorLine,
-            keyShowGalactic: config.showGalacticLine,
-            keyShowFavorites: config.showFavorites,
-            keyShowDirections: config.showDirections,
-            keyShowCelestialPaths: config.showCelestialPaths,
-            keyShowRedFilter: config.showRedFilter,
-            keyShowSun: config.showSun,
-            keyShowMoon: config.showMoon,
-            keyShowPlanets: config.showPlanets,
-            keyShowConstellations: config.showConstellations,
-            keyShowStars: config.showStars,
-            keyShowGalaxies: config.showGalaxies,
-            keyShowNebulae: config.showNebulae,
-            keyShowOpenClusters: config.showOpenClusters,
-            keyShowGlobularClusters: config.showGlobularClusters,
-            keyShowGalaxyClusters: config.showGalaxyClusters,
-            keyShowBlackHoles: config.showBlackHoles,
-            keyIs2DMode: config.is2DMode,
-            keyShowMagnitudeFilter: config.showMagnitudeFilter
-        ]
-        if let magnitudeFilter = config.magnitudeFilter {
-            json[keyMagnitudeFilter] = magnitudeFilter
-        }
-        if !config.favorites.isEmpty {
-            json[keyFavorites] = config.favorites.map { [keyId: $0.id] }
-        }
-        if !config.directions.isEmpty {
-            json[keyDirections] = config.directions.map { [keyId: $0.id, keyColorIndex: $0.colorIndex] }
-        }
-        if !config.celestialPaths.isEmpty {
-            json[keyCelestialPaths] = config.celestialPaths.map { [keyId: $0.id] }
+    // MARK: - Codable I/O
+
+    private func readStorageUnlocked() -> SettingsStorage {
+        guard let settingsPref else {
+            return SettingsStorage()
         }
-        if !config.recentlyViewed.isEmpty {
-            json[keyRecentlyViewed] = config.recentlyViewed.map { [keyId: $0.id, keyLabel: $0.label] }
+        let str = settingsPref.get()
+        guard !str.isEmpty, let data = str.data(using: .utf8) else {
+            return SettingsStorage()
         }
-        return json
+        return (try? Self.decoder.decode(SettingsStorage.self, from: data)) ?? SettingsStorage()
     }
-    
-    private static func parseRecentlyItems(_ value: Any?) -> [RecentlyViewedItem] {
-        guard let array = value as? [[String: Any]] else {
-            return []
+
+    private func writeStorageUnlocked(_ storage: SettingsStorage) {
+        guard let settingsPref else {
+            return
         }
-        return array.compactMap { item in
-            guard let id = item[keyId] as? String,
-                    !id.isEmpty,
-                    let label = item[keyLabel] as? String,
-                    !label.isEmpty else {
-                return nil
-            }
-            return RecentlyViewedItem(id: id, label: label)
+        guard let data = try? Self.encoder.encode(storage),
+              let string = String(data: data, encoding: .utf8) else {
+            return
         }
+        settingsPref.set(string)
     }
 
-    private static func parseItems<T>(_ value: Any?, factory: (String) -> T) -> [T] {
-        guard let array = value as? [[String: Any]] else {
+    private func readRecentChipsUnlocked() -> [StarMapRecentChip] {
+        guard let recentPref else {
             return []
         }
-        return array.compactMap { item in
-            guard let id = item[keyId] as? String, !id.isEmpty else {
-                return nil
-            }
-            return factory(id)
-        }
-    }
-
-    private static func parseItems<T>(_ value: Any?, factory: ([String: Any], String) -> T) -> [T] {
-        guard let array = value as? [[String: Any]] else {
+        let str = recentPref.get()
+        guard !str.isEmpty,
+              let data = str.data(using: .utf8),
+              let dtos = try? Self.decoder.decode([RecentChipDTO].self, from: data) else {
             return []
         }
-        return array.compactMap { item in
-            guard let id = item[keyId] as? String, !id.isEmpty else {
+        return dtos.compactMap { dto in
+            let label = dto.label.trimmingCharacters(in: .whitespacesAndNewlines)
+            guard !label.isEmpty else {
                 return nil
             }
-            return factory(item, id)
-        }
-    }
-
-    private static func bool(_ value: Any?, fallback defaultValue: Bool) -> Bool {
-        if let value = value as? Bool {
-            return value
-        }
-        if let value = value as? NSNumber {
-            return value.boolValue
-        }
-        return defaultValue
-    }
-
-    private static func int(_ value: Any?, fallback defaultValue: Int) -> Int {
-        if let value = value as? Int {
-            return value
-        }
-        if let value = value as? NSNumber {
-            return value.intValue
-        }
-        if let value = value as? String {
-            return Int(value) ?? defaultValue
+            return StarMapRecentChip(label: label, objectId: dto.objectId)
         }
-        return defaultValue
     }
 
-    private static func double(_ value: Any?) -> Double? {
-        if let value = value as? Double {
-            return value.isNaN ? nil : value
-        }
-        if let value = value as? NSNumber {
-            let double = value.doubleValue
-            return double.isNaN ? nil : double
+    private func writeRecentChipsUnlocked(_ chips: [StarMapRecentChip]) {
+        guard let recentPref else {
+            return
         }
-        if let value = value as? String, let double = Double(value) {
-            return double.isNaN ? nil : double
+        let dtos = chips.map { RecentChipDTO(label: $0.label, objectId: $0.objectId) }
+        guard let data = try? Self.encoder.encode(dtos),
+              let string = String(data: data, encoding: .utf8) else {
+            return
         }
-        return nil
+        recentPref.set(string)
     }
 }
diff --git a/Sources/Plugins/Astronomy/DateTimeSelectionView.swift b/Sources/Plugins/Astronomy/DateTimeSelectionView.swift
index 8ed094ebeb..9a413dd8dc 100644
--- a/Sources/Plugins/Astronomy/DateTimeSelectionView.swift
+++ b/Sources/Plugins/Astronomy/DateTimeSelectionView.swift
@@ -16,11 +16,19 @@ final class DateTimeSelectionView: UIView {
         case hour
         case minute
     }
+    
+    var onDateTimeChange: ((Date) -> Void)?
 
-    private var currentDate = Date()
-    private var onDateTimeChangeListener: ((Date) -> Void)?
+    var date = Date() {
+        didSet {
+            updateDisplay()
+        }
+    }
     private let calendar = Calendar.current
     private var labels: [Field: UILabel] = [:]
+    private var buttons: [UIButton] = []
+    private var nightMode: Bool = false
+    private weak var glassBackgroundView: UIVisualEffectView?
 
     override init(frame: CGRect) {
         super.init(frame: frame)
@@ -31,11 +39,32 @@ final class DateTimeSelectionView: UIView {
         super.init(coder: coder)
         initViews()
     }
+    
+    func updateTheme(nightMod: Bool, active: Bool) {
+        self.nightMode = nightMod
+        applyColors()
+    }
+    
+    private func applyColors() {
+        backgroundColor = StarMapControlTheme.defaultBackground(nightMode: nightMode, alpha: StarMapControlTheme.defaultBackgroundAlpha)
+        layer.borderWidth = nightMode ? 2 : 0
+        let color: UIColor = nightMode ? .textColorPrimary.dark : .textColorPrimary.light
+        labels.forEach {
+            $1.textColor = color
+        }
+        buttons.forEach {
+            $0.tintColor = color
+        }
+    }
 
     private func initViews() {
-        backgroundColor = UIColor.black.withAlphaComponent(0.67)
-        layer.cornerRadius = 0
-        layer.shadowOpacity = 0
+        layer.cornerRadius = 24
+        layer.shadowColor = UIColor.black.cgColor
+        layer.shadowOpacity = 0.35
+        layer.shadowRadius = 5
+        layer.shadowOffset = CGSize(width: 0, height: 2)
+        layer.borderColor = StarMapControlTheme.border(nightMode: nightMode).cgColor
+        clipsToBounds = true
 
         let stack = UIStackView()
         stack.axis = .horizontal
@@ -52,6 +81,12 @@ final class DateTimeSelectionView: UIView {
         stack.setCustomSpacing(8, after: stack.arrangedSubviews[2])
         addColumn(.hour, to: stack)
         addColumn(.minute, to: stack)
+        
+        glassBackgroundView = StarMapGlassBackground.apply(
+            to: self,
+            nightMode: nightMode,
+            cornerRadius: 24
+        )
 
         NSLayoutConstraint.activate([
             stack.leadingAnchor.constraint(equalTo: leadingAnchor),
@@ -60,6 +95,7 @@ final class DateTimeSelectionView: UIView {
             stack.bottomAnchor.constraint(equalTo: bottomAnchor)
         ])
         updateDisplay()
+        applyColors()
     }
 
     private func addColumn(_ field: Field, to parent: UIStackView) {
@@ -68,31 +104,36 @@ final class DateTimeSelectionView: UIView {
         column.alignment = .center
         column.spacing = 2
 
-        let up = makeStepButton(iconName: "ic_custom_arrow_up")
-        up.addAction(UIAction { [weak self] _ in self?.step(field, amount: field == .minute ? 5 : 1) }, for: .touchUpInside)
+        let up = makeStepButton(icon: .icCustomArrowUp)
+        up.addAction(UIAction { [weak self] _ in
+            self?.step(field, amount: field == .minute ? 5 : 1)
+        }, for: .touchUpInside)
         column.addArrangedSubview(up)
 
         let label = UILabel()
-        label.textColor = .white
+        label.textColor = nightMode ? .textColorPrimary.dark : .textColorPrimary.light
         label.font = UIFont.monospacedDigitSystemFont(ofSize: 18, weight: .bold)
         label.textAlignment = .center
         label.widthAnchor.constraint(greaterThanOrEqualToConstant: field == .year ? 52 : 32).isActive = true
         labels[field] = label
         column.addArrangedSubview(label)
 
-        let down = makeStepButton(iconName: "ic_custom_arrow_down")
-        down.addAction(UIAction { [weak self] _ in self?.step(field, amount: field == .minute ? -5 : -1) }, for: .touchUpInside)
+        let down = makeStepButton(icon: .icCustomArrowDown)
+        down.addAction(UIAction { [weak self] _ in
+            self?.step(field, amount: field == .minute ? -5 : -1)
+        }, for: .touchUpInside)
         column.addArrangedSubview(down)
 
         parent.addArrangedSubview(column)
     }
 
-    private func makeStepButton(iconName: String) -> UIButton {
+    private func makeStepButton(icon: UIImage) -> UIButton {
         let button = UIButton(type: .system)
-        button.tintColor = .white
-        button.setImage(AstroIcon.template(iconName), for: .normal)
+        button.tintColor = nightMode ? .textColorPrimary.dark : .textColorPrimary.light
+        button.setImage(icon, for: .normal)
         button.widthAnchor.constraint(equalToConstant: 40).isActive = true
         button.heightAnchor.constraint(equalToConstant: 40).isActive = true
+        buttons.append(button)
         return button
     }
 
@@ -110,32 +151,18 @@ final class DateTimeSelectionView: UIView {
         case .minute:
             component = .minute
         }
-        if let date = calendar.date(byAdding: component, value: amount, to: currentDate) {
-            currentDate = date
-            updateDisplay()
-            onDateTimeChangeListener?(currentDate)
+        if let newDate = calendar.date(byAdding: component, value: amount, to: date) {
+            date = newDate
+            onDateTimeChange?(newDate)
         }
     }
 
     private func updateDisplay() {
-        let components = calendar.dateComponents([.year, .month, .day, .hour, .minute], from: currentDate)
+        let components = calendar.dateComponents([.year, .month, .day, .hour, .minute], from: date)
         labels[.year]?.text = String(format: "%04d", components.year ?? 0)
         labels[.month]?.text = String(format: "%02d", components.month ?? 0)
         labels[.day]?.text = String(format: "%02d", components.day ?? 0)
         labels[.hour]?.text = String(format: "%02d", components.hour ?? 0)
         labels[.minute]?.text = String(format: "%02d", components.minute ?? 0)
     }
-
-    func setOnDateTimeChangeListener(_ listener: @escaping (Date) -> Void) {
-        onDateTimeChangeListener = listener
-    }
-
-    func setDateTime(_ date: Date) {
-        currentDate = date
-        updateDisplay()
-    }
-
-    func getDateTime() -> Date {
-        currentDate
-    }
 }
diff --git a/Sources/Plugins/Astronomy/StarCompassButton.swift b/Sources/Plugins/Astronomy/StarCompassButton.swift
index 8985698a31..45a1014dd8 100644
--- a/Sources/Plugins/Astronomy/StarCompassButton.swift
+++ b/Sources/Plugins/Astronomy/StarCompassButton.swift
@@ -12,6 +12,7 @@ final class StarCompassButton: StarMapButton {
     var onSingleTap: (() -> Void)?
     private let arrowView = UIImageView(image: AstroIcon.original("ic_custom_direction_compass"))
     private var currentRotation: CGFloat = 0
+    private var arDirectionEnabled = false
 
     override init(frame: CGRect) {
         super.init(frame: frame)
@@ -34,12 +35,29 @@ final class StarCompassButton: StarMapButton {
             arrowView.transform = transform
         }
     }
+    
+    func setArDirectionEnabled(_ enabled: Bool) {
+        guard enabled != arDirectionEnabled else { return }
+        arDirectionEnabled = enabled
+        updateArrowIcon()
+    }
 
     override func updateTheme() {
         super.updateTheme()
         setImage(nil, for: .normal)
+        updateArrowIcon()
         arrowView.transform = CGAffineTransform(rotationAngle: currentRotation * .pi / 180.0)
     }
+    
+    private func updateArrowIcon() {
+        if arDirectionEnabled {
+            arrowView.image = .icCustomDirectionCompass.withRenderingMode(.alwaysOriginal)
+            arrowView.overrideUserInterfaceStyle = nightMode ? .dark : .light
+        } else {
+            arrowView.image = .icCustomDirectionManual.withRenderingMode(.alwaysOriginal)
+            arrowView.overrideUserInterfaceStyle = nightMode ? .dark : .light
+        }
+    }
 
     private func commonInit() {
         setImage(nil, for: .normal)
@@ -58,8 +76,4 @@ final class StarCompassButton: StarMapButton {
         }, for: .touchUpInside)
         updateTheme()
     }
-
-    func shouldShow() -> Bool {
-        true
-    }
 }
diff --git a/Sources/Plugins/Astronomy/StarMapARModeHelper.swift b/Sources/Plugins/Astronomy/StarMapARModeHelper.swift
index 853531b141..4849cfab70 100644
--- a/Sources/Plugins/Astronomy/StarMapARModeHelper.swift
+++ b/Sources/Plugins/Astronomy/StarMapARModeHelper.swift
@@ -35,21 +35,25 @@ final class StarMapARModeHelper {
             self == .magneticNorth
         }
     }
+    
+    private enum CoreMotionErrorCode {
+        static let deviceRequiresMovement = 101
+        static let trueNorthNotAvailable = 102
+    }
 
     private struct Vector3 {
         let x: Double
         let y: Double
         let z: Double
     }
+    
+    private(set) var isArModeEnabled = false
+    private(set) var isRunning = false
+    
+    var onOrientationChanged: ((_ azimuth: Double, _ altitude: Double, _ roll: Double) -> Void)?
+    var onUnavailable: (() -> Void)?
+    var onArModeChanged: ((_ enabled: Bool) -> Void)?
 
-    private enum CoreMotionErrorCode {
-        // CMErrorDeviceRequiresMovement in CoreMotion/CMError.h.
-        static let deviceRequiresMovement = 101
-        // CMErrorTrueNorthNotAvailable in CoreMotion/CMError.h.
-        static let trueNorthNotAvailable = 102
-    }
-
-    private var motionManager: CMMotionManager?
     private let queue = OperationQueue()
     private let minAlpha = 0.03
     private let maxAlpha = 0.3
@@ -59,24 +63,12 @@ final class StarMapARModeHelper {
     private var smoothedAltitude = 45.0
     private var activeReferenceFrame: ReferenceFrame?
     private var geomagneticDeclination: Double?
-
-    var onOrientationChanged: ((_ azimuth: Double, _ altitude: Double, _ roll: Double) -> Void)?
-    var onUnavailable: (() -> Void)?
-    var onArModeChanged: ((_ enabled: Bool) -> Void)?
-    private(set) var isArModeEnabled = false
-    private(set) var isRunning = false
-
+    private var motionManager: CMMotionManager?
+    
     init() {
         queue.maxConcurrentOperationCount = 1
     }
 
-    deinit {
-        onOrientationChanged = nil
-        onUnavailable = nil
-        onArModeChanged = nil
-        stopMotionUpdates(waitUntilFinished: true)
-    }
-
     func onResume() {
         if isArModeEnabled {
             _ = startMotionUpdates()
@@ -98,18 +90,20 @@ final class StarMapARModeHelper {
         toggleArMode(enable: !isArModeEnabled)
     }
 
-    func toggleArMode(enable: Bool) {
+    @discardableResult func toggleArMode(enable: Bool) -> Bool {
         guard isArModeEnabled != enable else {
-            return
+            return isArModeEnabled
         }
-
         if enable {
-            isArModeEnabled = true
-            if startMotionUpdates() {
-                onArModeChanged?(true)
+            guard startMotionUpdates() else {
+                return false
             }
+            isArModeEnabled = true
+            onArModeChanged?(true)
+            return true
         } else {
             disableArMode()
+            return false
         }
     }
 
@@ -298,4 +292,11 @@ final class StarMapARModeHelper {
         }
         return minAlpha + (absDelta - jitterThresh) * (maxAlpha - minAlpha) / (moveThresh - jitterThresh)
     }
+    
+    deinit {
+        onOrientationChanged = nil
+        onUnavailable = nil
+        onArModeChanged = nil
+        stopMotionUpdates(waitUntilFinished: true)
+    }
 }
diff --git a/Sources/Plugins/Astronomy/StarMapArControlCard.swift b/Sources/Plugins/Astronomy/StarMapArControlCard.swift
new file mode 100644
index 0000000000..c7459b4988
--- /dev/null
+++ b/Sources/Plugins/Astronomy/StarMapArControlCard.swift
@@ -0,0 +1,196 @@
+//
+//  StarMapArControlCard.swift
+//  OsmAnd Maps
+//
+//  Created by Vitaliy Sova on 09.07.2026.
+//  Copyright © 2026 OsmAnd. All rights reserved.
+//
+
+import UIKit
+
+final class StarMapArControlCard: UIView {
+    static let width: CGFloat = 48
+    private static let cornerRadius: CGFloat = 24
+    private static let innerButtonSize: CGFloat = 40
+    private static let sliderHeight: CGFloat = 150
+    private static let stackSpacing: CGFloat = 4
+
+    var onArTapped: (() -> Void)?
+    var onResetTapped: (() -> Void)?
+    var onTransparencyChanged: ((Int) -> Void)?
+
+    private let arButton = StarMapPlainButton()
+    private let resetButton = StarMapPlainButton()
+    private let transparencySlider = UISlider()
+    private let sliderContainer = UIView()
+    private let cameraControlsStack = UIStackView()
+    private let rootStack = UIStackView()
+
+    private var nightMode = false
+    private var arActive = false
+    
+    private weak var glassBackgroundView: UIVisualEffectView?
+
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        setupContent()
+        updateTheme(nightMode: nightMode, arActive: false)
+        setCameraControlsVisible(false)
+    }
+
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
+    func setArActive(_ active: Bool) {
+        arActive = active
+        arButton.updateTheme(nightmod: nightMode, active: active)
+        updateTheme(nightMode: nightMode, arActive: active)
+    }
+
+    func setCameraControlsVisible(_ visible: Bool) {
+        cameraControlsStack.isHidden = !visible
+    }
+
+    func setTransparencyValue(_ value: Int) {
+        transparencySlider.value = Float(max(0, min(100, value)))
+    }
+
+    func updateTheme(nightMode: Bool, arActive: Bool) {
+        self.nightMode = nightMode
+        self.arActive = arActive
+
+        glassBackgroundView?.overrideUserInterfaceStyle = nightMode ? .dark : .light
+        
+        backgroundColor = StarMapControlTheme.defaultBackground(nightMode: nightMode, alpha: StarMapControlTheme.defaultBackgroundAlpha)
+
+        resetButton.updateTheme(nightmod: nightMode, active: false)
+        
+        updateArButtonAppearance()
+        
+        layer.borderWidth = nightMode ? 2 : 0
+    }
+
+    override func layoutSubviews() {
+        super.layoutSubviews()
+        glassBackgroundView?.frame = bounds
+    }
+
+    private func setupContent() {
+        translatesAutoresizingMaskIntoConstraints = false
+        layer.cornerRadius = Self.cornerRadius
+        layer.shadowColor = UIColor.black.cgColor
+        layer.shadowOpacity = 0.35
+        layer.shadowRadius = 5
+        layer.shadowOffset = CGSize(width: 0, height: 2)
+        layer.borderColor = StarMapControlTheme.border(nightMode: nightMode).cgColor
+        
+        glassBackgroundView = StarMapGlassBackground.apply(
+            to: self,
+            nightMode: nightMode,
+            cornerRadius: Self.cornerRadius
+        )
+
+        configurePlainButton(
+            arButton,
+            icon: .icCustomViewInAr,
+            accessibilityLabel: localizedString("astro_ar"),
+            action: #selector(arButtonTapped)
+        )
+        configurePlainButton(
+            resetButton,
+            icon: .icCustomReset,
+            accessibilityLabel: localizedString("shared_string_reset"),
+            action: #selector(resetButtonTapped)
+        )
+        
+        arButton.customColorTintActive = StarMapControlTheme.activeForeground(nightMode: nightMode)
+        arButton.onHighlightChange = { [weak self] _ in
+            guard let self else { return }
+            self.arButton.updateTheme(nightmod: nightMode, active: arActive)
+        }
+
+        transparencySlider.minimumValue = 0
+        transparencySlider.maximumValue = 100
+        transparencySlider.value = Float(StarMapCameraHelper.defaultTransparency)
+        transparencySlider.transform = CGAffineTransform(rotationAngle: -.pi / 2)
+        transparencySlider.translatesAutoresizingMaskIntoConstraints = false
+        transparencySlider.addTarget(self, action: #selector(transparencyChanged), for: .valueChanged)
+
+        sliderContainer.translatesAutoresizingMaskIntoConstraints = false
+        sliderContainer.addSubview(transparencySlider)
+
+        cameraControlsStack.axis = .vertical
+        cameraControlsStack.alignment = .center
+        cameraControlsStack.spacing = 9
+        cameraControlsStack.addArrangedSubview(sliderContainer)
+        cameraControlsStack.addArrangedSubview(resetButton)
+
+        rootStack.axis = .vertical
+        rootStack.alignment = .center
+        rootStack.spacing = Self.stackSpacing
+        rootStack.layoutMargins = UIEdgeInsets(top: 4, left: 0, bottom: 4, right: 0)
+        rootStack.isLayoutMarginsRelativeArrangement = true
+        rootStack.addArrangedSubview(arButton)
+        rootStack.addArrangedSubview(cameraControlsStack)
+        rootStack.translatesAutoresizingMaskIntoConstraints = false
+        addSubview(rootStack)
+        
+        let sliderContainerHeightConstraint = sliderContainer.heightAnchor.constraint(equalToConstant: Self.sliderHeight)
+        sliderContainerHeightConstraint.priority = .defaultLow
+
+        NSLayoutConstraint.activate([
+            widthAnchor.constraint(equalToConstant: Self.width),
+
+            rootStack.leadingAnchor.constraint(equalTo: leadingAnchor),
+            rootStack.trailingAnchor.constraint(equalTo: trailingAnchor),
+            rootStack.topAnchor.constraint(equalTo: topAnchor),
+            rootStack.bottomAnchor.constraint(equalTo: bottomAnchor),
+
+            arButton.widthAnchor.constraint(equalToConstant: Self.innerButtonSize),
+            arButton.heightAnchor.constraint(equalToConstant: Self.innerButtonSize),
+
+            sliderContainer.widthAnchor.constraint(equalToConstant: Self.width),
+            sliderContainerHeightConstraint,
+
+            transparencySlider.centerXAnchor.constraint(equalTo: sliderContainer.centerXAnchor),
+            transparencySlider.centerYAnchor.constraint(equalTo: sliderContainer.centerYAnchor),
+            transparencySlider.widthAnchor.constraint(equalTo: sliderContainer.heightAnchor),
+            transparencySlider.heightAnchor.constraint(equalToConstant: 40),
+
+            resetButton.widthAnchor.constraint(equalToConstant: Self.innerButtonSize),
+            resetButton.heightAnchor.constraint(equalToConstant: Self.innerButtonSize)
+        ])
+
+        setContentCompressionResistancePriority(.defaultLow, for: .vertical)
+        setContentHuggingPriority(.defaultLow, for: .vertical)
+    }
+
+    private func configurePlainButton(
+        _ button: StarMapPlainButton,
+        icon: UIImage?,
+        accessibilityLabel: String,
+        action: Selector
+    ) {
+        button.setIcon(icon, accessibilityLabel: accessibilityLabel)
+        button.addTarget(self, action: action, for: .touchUpInside)
+    }
+    
+    private func updateArButtonAppearance() {
+        let icon: UIImage = arActive ? .icCustomViewInArFilled : .icCustomViewInAr
+        arButton.setIcon(icon, accessibilityLabel: localizedString("astro_ar"))
+        arButton.updateTheme(nightmod: nightMode, active: arActive)
+    }
+
+    @objc private func arButtonTapped() {
+        onArTapped?()
+    }
+
+    @objc private func resetButtonTapped() {
+        onResetTapped?()
+    }
+
+    @objc private func transparencyChanged() {
+        onTransparencyChanged?(Int(transparencySlider.value))
+    }
+}
diff --git a/Sources/Plugins/Astronomy/StarMapButton.swift b/Sources/Plugins/Astronomy/StarMapButton.swift
index c3b959b0e9..2bab5866fa 100644
--- a/Sources/Plugins/Astronomy/StarMapButton.swift
+++ b/Sources/Plugins/Astronomy/StarMapButton.swift
@@ -9,6 +9,8 @@
 import UIKit
 
 enum StarMapControlTheme {
+    static let defaultBackgroundAlpha: CGFloat = 0.7
+    
     static func resolved(_ color: UIColor, nightMode: Bool) -> UIColor {
         nightMode ? color.dark : color.light
     }
@@ -16,9 +18,13 @@ enum StarMapControlTheme {
     static func defaultBackground(nightMode: Bool, alpha: CGFloat) -> UIColor {
         resolved(.mapButtonBgColorDefault, nightMode: nightMode).withAlphaComponent(alpha)
     }
+    
+    static func pressedBackground(nightMode: Bool, alpha: CGFloat) -> UIColor {
+        resolved(.mapButtonBgColorTap, nightMode: nightMode).withAlphaComponent(alpha)
+    }
 
     static func activeBackground(alpha: CGFloat = 1) -> UIColor {
-        UIColor.mapButtonBgColorActive.withAlphaComponent(alpha)
+        .mapButtonBgColorActive.withAlphaComponent(alpha)
     }
 
     static func foreground(active: Bool, nightMode: Bool) -> UIColor {
@@ -28,61 +34,119 @@ enum StarMapControlTheme {
     static func activeForeground(nightMode: Bool) -> UIColor {
         resolved(.mapButtonIconColorActive, nightMode: nightMode)
     }
-
-    static func textColor(nightMode: Bool) -> UIColor {
-        resolved(.textColorPrimary, nightMode: nightMode)
-    }
-
-    static func borderWidth(active: Bool, nightMode: Bool) -> CGFloat {
-        active ? 0 : (nightMode ? 2 : 0)
-    }
-
-    static var borderColor: UIColor {
-        UIColor(rgb: color_on_map_icon_border_color)
+    
+    static func border(nightMode: Bool) -> UIColor {
+        resolved(.mapButtonBorder, nightMode: nightMode)
     }
 }
 
-class StarMapButton: UIButton {
+@objcMembers
+class StarMapButton: OAHudButton {
+    var showsHudChrome = true
+
     var active = false {
         didSet { updateTheme() }
     }
+
     var nightMode = false {
         didSet { updateTheme() }
     }
 
     override init(frame: CGRect) {
         super.init(frame: frame)
-        imageView?.contentMode = .scaleAspectFit
-        updateTheme()
+        commonInit()
     }
 
     required init?(coder: NSCoder) {
         super.init(coder: coder)
-        imageView?.contentMode = .scaleAspectFit
-        updateTheme()
+        commonInit()
     }
-
-    override func layoutSubviews() {
-        super.layoutSubviews()
-        layer.cornerRadius = min(bounds.width, bounds.height) / 2.0
+    
+    override func updateColors(forPressedState isPressed: Bool) {
+        super.updateColors(forPressedState: isPressed)
+        if showsHudChrome {
+            backgroundColor = backgroundColor?.withAlphaComponent(StarMapControlTheme.defaultBackgroundAlpha)
+        }
     }
 
-    func updateTheme() {
-        tintColor = StarMapControlTheme.foreground(active: active, nightMode: nightMode)
-        backgroundColor = active
-            ? StarMapControlTheme.activeBackground()
-            : StarMapControlTheme.defaultBackground(nightMode: nightMode, alpha: 0.86)
-        layer.cornerRadius = min(bounds.width, bounds.height) / 2.0
-        layer.borderWidth = StarMapControlTheme.borderWidth(active: active, nightMode: nightMode)
-        layer.borderColor = StarMapControlTheme.borderColor.cgColor
+    func setIcon(icon: UIImage?, accessibilityLabel: String? = nil) {
+        setImage(icon, for: .normal)
+        self.accessibilityLabel = accessibilityLabel
+        updateTheme()
     }
 
-    func setColorFilter(_ color: UIColor) {
+    func updateTheme() {
+        if active {
+            unpressedColorDay = .mapButtonBgColorActive.light
+            unpressedColorNight = .mapButtonBgColorActive.dark
+            tintColorDay = .white
+            tintColorNight = .white
+            borderWidthDay = 0
+            borderWidthNight = 2
+        } else {
+            unpressedColorDay = .mapButtonBgColorDefault.light
+            unpressedColorNight = .mapButtonBgColorDefault.dark
+            tintColorDay = .mapButtonIconColorDefault.light
+            tintColorNight = .mapButtonIconColorDefault.dark
+            borderWidthDay = 0
+            borderWidthNight = 2
+        }
+        
+        guard showsHudChrome else {
+            applyPlainTheme()
+            return
+        }
+
+        updateColors(forPressedState: isHighlighted)
+        if active {
+            backgroundColor = StarMapControlTheme.activeBackground(alpha: StarMapControlTheme.defaultBackgroundAlpha)
+        } else {
+            backgroundColor = backgroundColor?.withAlphaComponent(StarMapControlTheme.defaultBackgroundAlpha)
+        }
+    }
+
+    private func applyDefaultAppearanceParams() {
+        let helper = OAMapButtonsHelper.sharedInstance()
+        var size = helper.getDefaultSizePref().get()
+        if size <= 0 { size = MapButtonState.defaultSizeDp }
+
+        var cornerRadius = helper.getDefaultCornerRadiusPref().get()
+        if cornerRadius < 0 { cornerRadius = MapButtonState.roundRadiusDp }
+
+        var glassStyle = MapButtonState.defaultGlassStyle
+        if #available(iOS 26.0, *) {
+            glassStyle = Int32(UIGlassEffect.Style.clear.rawValue)
+        }
+        let opacity = Double(StarMapControlTheme.defaultBackgroundAlpha)
+        
+        setCustomAppearanceParams(ButtonAppearanceParams(
+            iconName: nil,
+            size: Int32(size),
+            opacity: opacity,
+            cornerRadius: Int32(cornerRadius),
+            glassStyle: glassStyle
+        ))
+    }
+
+    private func applyPlainTheme() {
+        backgroundColor = .clear
+        layer.borderWidth = nightMode ? 2 : 0
+        layer.shadowOpacity = 0
+        
+        let color = active
+        ? StarMapControlTheme.activeForeground(nightMode: nightMode)
+        : StarMapControlTheme.foreground(active: false, nightMode: nightMode)
+        
         tintColor = color
+        tintColorDay = color
+        tintColorNight = color
+        
+        updateColors(forPressedState: isHighlighted)
     }
-
-    func setIcon(iconName: String, accessibilityLabel: String? = nil) {
-        setImage(AstroIcon.template(iconName), for: .normal)
-        self.accessibilityLabel = accessibilityLabel
+    
+    private func commonInit() {
+        imageView?.contentMode = .scaleAspectFit
+        applyDefaultAppearanceParams()
+        updateTheme()
     }
 }
diff --git a/Sources/Plugins/Astronomy/StarMapCameraHelper.swift b/Sources/Plugins/Astronomy/StarMapCameraHelper.swift
index d5caab912b..0d4ad5ae3a 100644
--- a/Sources/Plugins/Astronomy/StarMapCameraHelper.swift
+++ b/Sources/Plugins/Astronomy/StarMapCameraHelper.swift
@@ -11,21 +11,28 @@ import CoreMedia
 import UIKit
 
 final class StarMapCameraHelper {
+    static let defaultTransparency = 50
+    
+    var onUnavailable: ((_ message: String) -> Void)?
+    var onCameraStateChanged: ((_ enabled: Bool) -> Void)?
+    
+    private(set) var isCameraOverlayEnabled = false
+    private(set) var calculatedFov = 60.0
+    
+    private let sessionQueue = DispatchQueue(label: "net.osmand.starMap.camera.session")
+    
     private var captureSession: AVCaptureSession?
     private var previewLayer: AVCaptureVideoPreviewLayer?
-    private weak var hostView: UIView?
-    private weak var siblingView: UIView?
-    private weak var starView: StarView?
-    private var requestedTransparency = 64
+    
+    private var requestedTransparency = defaultTransparency
     private var rawCameraFov = 60.0
     private var cameraAspectRatio = 4.0 / 3.0
     private var lastPreviewBounds = CGRect.null
     private var lastVideoOrientation: AVCaptureVideoOrientation?
-
-    var onUnavailable: ((_ message: String) -> Void)?
-    var onCameraStateChanged: ((_ enabled: Bool) -> Void)?
-    private(set) var isCameraOverlayEnabled = false
-    private(set) var calculatedFov = 60.0
+    
+    private weak var hostView: UIView?
+    private weak var siblingView: UIView?
+    private weak var starView: StarView?
 
     func bind(starView: StarView) {
         self.starView = starView
@@ -37,7 +44,6 @@ final class StarMapCameraHelper {
                 disableCameraOverlay(notify: true)
                 onUnavailable?(localizedString("recording_camera_not_available"))
             } else {
-                starView?.isCameraMode = true
                 starView?.setViewAngle(calculatedFov)
                 updateCameraZoom(fov: calculatedFov)
             }
@@ -60,10 +66,6 @@ final class StarMapCameraHelper {
         }
     }
 
-    func stopPreview() {
-        disableCameraOverlay(notify: true)
-    }
-
     func layoutPreview() {
         let bounds = hostView?.bounds ?? .zero
         let orientation = videoOrientation()
@@ -75,7 +77,7 @@ final class StarMapCameraHelper {
             lastVideoOrientation = orientation
             return
         }
-        let currentViewAngle = starView?.getViewAngle()
+        let currentViewAngle = starView?.viewAngleValue()
         updateEffectiveFov()
         if geometryChanged {
             starView?.setViewAngle(calculatedFov)
@@ -94,6 +96,8 @@ final class StarMapCameraHelper {
 
     func resetFov() {
         starView?.setViewAngle(calculatedFov)
+        updateCameraZoom(fov: calculatedFov)
+        setTransparency(progress: Self.defaultTransparency)
     }
 
     func updateCameraZoom(fov: Double) {
@@ -109,13 +113,6 @@ final class StarMapCameraHelper {
         CATransaction.commit()
     }
 
-    func calculateCameraFov() -> Double {
-        guard let camera = AVCaptureDevice.default(.builtInWideAngleCamera, for: .video, position: .back) else {
-            return 60.0
-        }
-        return cameraFovInfo(camera).width
-    }
-
     private func requestCameraOverlay() {
         guard let hostView, let siblingView else {
             onUnavailable?(localizedString("recording_camera_not_available"))
@@ -152,7 +149,6 @@ final class StarMapCameraHelper {
             return
         }
         isCameraOverlayEnabled = true
-        starView?.isCameraMode = true
         starView?.setViewAngle(calculatedFov)
         onCameraStateChanged?(true)
     }
@@ -161,35 +157,41 @@ final class StarMapCameraHelper {
         let wasEnabled = isCameraOverlayEnabled
         isCameraOverlayEnabled = false
         closeCamera()
-        starView?.isCameraMode = false
         if notify && wasEnabled {
             onCameraStateChanged?(false)
         }
     }
-
+    
     private func startPreview(in hostView: UIView, below siblingView: UIView) -> Bool {
         self.hostView = hostView
         self.siblingView = siblingView
-        closeCamera()
-
+        
+        sessionQueue.sync { [weak self] in
+            guard let self, let session = self.captureSession, session.isRunning else { return }
+            session.stopRunning()
+        }
+        captureSession = nil
+        previewLayer?.removeFromSuperlayer()
+        previewLayer = nil
         do {
             guard let camera = AVCaptureDevice.default(.builtInWideAngleCamera, for: .video, position: .back) else {
                 return false
             }
             let input = try AVCaptureDeviceInput(device: camera)
             let session = AVCaptureSession()
+            session.beginConfiguration()
             session.sessionPreset = .high
             guard session.canAddInput(input) else {
+                session.commitConfiguration()
                 return false
             }
             session.addInput(input)
-
+            session.commitConfiguration()
             let layer = AVCaptureVideoPreviewLayer(session: session)
             layer.videoGravity = .resizeAspectFill
             layer.opacity = Float(requestedTransparency) / 100.0
             layer.frame = hostView.bounds
             hostView.layer.insertSublayer(layer, below: siblingView.layer)
-
             let fovInfo = cameraFovInfo(camera)
             rawCameraFov = fovInfo.width
             cameraAspectRatio = fovInfo.aspectRatio
@@ -199,7 +201,8 @@ final class StarMapCameraHelper {
             lastVideoOrientation = videoOrientation()
             updatePreviewOrientation(lastVideoOrientation)
             updateEffectiveFov()
-            DispatchQueue.global(qos: .userInitiated).async {
+            sessionQueue.async { [weak self] in
+                guard self?.captureSession === session else { return }
                 session.startRunning()
             }
             return true
@@ -209,12 +212,22 @@ final class StarMapCameraHelper {
     }
 
     private func closeCamera() {
-        captureSession?.stopRunning()
+        let session = captureSession
         captureSession = nil
+        
         previewLayer?.removeFromSuperlayer()
         previewLayer = nil
+        
         lastPreviewBounds = .null
         lastVideoOrientation = nil
+        
+        guard let session else { return }
+        
+        sessionQueue.async {
+            if session.isRunning {
+                session.stopRunning()
+            }
+        }
     }
 
     private func updateEffectiveFov() {
diff --git a/Sources/Plugins/Astronomy/StarMapGlassBackground.swift b/Sources/Plugins/Astronomy/StarMapGlassBackground.swift
new file mode 100644
index 0000000000..78014b02ac
--- /dev/null
+++ b/Sources/Plugins/Astronomy/StarMapGlassBackground.swift
@@ -0,0 +1,33 @@
+//
+//  StarMapGlassBackground.swift
+//  OsmAnd Maps
+//
+//  Created by Vitaliy Sova on 08.07.2026.
+//  Copyright © 2026 OsmAnd. All rights reserved.
+//
+
+import Foundation
+
+enum StarMapGlassBackground {
+    private static let tag = 9_001
+    
+    static func apply(to view: UIView, nightMode: Bool, cornerRadius: CGFloat) -> UIVisualEffectView? {
+        if #available(iOS 26.0, *) {
+            view.subviews.filter { $0.tag == tag }.forEach { $0.removeFromSuperview() }
+            view.backgroundColor = .clear
+            
+            let glass = UIGlassEffect(style: .clear)
+            let effectView = UIVisualEffectView(effect: glass)
+            effectView.tag = tag
+            effectView.isUserInteractionEnabled = false
+            effectView.frame = view.bounds
+            effectView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
+            effectView.layer.cornerRadius = cornerRadius
+            effectView.clipsToBounds = true
+            effectView.overrideUserInterfaceStyle = nightMode ? .dark : .light
+            view.insertSubview(effectView, at: 0)
+            return effectView
+        }
+        return nil
+    }
+}
diff --git a/Sources/Plugins/Astronomy/StarMapMagnitudeFilterButton.swift b/Sources/Plugins/Astronomy/StarMapMagnitudeFilterButton.swift
new file mode 100644
index 0000000000..a91b4d589c
--- /dev/null
+++ b/Sources/Plugins/Astronomy/StarMapMagnitudeFilterButton.swift
@@ -0,0 +1,120 @@
+//
+//  StarMapMagnitudeFilterButton.swift
+//  OsmAnd Maps
+//
+//  Created by Vitaliy Sova on 08.07.2026.
+//  Copyright © 2026 OsmAnd. All rights reserved.
+//
+
+import UIKit
+
+final class StarMapMagnitudeFilterButton: StarMapButton {
+    private static let pillCornerRadius: Int32 = 24
+    
+    override var isHighlighted: Bool {
+        didSet {
+            updateTheme()
+        }
+    }
+
+    private let iconView = UIImageView(image: .icCustomMagnitude)
+    private let valueLabel = UILabel()
+
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        setupContent()
+        applyPillAppearance()
+    }
+
+    required init?(coder: NSCoder) {
+        super.init(coder: coder)
+        setupContent()
+        applyPillAppearance()
+    }
+
+    override func updateTheme() {
+        super.updateTheme()
+        setImage(nil, for: .normal)
+        imageView?.isHidden = true
+        
+        if isHighlighted {
+            let color = StarMapControlTheme.foreground(active: false, nightMode: nightMode).withAlphaComponent(0.4)
+            iconView.tintColor = color
+            valueLabel.textColor = color
+        } else {
+            let color = StarMapControlTheme.foreground(active: active, nightMode: nightMode)
+            iconView.tintColor = color
+            valueLabel.textColor = color
+        }
+        
+        layer.borderWidth = nightMode ? 2 : 0
+    }
+
+    override func layoutSubviews() {
+        super.layoutSubviews()
+        if #available(iOS 26.0, *) {
+            subviews.compactMap { $0 as? UIVisualEffectView }.forEach {
+                $0.frame = bounds
+                $0.layer.cornerRadius = bounds.width / 2
+            }
+        }
+    }
+    
+    func setValue(_ text: String) {
+        valueLabel.text = text
+    }
+
+    private func setupContent() {
+        setImage(nil, for: .normal)
+        imageView?.isHidden = true
+        
+        iconView.contentMode = .scaleAspectFit
+        iconView.translatesAutoresizingMaskIntoConstraints = false
+        NSLayoutConstraint.activate([
+            iconView.widthAnchor.constraint(equalToConstant: 30),
+            iconView.heightAnchor.constraint(equalToConstant: 30)
+        ])
+
+        valueLabel.font = .systemFont(ofSize: 15, weight: .bold)
+        valueLabel.textAlignment = .center
+
+        let stack = UIStackView(arrangedSubviews: [iconView, valueLabel])
+        stack.axis = .vertical
+        stack.alignment = .center
+        stack.spacing = 4
+        stack.isUserInteractionEnabled = false
+        stack.translatesAutoresizingMaskIntoConstraints = false
+        addSubview(stack)
+
+        NSLayoutConstraint.activate([
+            stack.centerXAnchor.constraint(equalTo: centerXAnchor),
+            stack.centerYAnchor.constraint(equalTo: centerYAnchor)
+        ])
+
+        accessibilityLabel = localizedString("astro_min_magnitude")
+    }
+
+    private func applyPillAppearance() {
+        let helper = OAMapButtonsHelper.sharedInstance()
+        var size = helper.getDefaultSizePref().get()
+        if size <= 0 { size = MapButtonState.defaultSizeDp }
+
+        var opacity = helper.getDefaultOpacityPref().get()
+        if opacity < 0 { opacity = MapButtonState.opaqueAlpha }
+
+        var glassStyle = MapButtonState.defaultGlassStyle
+        if #available(iOS 26.0, *) {
+            glassStyle = Int32(UIGlassEffect.Style.clear.rawValue)
+            opacity = Double(StarMapControlTheme.defaultBackgroundAlpha)
+        }
+
+        setCustomAppearanceParams(ButtonAppearanceParams(
+            iconName: nil,
+            size: Int32(size),
+            opacity: opacity,
+            cornerRadius: Self.pillCornerRadius,
+            glassStyle: glassStyle
+        ))
+        updateTheme()
+    }
+}
diff --git a/Sources/Plugins/Astronomy/StarMapMagnitudeSliderPanel.swift b/Sources/Plugins/Astronomy/StarMapMagnitudeSliderPanel.swift
new file mode 100644
index 0000000000..d27bb42b09
--- /dev/null
+++ b/Sources/Plugins/Astronomy/StarMapMagnitudeSliderPanel.swift
@@ -0,0 +1,117 @@
+//
+//  StarMapMagnitudeSliderPanel.swift
+//  OsmAnd Maps
+//
+//  Created by Vitaliy Sova on 08.07.2026.
+//  Copyright © 2026 OsmAnd. All rights reserved.
+//
+
+import UIKit
+
+final class StarMapMagnitudeSliderPanel: UIView {
+    static let preferredWidth: CGFloat = 240
+    private static let cornerRadius: CGFloat = 16
+
+    var onValueChanged: ((Double) -> Void)?
+
+    var isExpanded: Bool {
+        !isHidden
+    }
+
+    private let titleLabel = UILabel()
+    private let valueLabel = UILabel()
+    private let slider = UISlider()
+    private var nightMode = false
+    
+    private weak var glassBackgroundView: UIVisualEffectView?
+
+    init(maxMagnitude: Double) {
+        super.init(frame: .zero)
+        setupContent(maxMagnitude: maxMagnitude)
+        isHidden = true
+    }
+
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    override func layoutSubviews() {
+        super.layoutSubviews()
+        glassBackgroundView?.frame = bounds
+    }
+
+    func toggle() {
+        isHidden.toggle()
+        updateTheme(nightMode: nightMode)
+    }
+
+    func setMagnitude(_ value: Double) {
+        slider.value = Float(value)
+        valueLabel.text = String(format: "%.1f", value)
+    }
+
+    func updateTheme(nightMode: Bool) {
+        self.nightMode = nightMode
+        
+        glassBackgroundView?.overrideUserInterfaceStyle = nightMode ? .dark : .light
+        
+        let color: UIColor = nightMode ? .textColorPrimary.dark : .textColorPrimary.light
+        titleLabel.textColor = color
+        valueLabel.textColor = color
+        
+        backgroundColor = StarMapControlTheme.defaultBackground(nightMode: nightMode, alpha: StarMapControlTheme.defaultBackgroundAlpha)
+        
+        layer.borderWidth = nightMode ? 2 : 0
+    }
+
+    private func setupContent(maxMagnitude: Double) {
+        translatesAutoresizingMaskIntoConstraints = false
+        layer.cornerRadius = Self.cornerRadius
+        layer.shadowColor = UIColor.black.cgColor
+        layer.shadowOpacity = 0.35
+        layer.shadowRadius = 5
+        layer.shadowOffset = CGSize(width: 0, height: 2)
+        layer.borderColor = StarMapControlTheme.border(nightMode: nightMode).cgColor
+        
+        glassBackgroundView = StarMapGlassBackground.apply(
+            to: self,
+            nightMode: nightMode,
+            cornerRadius: Self.cornerRadius
+        )
+
+        titleLabel.text = localizedString("astro_min_magnitude")
+        titleLabel.font = .preferredFont(forTextStyle: .subheadline)
+
+        valueLabel.font = .preferredFont(forTextStyle: .subheadline)
+
+        slider.minimumValue = -1
+        slider.maximumValue = Float(maxMagnitude)
+        slider.addTarget(self, action: #selector(sliderChanged), for: .valueChanged)
+
+        let header = UIStackView(arrangedSubviews: [titleLabel, UIView(), valueLabel])
+        header.axis = .horizontal
+        header.alignment = .center
+        header.spacing = 8
+
+        let stack = UIStackView(arrangedSubviews: [header, slider])
+        stack.axis = .vertical
+        stack.spacing = 6
+        stack.layoutMargins = UIEdgeInsets(top: 8, left: 10, bottom: 8, right: 10)
+        stack.isLayoutMarginsRelativeArrangement = true
+        stack.translatesAutoresizingMaskIntoConstraints = false
+        addSubview(stack)
+
+        NSLayoutConstraint.activate([
+            stack.leadingAnchor.constraint(equalTo: leadingAnchor),
+            stack.trailingAnchor.constraint(equalTo: trailingAnchor),
+            stack.topAnchor.constraint(equalTo: topAnchor),
+            stack.bottomAnchor.constraint(equalTo: bottomAnchor)
+        ])
+    }
+
+    @objc private func sliderChanged() {
+        let value = Double(slider.value)
+        valueLabel.text = String(format: "%.1f", value)
+        onValueChanged?(value)
+    }
+}
diff --git a/Sources/Plugins/Astronomy/StarMapPlainButton.swift b/Sources/Plugins/Astronomy/StarMapPlainButton.swift
new file mode 100644
index 0000000000..a8b4d09f6a
--- /dev/null
+++ b/Sources/Plugins/Astronomy/StarMapPlainButton.swift
@@ -0,0 +1,66 @@
+//
+//  StarMapPlainIconButton.swift
+//  OsmAnd Maps
+//
+//  Created by Vitaliy Sova on 09.07.2026.
+//  Copyright © 2026 OsmAnd. All rights reserved.
+//
+
+import UIKit
+
+final class StarMapPlainButton: UIButton {
+    var onHighlightChange: ((Bool) -> Void)?
+    var customColorTintActive: UIColor?
+    
+    override var isHighlighted: Bool {
+        didSet {
+            onHighlightChange?(isHighlighted)
+        }
+    }
+    
+    private var active = false
+    private var nightMode = false
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        setup()
+    }
+    
+    required init?(coder: NSCoder) {
+        super.init(coder: coder)
+        setup()
+    }
+    
+    func updateTheme(nightmod: Bool, active: Bool) {
+        self.nightMode = nightmod
+        self.active = active
+        applyColors()
+    }
+    
+    func setIcon(_ icon: UIImage?, accessibilityLabel: String) {
+        setImage(icon, for: .normal)
+        self.accessibilityLabel = accessibilityLabel
+        applyColors()
+    }
+    
+    private func setup() {
+        backgroundColor = .clear
+        imageView?.contentMode = .scaleAspectFit
+
+        applyColors()
+    }
+    
+    private func applyColors() {
+        let color: UIColor
+        if isHighlighted {
+            color = customColorTintActive ?? StarMapControlTheme.foreground(active: false, nightMode: nightMode).withAlphaComponent(0.4)
+        } else if active, let customColorTintActive {
+            color = customColorTintActive
+        } else {
+            color = StarMapControlTheme.foreground(active: active, nightMode: nightMode)
+        }
+        
+        tintColor = color
+        setTitleColor(color, for: .normal)
+    }
+}
diff --git a/Sources/Plugins/Astronomy/StarMapResetButton.swift b/Sources/Plugins/Astronomy/StarMapResetButton.swift
deleted file mode 100644
index 0adb1a0aea..0000000000
--- a/Sources/Plugins/Astronomy/StarMapResetButton.swift
+++ /dev/null
@@ -1,17 +0,0 @@
-//
-//  StarMapResetButton.swift
-//  OsmAnd Maps
-//
-//  Created by Codex on 20.05.2026.
-//  Copyright (c) 2026 OsmAnd. All rights reserved.
-//
-
-import UIKit
-
-final class StarMapResetButton: StarMapButton {
-    override func updateTheme() {
-        super.updateTheme()
-        setImage(.icCustomRefresh, for: .normal)
-        accessibilityLabel = localizedString("shared_string_reset")
-    }
-}
diff --git a/Sources/Plugins/Astronomy/StarMapTimeControlButton.swift b/Sources/Plugins/Astronomy/StarMapTimeControlButton.swift
deleted file mode 100644
index 3e2c085098..0000000000
--- a/Sources/Plugins/Astronomy/StarMapTimeControlButton.swift
+++ /dev/null
@@ -1,20 +0,0 @@
-//
-//  StarMapTimeControlButton.swift
-//  OsmAnd Maps
-//
-//  Created by Codex on 20.05.2026.
-//  Copyright (c) 2026 OsmAnd. All rights reserved.
-//
-
-import UIKit
-
-final class StarMapTimeControlButton: StarMapButton {
-    override func updateTheme() {
-        backgroundColor = .clear
-        layer.borderWidth = 0
-        layer.cornerRadius = 0
-        let foregroundColor: UIColor = active ? .white : StarMapControlTheme.activeForeground(nightMode: nightMode)
-        tintColor = foregroundColor
-        setTitleColor(foregroundColor, for: .normal)
-    }
-}
diff --git a/Sources/Plugins/Astronomy/StarMapTimeControlCard.swift b/Sources/Plugins/Astronomy/StarMapTimeControlCard.swift
new file mode 100644
index 0000000000..a9aac58509
--- /dev/null
+++ b/Sources/Plugins/Astronomy/StarMapTimeControlCard.swift
@@ -0,0 +1,150 @@
+//
+//  StarMapTimeControlCard.swift
+//  OsmAnd Maps
+//
+//  Created by Vitaliy Sova on 08.07.2026.
+//  Copyright © 2026 OsmAnd. All rights reserved.
+//
+
+import UIKit
+
+final class StarMapTimeControlCard: UIView {
+    static let height: CGFloat = 48
+    private static let cornerRadius: CGFloat = 24
+
+    var onTimeButtonTapped: (() -> Void)?
+    var onResetTapped: (() -> Void)?
+
+    private let timeButton = UIButton()
+    private let resetButton = UIButton()
+    private let mainStack = UIStackView()
+    
+    private var active: Bool = false
+    private var nightMode: Bool = false
+    
+    private weak var glassBackgroundView: UIVisualEffectView?
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        setupContent()
+    }
+
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
+    func setTimeTitle(_ title: String) {
+        timeButton.setTitle(title, for: .normal)
+    }
+
+    func setResetVisible(_ visible: Bool) {
+        resetButton.isHidden = !visible
+        mainStack.layoutMargins = UIEdgeInsets(top: 0, left: 0, bottom: 0, right: resetButton.isHidden ? 16 : 0)
+    }
+
+    func updateTheme(nightMode: Bool, active: Bool, pressed: Bool = false) {
+        self.nightMode = nightMode
+        self.active = active
+
+        updateButtonTheme(timeButton)
+        updateButtonTheme(resetButton)
+        
+        glassBackgroundView?.overrideUserInterfaceStyle = nightMode ? .dark : .light
+        
+        if pressed {
+            backgroundColor = StarMapControlTheme.pressedBackground(nightMode: nightMode, alpha: StarMapControlTheme.defaultBackgroundAlpha)
+        } else {
+            backgroundColor = active
+            ? StarMapControlTheme.activeBackground(alpha: StarMapControlTheme.defaultBackgroundAlpha)
+            : StarMapControlTheme.defaultBackground(nightMode: nightMode, alpha: StarMapControlTheme.defaultBackgroundAlpha)
+        }
+        
+        layer.borderWidth = nightMode ? 2 : 0
+    }
+
+    override func layoutSubviews() {
+        super.layoutSubviews()
+        glassBackgroundView?.frame = bounds
+    }
+
+    private func updateButtonTheme(_ button: UIButton) {
+        let color: UIColor
+        if button.isHighlighted {
+            color = StarMapControlTheme.foreground(active: false, nightMode: nightMode).withAlphaComponent(0.4)
+        } else {
+            color = StarMapControlTheme.foreground(active: active, nightMode: nightMode)
+        }
+        var config = button.configuration
+        config?.baseBackgroundColor = .clear
+        config?.baseForegroundColor = color
+        button.configuration = config
+    }
+    
+    private func makeButtonConfiguration(for button: UIButton, icon: UIImage) {
+        var config = UIButton.Configuration.plain()
+        config.image = icon
+        config.imagePlacement = .leading
+        config.imagePadding = 8
+        config.contentInsets = NSDirectionalEdgeInsets(top: 0, leading: 8, bottom: 0, trailing: 16)
+        config.titleTextAttributesTransformer = UIConfigurationTextAttributesTransformer { incoming in
+            var outgoing = incoming
+            outgoing.font = .systemFont(ofSize: 17, weight: .medium)
+            return outgoing
+        }
+        button.configuration = config
+        button.configurationUpdateHandler = { [weak self] button in
+            guard let self else { return }
+            self.updateTheme(nightMode: self.nightMode, active: self.active, pressed: button.isHighlighted)
+        }
+    }
+    
+    private func setupContent() {
+        translatesAutoresizingMaskIntoConstraints = false
+        layer.cornerRadius = Self.cornerRadius
+        layer.shadowColor = UIColor.black.cgColor
+        layer.shadowOpacity = 0.35
+        layer.shadowRadius = 5
+        layer.shadowOffset = CGSize(width: 0, height: 2)
+        layer.borderColor = StarMapControlTheme.border(nightMode: nightMode).cgColor
+        
+        glassBackgroundView = StarMapGlassBackground.apply(
+            to: self,
+            nightMode: nightMode,
+            cornerRadius: Self.cornerRadius
+        )
+
+        timeButton.addTarget(self, action: #selector(timeButtonTapped), for: .touchUpInside)
+        timeButton.heightAnchor.constraint(equalToConstant: Self.height).isActive = true
+        makeButtonConfiguration(for: timeButton, icon: .icActionTime)
+
+        resetButton.accessibilityLabel = localizedString("shared_string_reset")
+        resetButton.addTarget(self, action: #selector(resetButtonTapped), for: .touchUpInside)
+        resetButton.isHidden = true
+        resetButton.widthAnchor.constraint(equalToConstant: Self.height).isActive = true
+        resetButton.heightAnchor.constraint(equalToConstant: Self.height).isActive = true
+        makeButtonConfiguration(for: resetButton, icon: .icCustomReset)
+
+        mainStack.addArrangedSubview(timeButton)
+        mainStack.addArrangedSubview(resetButton)
+        mainStack.axis = .horizontal
+        mainStack.alignment = .center
+        mainStack.translatesAutoresizingMaskIntoConstraints = false
+        addSubview(mainStack)
+
+        NSLayoutConstraint.activate([
+            heightAnchor.constraint(equalToConstant: Self.height),
+            mainStack.leadingAnchor.constraint(equalTo: leadingAnchor),
+            mainStack.trailingAnchor.constraint(equalTo: trailingAnchor),
+            mainStack.topAnchor.constraint(equalTo: topAnchor),
+            mainStack.bottomAnchor.constraint(equalTo: bottomAnchor)
+        ])
+    }
+
+    @objc private func timeButtonTapped() {
+        onTimeButtonTapped?()
+    }
+
+    @objc private func resetButtonTapped() {
+        onResetTapped?()
+    }
+}
diff --git a/Sources/Plugins/Astronomy/StarMapViewController.swift b/Sources/Plugins/Astronomy/StarMapViewController.swift
index fe47276697..fd9feb94fb 100644
--- a/Sources/Plugins/Astronomy/StarMapViewController.swift
+++ b/Sources/Plugins/Astronomy/StarMapViewController.swift
@@ -17,46 +17,40 @@ final class StarMapViewController: UIViewController, StarViewDelegate {
         static let smallButtonSize: CGFloat = 40
         static let magnitudeButtonHeight: CGFloat = 76
         static let magnitudeSliderWidth: CGFloat = 240
-        static let transparencySliderHeight: CGFloat = 150
         static let regularMapHeight: CGFloat = 300
         static let regularMapHeightLandscape: CGFloat = 110
         static let regularMapHeightFractionForPad: CGFloat = 0.33
         static let regularMapHeightFractionForPadLandscape: CGFloat = 0.3
         static let maxMagnitude: Double = 7.0
         static let leftPanelWidth: CGFloat = 393
+        static let zoomButtonsBottomPadding: CGFloat = 34
     }
-    private var settings: AstronomyPluginSettings
-    private let plugin: AstronomyPlugin
-    private let dataProvider: AstroDataProvider
-    private let viewModel: StarObjectsViewModel
 
     private let mainLayout = UIView()
     private let starView = StarView()
     private let regularMapContainer = UIView()
     private let mapControlsContainer = StarMapControlsContainer()
     private let timeSelectionView = DateTimeSelectionView()
-    private let timeControlCard = UIView()
-    private let timeControlButton = StarMapTimeControlButton()
-    private let resetTimeButton = StarMapResetButton()
-    private let arModeButton = StarMapButton()
-    private let cameraButton = StarMapButton()
-    private let transparencySlider = UISlider()
-    private let sliderContainer = UIView()
-    private let resetFovButton = StarMapButton()
-    private let magnitudeFilterButton = UIControl()
-    private let magnitudeFilterIcon = UIImageView()
-    private let magnitudeFilterText = UILabel()
-    private let magnitudeSliderCard = UIView()
-    private let magnitudeSlider = UISlider()
-    private let magnitudeSliderTitle = UILabel()
-    private let magnitudeSliderValue = UILabel()
+    private let timeControlCard = StarMapTimeControlCard()
+    private let arControlCard = StarMapArControlCard()
+    private let magnitudeFilterButton = StarMapMagnitudeFilterButton()
+    private let magnitudeSliderPanel = StarMapMagnitudeSliderPanel(maxMagnitude: Layout.maxMagnitude)
     private let closeButton = StarMapButton()
     private let settingsButton = StarMapButton()
     private let searchButton = StarMapButton()
     private let compassButton = StarCompassButton()
+    private let zoomInButton = StarMapButton()
+    private let zoomOutButton = StarMapButton()
+    private let zoomButtonsVisible: Bool = OAUtilities.isiOSAppOnMac()
+    private let mapVisibleAreaGuide = UILayoutGuide()
 
     private let arModeHelper = StarMapARModeHelper()
     private let cameraHelper = StarMapCameraHelper()
+    
+    private let plugin: AstronomyPlugin
+    private let dataProvider: AstroDataProvider
+    private let viewModel: StarObjectsViewModel
+    private var settings: AstronomyPluginSettings
 
     private var autoTimeUpdateTimer: Timer?
     private var isTimeAutoUpdateEnabled = true
@@ -66,7 +60,6 @@ final class StarMapViewController: UIViewController, StarViewDelegate {
     private var previousAltitude = 45.0
     private var previousAzimuth = 0.0
     private var previousViewAngle = 150.0
-    private var manualAzimuth = true
     private var lastUpdatedAzimuth = -1.0
     private var objectInfoController: AstroContextMenuViewController?
     private var objectInfoNavigationController: UINavigationController?
@@ -79,13 +72,21 @@ final class StarMapViewController: UIViewController, StarViewDelegate {
     private var regularMapHeightConstraint: NSLayoutConstraint?
     private var mapLocationObserver: OAAutoObserverProxy?
     private var dayNightModeObserver: OAAutoObserverProxy?
+    private var applicationModeObserver: OAAutoObserverProxy?
     private var screenOrientationObserver: NSObjectProtocol?
     private var leftPanelLeadingConstraint: NSLayoutConstraint?
-    private var leftPanelTopConstraint: NSLayoutConstraint?
-    private let mapVisibleAreaGuide = UILayoutGuide()
     private var mapVisibleAreaLeadingConstraint: NSLayoutConstraint?
+    private var leftPanelTopConstraint: NSLayoutConstraint?
     private var mapControlsContainerTopConstraint: NSLayoutConstraint?
-
+    private var nightMode: Bool = false
+    private var isApplyingControlChange = false
+    private var isGyroActive: Bool {
+        arModeHelper.isArModeEnabled
+    }
+    private var isArCameraActive: Bool {
+        cameraHelper.isCameraOverlayEnabled
+    }
+    
     private var mapControlsLeadingInset: CGFloat {
         embeddedLeftPanelNavigationController != nil && OAUtilities.isIPad()
             ? Layout.contentPadding + Layout.leftPanelWidth
@@ -106,12 +107,13 @@ final class StarMapViewController: UIViewController, StarViewDelegate {
     }
 
     init(plugin: AstronomyPlugin) {
-        let loadedSettings = AstronomyPluginSettings.load()
+        let loadedSettings = plugin.astroSettings
         let provider = plugin.dataProvider
         self.plugin = plugin
         settings = loadedSettings
         dataProvider = provider
         viewModel = StarObjectsViewModel(provider: provider, settings: loadedSettings)
+        nightMode = OADayNightHelper.instance().isNightMode()
         super.init(nibName: nil, bundle: nil)
     }
 
@@ -119,25 +121,15 @@ final class StarMapViewController: UIViewController, StarViewDelegate {
         fatalError("init(coder:) has not been implemented")
     }
 
-    deinit {
-        mapLocationObserver?.detach()
-        dayNightModeObserver?.detach()
-        if let screenOrientationObserver {
-            NotificationCenter.default.removeObserver(screenOrientationObserver)
-        }
-        restoreRegularMapIfNeeded(refresh: false)
-    }
-
     override func viewDidLoad() {
         super.viewDidLoad()
         view.backgroundColor = .clear
+        reloadProfileSettings()
         setupLayout()
         setupControls()
         setupHelpers()
         setupListeners()
-        applySettings(settings.starMap)
-        updateRegularMapVisibility(settings.common.showRegularMap)
-        updateStarMap(updateAzimuth: true)
+        applyProfileSettingsToUI(restoreMapPosition: true)
 
         viewModel.onDataChanged = { [weak self] in
             self?.syncObjectsToStarView()
@@ -155,9 +147,7 @@ final class StarMapViewController: UIViewController, StarViewDelegate {
         }
         arModeHelper.onResume()
         cameraHelper.onResume()
-        if arModeHelper.isArModeEnabled {
-            updateArModeUI(true)
-        }
+        syncControlUI()
         if isTimeAutoUpdateEnabled {
             syncCurrentTimeForAutoUpdate(animate: true)
         }
@@ -170,6 +160,7 @@ final class StarMapViewController: UIViewController, StarViewDelegate {
         arModeHelper.onPause()
         cameraHelper.onPause()
         starView.isCameraMode = false
+        starView.isGyroTrackingEnabled = false
         restoreRegularMapIfNeeded(refresh: true)
     }
 
@@ -187,6 +178,90 @@ final class StarMapViewController: UIViewController, StarViewDelegate {
             leftPanelTopConstraint?.constant = Layout.contentPadding
         }
     }
+    
+    override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
+        super.traitCollectionDidChange(previousTraitCollection)
+        guard traitCollection.hasDifferentColorAppearance(comparedTo: previousTraitCollection) else {
+            return
+        }
+        updateMapControlThemes()
+    }
+    
+    func applyRedFilter(enabled: Bool) {
+        starView.showRedFilter = enabled
+        updateRedMode(enabled)
+        saveStarMapSettings()
+    }
+
+    func setRegularMapVisibility(enabled: Bool) {
+        updateRegularMapVisibility(enabled)
+        saveCommonSettings()
+    }
+    
+    func trackableObjects() -> [SkyObject] {
+        viewModel.skyObjects + viewModel.constellations.map { $0 as SkyObject }
+    }
+
+    func findTrackableObjectById(_ id: String) -> SkyObject? {
+        trackableObjects().first { $0.id == id }
+    }
+    
+    func starView(_ starView: StarView, didSelect object: SkyObject?) {
+        selectedObject = object
+        updateTimeControls()
+    }
+    
+    func showSearchDialog(initialCatalogWid: String? = nil) {
+        clearPreviousSearchDialog()
+        let controller = StarMapSearchViewController.newInstance(initialCatalogWid: initialCatalogWid,
+                                                                 parent: self,
+                                                                 plugin: plugin)
+        controller.onObjectSelected = { [weak self] obj in
+            self?.handleSearchObjectSelected(obj)
+        }
+        controller.onDismiss = { [weak self] in
+            self?.dismissSearchDialog(animated: true)
+        }
+        controller.applyRedFilter(enabled: starView.showRedFilter)
+        searchViewController = controller
+        
+        let nav = UINavigationController(rootViewController: controller)
+        nav.modalPresentationStyle = .fullScreen
+        nav.navigationBar.prefersLargeTitles = true
+        searchNavigationController = nav
+        
+        if OAUtilities.isIPad() {
+            showLeftPanel(nav)
+            updateMapControlsVisibility()
+        } else {
+            nav.modalPresentationStyle = .fullScreen
+            (presentedViewController ?? self).present(nav, animated: true)
+        }
+    }
+    
+    func searchableObjects() -> [SkyObject] {
+        trackableObjects()
+    }
+
+    func searchConstellations() -> [Constellation] {
+        viewModel.constellations
+    }
+
+    func searchObserver() -> Observer {
+        starView.observer
+    }
+
+    func searchCurrentDate() -> Date {
+        currentDate
+    }
+
+    func searchStarMapConfig() -> AstronomyPluginSettings.StarMapConfig {
+        settings.starMapConfig()
+    }
+
+    func isSearchRedFilterEnabled() -> Bool {
+        starView.showRedFilter
+    }
 
     private func setupLayout() {
         mainLayout.translatesAutoresizingMaskIntoConstraints = false
@@ -244,50 +319,56 @@ final class StarMapViewController: UIViewController, StarViewDelegate {
         setupRightControls()
         setupTimeControls()
         setupMagnitudeControls()
-        setupCameraControls()
+        setupMacZoomControls()
         updateMapControlThemes()
     }
 
     private func setupStarView() {
         starView.delegate = self
         starView.viewModel = viewModel
-        starView.settings = settings
+        starView.settings = settings.copyForUI()
     }
 
     private func setupCompassAndLeftControls() {
         addRoundButton(compassButton, accessibilityLabel: localizedString("map_widget_compass"))
-        compassButton.onSingleTap = { [weak self] in self?.setAzimuth(0, animate: true) }
-
-        addRoundButton(arModeButton, iconName: "ic_custom_view_in_ar", accessibilityLabel: localizedString("astro_ar"))
-        arModeButton.addTarget(self, action: #selector(toggleARMode), for: .touchUpInside)
-
-        addRoundButton(cameraButton, iconName: "ic_custom_device", accessibilityLabel: localizedString("astro_camera"))
-        cameraButton.addTarget(self, action: #selector(toggleCamera), for: .touchUpInside)
-        cameraButton.isHidden = true
+        compassButton.onSingleTap = { [weak self] in
+            self?.toggleGyroMode()
+        }
 
-        addRoundButton(searchButton, iconName: "ic_custom_search", accessibilityLabel: localizedString("shared_string_search"))
+        addRoundButton(searchButton, icon: .icCustomSearch, accessibilityLabel: localizedString("shared_string_search"))
         searchButton.addTarget(self, action: #selector(showSearchDialog), for: .touchUpInside)
+        
+        mapControlsContainer.addSubview(arControlCard)
+        arControlCard.onArTapped = { [weak self] in
+            self?.toggleARMode()
+        }
+        arControlCard.onResetTapped = { [weak self] in
+            self?.resetFov()
+        }
+        arControlCard.onTransparencyChanged = { [weak self] progress in
+            self?.cameraHelper.setTransparency(progress: progress)
+        }
+        searchButton.setContentCompressionResistancePriority(.required, for: .vertical)
+        compassButton.setContentCompressionResistancePriority(.required, for: .vertical)
 
         NSLayoutConstraint.activate([
             compassButton.leadingAnchor.constraint(equalTo: mapVisibleAreaGuide.leadingAnchor, constant: Layout.contentPadding),
             compassButton.topAnchor.constraint(equalTo: mapControlsContainer.safeAreaLayoutGuide.topAnchor, constant: Layout.contentPadding),
 
-            arModeButton.centerXAnchor.constraint(equalTo: compassButton.centerXAnchor),
-            arModeButton.topAnchor.constraint(equalTo: compassButton.bottomAnchor, constant: Layout.contentPadding),
-
-            cameraButton.centerXAnchor.constraint(equalTo: arModeButton.centerXAnchor),
-            cameraButton.topAnchor.constraint(equalTo: arModeButton.bottomAnchor, constant: Layout.contentPadding),
-
             searchButton.centerXAnchor.constraint(equalTo: compassButton.centerXAnchor),
-            searchButton.bottomAnchor.constraint(equalTo: mapControlsContainer.safeAreaLayoutGuide.bottomAnchor, constant: -Layout.contentPadding)
+            searchButton.bottomAnchor.constraint(equalTo: mapControlsContainer.safeAreaLayoutGuide.bottomAnchor, constant: -Layout.contentPadding),
+            
+            arControlCard.centerXAnchor.constraint(equalTo: compassButton.centerXAnchor),
+            arControlCard.topAnchor.constraint(equalTo: compassButton.bottomAnchor, constant: Layout.contentPadding),
+            arControlCard.bottomAnchor.constraint(lessThanOrEqualTo: searchButton.topAnchor, constant: -Layout.contentPadding)
         ])
     }
 
     private func setupRightControls() {
-        addRoundButton(closeButton, iconName: "ic_navbar_close", accessibilityLabel: localizedString("shared_string_close"))
+        addRoundButton(closeButton, icon: .icNavbarClose, accessibilityLabel: localizedString("shared_string_close"))
         closeButton.addTarget(self, action: #selector(close), for: .touchUpInside)
 
-        addRoundButton(settingsButton, iconName: "ic_custom_overlay_map", accessibilityLabel: localizedString("shared_string_settings"))
+        addRoundButton(settingsButton, icon: .icCustomOverlayMap, accessibilityLabel: localizedString("shared_string_settings"))
         settingsButton.addTarget(self, action: #selector(showConfigureSheet), for: .touchUpInside)
 
         NSLayoutConstraint.activate([
@@ -300,37 +381,14 @@ final class StarMapViewController: UIViewController, StarViewDelegate {
     }
 
     private func setupTimeControls() {
-        let nightMode = OADayNightHelper.instance().isNightMode()
-        timeControlCard.translatesAutoresizingMaskIntoConstraints = false
-        timeControlCard.backgroundColor = StarMapControlTheme.defaultBackground(nightMode: nightMode, alpha: 1)
-        timeControlCard.layer.cornerRadius = Layout.buttonSize / 2
-        timeControlCard.layer.shadowColor = UIColor.black.cgColor
-        timeControlCard.layer.shadowOpacity = 0.16
-        timeControlCard.layer.shadowRadius = 6
-        timeControlCard.layer.shadowOffset = CGSize(width: 0, height: 2)
+        timeControlCard.onTimeButtonTapped = { [weak self] in
+            self?.toggleTimeSelection()
+        }
+        timeControlCard.onResetTapped = { [weak self] in
+            self?.resetTimeButtonPressed()
+        }
         mapControlsContainer.addSubview(timeControlCard)
 
-        let stack = UIStackView()
-        stack.axis = .horizontal
-        stack.alignment = .center
-        stack.spacing = 4
-        stack.layoutMargins = UIEdgeInsets(top: 0, left: 6, bottom: 0, right: 6)
-        stack.isLayoutMarginsRelativeArrangement = true
-        stack.translatesAutoresizingMaskIntoConstraints = false
-        timeControlCard.addSubview(stack)
-
-        timeControlButton.setImage(AstroIcon.template("ic_action_time"), for: .normal)
-        timeControlButton.titleLabel?.font = UIFont.systemFont(ofSize: 18, weight: .bold)
-        timeControlButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 8, bottom: 0, right: 8)
-        timeControlButton.addTarget(self, action: #selector(toggleTimeSelection), for: .touchUpInside)
-        stack.addArrangedSubview(timeControlButton)
-
-        resetTimeButton.addTarget(self, action: #selector(resetTimeButtonPressed), for: .touchUpInside)
-        resetTimeButton.isHidden = true
-        resetTimeButton.widthAnchor.constraint(equalToConstant: Layout.smallButtonSize).isActive = true
-        resetTimeButton.heightAnchor.constraint(equalToConstant: Layout.smallButtonSize).isActive = true
-        stack.addArrangedSubview(resetTimeButton)
-
         timeSelectionView.translatesAutoresizingMaskIntoConstraints = false
         timeSelectionView.isHidden = true
         mapControlsContainer.addSubview(timeSelectionView)
@@ -338,151 +396,62 @@ final class StarMapViewController: UIViewController, StarViewDelegate {
         NSLayoutConstraint.activate([
             timeControlCard.centerXAnchor.constraint(equalTo: mapVisibleAreaGuide.centerXAnchor),
             timeControlCard.bottomAnchor.constraint(equalTo: mapControlsContainer.safeAreaLayoutGuide.bottomAnchor, constant: -Layout.contentPadding),
-            timeControlCard.heightAnchor.constraint(equalToConstant: Layout.buttonSize),
-
-            stack.leadingAnchor.constraint(equalTo: timeControlCard.leadingAnchor),
-            stack.trailingAnchor.constraint(equalTo: timeControlCard.trailingAnchor),
-            stack.topAnchor.constraint(equalTo: timeControlCard.topAnchor),
-            stack.bottomAnchor.constraint(equalTo: timeControlCard.bottomAnchor),
-
             timeSelectionView.centerXAnchor.constraint(equalTo: mapVisibleAreaGuide.centerXAnchor),
             timeSelectionView.bottomAnchor.constraint(equalTo: timeControlCard.topAnchor, constant: -Layout.contentPadding)
         ])
     }
 
     private func setupMagnitudeControls() {
-        let nightMode = OADayNightHelper.instance().isNightMode()
         magnitudeFilterButton.translatesAutoresizingMaskIntoConstraints = false
-        magnitudeFilterButton.backgroundColor = StarMapControlTheme.defaultBackground(nightMode: nightMode, alpha: 0.92)
-        magnitudeFilterButton.layer.cornerRadius = Layout.buttonSize / 2
-        magnitudeFilterButton.layer.shadowColor = UIColor.black.cgColor
-        magnitudeFilterButton.layer.shadowOpacity = 0.16
-        magnitudeFilterButton.layer.shadowRadius = 6
-        magnitudeFilterButton.layer.shadowOffset = CGSize(width: 0, height: 2)
         magnitudeFilterButton.addAction(UIAction { [weak self] _ in
             self?.toggleMagnitudeSlider()
         }, for: .touchUpInside)
         mapControlsContainer.addSubview(magnitudeFilterButton)
-
-        let filterStack = UIStackView()
-        filterStack.axis = .vertical
-        filterStack.alignment = .center
-        filterStack.spacing = 4
-        filterStack.isUserInteractionEnabled = false
-        filterStack.translatesAutoresizingMaskIntoConstraints = false
-        magnitudeFilterButton.addSubview(filterStack)
-
-        magnitudeFilterIcon.image = .icCustomMagnitude
-        magnitudeFilterIcon.tintColor = StarMapControlTheme.foreground(active: false, nightMode: nightMode)
-        magnitudeFilterIcon.contentMode = .scaleAspectFit
-        magnitudeFilterIcon.widthAnchor.constraint(equalToConstant: 30).isActive = true
-        magnitudeFilterIcon.heightAnchor.constraint(equalToConstant: 30).isActive = true
-        filterStack.addArrangedSubview(magnitudeFilterIcon)
-
-        magnitudeFilterText.textColor = StarMapControlTheme.foreground(active: false, nightMode: nightMode)
-        magnitudeFilterText.font = UIFont.systemFont(ofSize: 15, weight: .bold)
-        filterStack.addArrangedSubview(magnitudeFilterText)
-
-        magnitudeSliderCard.translatesAutoresizingMaskIntoConstraints = false
-        magnitudeSliderCard.backgroundColor = StarMapControlTheme.defaultBackground(nightMode: nightMode, alpha: 0.94)
-        magnitudeSliderCard.layer.cornerRadius = Layout.contentPadding
-        magnitudeSliderCard.layer.shadowColor = UIColor.black.cgColor
-        magnitudeSliderCard.layer.shadowOpacity = 0.16
-        magnitudeSliderCard.layer.shadowRadius = 6
-        magnitudeSliderCard.layer.shadowOffset = CGSize(width: 0, height: 2)
-        magnitudeSliderCard.isHidden = true
-        mapControlsContainer.addSubview(magnitudeSliderCard)
-
-        let sliderStack = UIStackView()
-        sliderStack.axis = .vertical
-        sliderStack.spacing = 6
-        sliderStack.layoutMargins = UIEdgeInsets(top: 8, left: 10, bottom: 8, right: 10)
-        sliderStack.isLayoutMarginsRelativeArrangement = true
-        sliderStack.translatesAutoresizingMaskIntoConstraints = false
-        magnitudeSliderCard.addSubview(sliderStack)
-
-        let sliderHeader = UIStackView()
-        sliderHeader.axis = .horizontal
-        sliderHeader.alignment = .center
-        sliderHeader.spacing = 8
-        magnitudeSliderTitle.text = localizedString("astro_min_magnitude")
-        magnitudeSliderTitle.textColor = StarMapControlTheme.textColor(nightMode: nightMode)
-        magnitudeSliderTitle.font = UIFont.systemFont(ofSize: 14)
-        sliderHeader.addArrangedSubview(magnitudeSliderTitle)
-        sliderHeader.addArrangedSubview(UIView())
-        magnitudeSliderValue.textColor = StarMapControlTheme.activeBackground()
-        magnitudeSliderValue.font = UIFont.systemFont(ofSize: 14, weight: .semibold)
-        sliderHeader.addArrangedSubview(magnitudeSliderValue)
-        sliderStack.addArrangedSubview(sliderHeader)
-
-        magnitudeSlider.minimumValue = -1
-        magnitudeSlider.maximumValue = Float(Layout.maxMagnitude)
-        magnitudeSlider.addTarget(self, action: #selector(magnitudeChanged), for: .valueChanged)
-        sliderStack.addArrangedSubview(magnitudeSlider)
-
+        
+        magnitudeSliderPanel.onValueChanged = { [weak self] value in
+            self?.applyMagnitudeFilter(value)
+        }
+        mapControlsContainer.addSubview(magnitudeSliderPanel)
+        
         NSLayoutConstraint.activate([
             magnitudeFilterButton.widthAnchor.constraint(equalToConstant: Layout.buttonSize),
             magnitudeFilterButton.heightAnchor.constraint(equalToConstant: Layout.magnitudeButtonHeight),
             magnitudeFilterButton.centerXAnchor.constraint(equalTo: settingsButton.centerXAnchor),
             magnitudeFilterButton.bottomAnchor.constraint(equalTo: settingsButton.topAnchor, constant: -Layout.contentPadding),
-
-            filterStack.centerXAnchor.constraint(equalTo: magnitudeFilterButton.centerXAnchor),
-            filterStack.centerYAnchor.constraint(equalTo: magnitudeFilterButton.centerYAnchor),
-
-            magnitudeSliderCard.widthAnchor.constraint(equalToConstant: Layout.magnitudeSliderWidth),
-            magnitudeSliderCard.heightAnchor.constraint(equalTo: magnitudeFilterButton.heightAnchor),
-            magnitudeSliderCard.trailingAnchor.constraint(equalTo: magnitudeFilterButton.leadingAnchor, constant: -Layout.contentPadding),
-            magnitudeSliderCard.topAnchor.constraint(equalTo: magnitudeFilterButton.topAnchor),
-
-            sliderStack.leadingAnchor.constraint(equalTo: magnitudeSliderCard.leadingAnchor),
-            sliderStack.trailingAnchor.constraint(equalTo: magnitudeSliderCard.trailingAnchor),
-            sliderStack.topAnchor.constraint(equalTo: magnitudeSliderCard.topAnchor),
-            sliderStack.bottomAnchor.constraint(equalTo: magnitudeSliderCard.bottomAnchor)
+            magnitudeSliderPanel.widthAnchor.constraint(equalToConstant: StarMapMagnitudeSliderPanel.preferredWidth),
+            magnitudeSliderPanel.heightAnchor.constraint(equalTo: magnitudeFilterButton.heightAnchor),
+            magnitudeSliderPanel.trailingAnchor.constraint(equalTo: magnitudeFilterButton.leadingAnchor, constant: -Layout.contentPadding),
+            magnitudeSliderPanel.topAnchor.constraint(equalTo: magnitudeFilterButton.topAnchor)
         ])
     }
+    
+    private func setupMacZoomControls() {
+        guard zoomButtonsVisible else { return }
 
-    private func setupCameraControls() {
-        sliderContainer.translatesAutoresizingMaskIntoConstraints = false
-        sliderContainer.isHidden = true
-        mapControlsContainer.addSubview(sliderContainer)
-
-        transparencySlider.minimumValue = 0
-        transparencySlider.maximumValue = 100
-        transparencySlider.value = 50
-        transparencySlider.transform = CGAffineTransform(rotationAngle: -.pi / 2)
-        transparencySlider.translatesAutoresizingMaskIntoConstraints = false
-        transparencySlider.addTarget(self, action: #selector(transparencyChanged), for: .valueChanged)
-        sliderContainer.addSubview(transparencySlider)
-
-        addRoundButton(resetFovButton, iconName: "ic_custom_reset", accessibilityLabel: localizedString("shared_string_reset"))
-        resetFovButton.addTarget(self, action: #selector(resetFov), for: .touchUpInside)
-        resetFovButton.isHidden = true
+        addRoundButton(zoomInButton,
+                       icon: .icCustomMapZoomIn,
+                       accessibilityLabel: localizedString("key_hint_zoom_in"))
+        zoomInButton.addTarget(self, action: #selector(zoomInPressed), for: .touchUpInside)
 
-        let cameraSliderTopConstraint = sliderContainer.topAnchor.constraint(equalTo: cameraButton.bottomAnchor, constant: Layout.contentPadding)
-        cameraSliderTopConstraint.priority = .defaultHigh
+        addRoundButton(zoomOutButton,
+                       icon: .icCustomMapZoomOut,
+                       accessibilityLabel: localizedString("key_hint_zoom_out"))
+        zoomOutButton.addTarget(self, action: #selector(zoomOutPressed), for: .touchUpInside)
 
         NSLayoutConstraint.activate([
-            sliderContainer.widthAnchor.constraint(equalToConstant: Layout.buttonSize),
-            sliderContainer.heightAnchor.constraint(equalToConstant: Layout.transparencySliderHeight),
-            sliderContainer.centerXAnchor.constraint(equalTo: cameraButton.centerXAnchor),
-            cameraSliderTopConstraint,
-            sliderContainer.topAnchor.constraint(greaterThanOrEqualTo: mapControlsContainer.safeAreaLayoutGuide.topAnchor, constant: Layout.contentPadding),
-
-            transparencySlider.centerXAnchor.constraint(equalTo: sliderContainer.centerXAnchor),
-            transparencySlider.centerYAnchor.constraint(equalTo: sliderContainer.centerYAnchor),
-            transparencySlider.widthAnchor.constraint(equalToConstant: Layout.transparencySliderHeight),
-            transparencySlider.heightAnchor.constraint(equalToConstant: 40),
-
-            resetFovButton.centerXAnchor.constraint(equalTo: sliderContainer.centerXAnchor),
-            resetFovButton.topAnchor.constraint(equalTo: sliderContainer.bottomAnchor, constant: 8),
-            resetFovButton.bottomAnchor.constraint(lessThanOrEqualTo: mapControlsContainer.safeAreaLayoutGuide.bottomAnchor, constant: -Layout.contentPadding)
+            zoomOutButton.centerXAnchor.constraint(equalTo: settingsButton.centerXAnchor),
+            zoomOutButton.bottomAnchor.constraint(equalTo: magnitudeFilterButton.topAnchor, constant: -Layout.zoomButtonsBottomPadding),
+
+            zoomInButton.centerXAnchor.constraint(equalTo: settingsButton.centerXAnchor),
+            zoomInButton.bottomAnchor.constraint(equalTo: zoomOutButton.topAnchor, constant: -Layout.contentPadding)
         ])
+        updateZoomButtonsEnabled()
     }
 
-    private func addRoundButton(_ button: StarMapButton, iconName: String? = nil, accessibilityLabel: String) {
+    private func addRoundButton(_ button: StarMapButton, icon: UIImage? = nil, accessibilityLabel: String) {
         button.translatesAutoresizingMaskIntoConstraints = false
-        if let iconName {
-            button.setIcon(iconName: iconName, accessibilityLabel: accessibilityLabel)
+        if let icon {
+            button.setIcon(icon: icon, accessibilityLabel: accessibilityLabel)
         } else {
             button.accessibilityLabel = accessibilityLabel
         }
@@ -502,31 +471,30 @@ final class StarMapViewController: UIViewController, StarViewDelegate {
             guard let self else {
                 return
             }
-            updateArModeUI(enabled)
             if !enabled {
-                manualAzimuth = true
+                starView.roll = 0
             }
+            guard !isApplyingControlChange else { return }
+            syncControlUI()
         }
         arModeHelper.onUnavailable = { [weak self] in
+            self?.disableArExperience(force: true)
             self?.showMessage(localizedString("astro_ar_unavailable"))
         }
         cameraHelper.onUnavailable = { [weak self] message in
-            self?.updateCameraUI(false)
+            self?.disableArExperience(force: true)
             self?.showMessage(message)
         }
-        cameraHelper.onCameraStateChanged = { [weak self] enabled in
-            guard let self else {
+        cameraHelper.onCameraStateChanged = { [weak self] _ in
+            guard let self, !isApplyingControlChange else {
                 return
             }
-            updateCameraUI(enabled)
-            if enabled && !arModeHelper.isArModeEnabled {
-                arModeHelper.toggleArMode(enable: true)
-            }
+            syncControlUI()
         }
     }
 
     private func setupListeners() {
-        timeSelectionView.setOnDateTimeChangeListener { [weak self] date in
+        timeSelectionView.onDateTimeChange = { [weak self] date in
             self?.setTimeAutoUpdateEnabled(false)
             self?.updateTime(date, animate: true)
         }
@@ -534,7 +502,7 @@ final class StarMapViewController: UIViewController, StarViewDelegate {
             self?.selectedObject = object
             if let object {
                 self?.showObjectInfo(object)
-            } else if self?.starView.getSelectedConstellationItem() == nil {
+            } else if self?.starView.selectedConstellationItem() == nil {
                 self?.hideBottomSheet()
             }
         }
@@ -547,16 +515,12 @@ final class StarMapViewController: UIViewController, StarViewDelegate {
             }
         }
         starView.onAzimuthManualChangeListener = { [weak self] azimuth in
-            guard let self, !cameraHelper.isCameraOverlayEnabled else {
-                return
-            }
-            if arModeHelper.isArModeEnabled {
-                arModeHelper.toggleArMode(enable: false)
-            }
-            manualAzimuth = true
+            guard let self else { return }
+
             compassButton.update(mapRotation: CGFloat(-azimuth))
         }
         starView.onViewAngleChangeListener = { [weak self] fov in
+            self?.updateZoomButtonsEnabled()
             self?.cameraHelper.updateCameraZoom(fov: fov)
         }
 
@@ -568,6 +532,11 @@ final class StarMapViewController: UIViewController, StarViewDelegate {
         dayNightModeObserver = OAAutoObserverProxy(self,
                                                    withHandler: #selector(onDayNightModeChanged),
                                                    andObserve: OsmAndApp.swiftInstance().dayNightModeObservable)
+        if let appModeObservable = OsmAndApp.swiftInstance()?.applicationModeChangedObservable {
+            applicationModeObserver = OAAutoObserverProxy(self,
+                                                          withHandler: #selector(onApplicationModeChanged),
+                                                          andObserve: appModeObservable)
+        }
         screenOrientationObserver = NotificationCenter.default.addObserver(forName: NSNotification.Name(ScreenOrientationHelper.screenOrientationChangedKey),
                                                                            object: nil,
                                                                            queue: .main) { [weak self] _ in
@@ -575,6 +544,50 @@ final class StarMapViewController: UIViewController, StarViewDelegate {
         }
     }
 
+    @objc private func onApplicationModeChanged() {
+        DispatchQueue.main.async { [weak self] in
+            guard let self else {
+                return
+            }
+            reloadAndApplyProfileSettings(restoreMapPosition: true)
+            viewModel.updateSettings(settings)
+            viewModel.load(preferredLocale: OsmAndApp.swiftInstance()?.getLanguageCode())
+        }
+    }
+
+    private func reloadProfileSettings() {
+        settings.reloadFromPreference()
+    }
+
+    private func applyProfileSettingsToUI(restoreMapPosition: Bool) {
+        let starMap = settings.starMapConfig()
+        let common = settings.commonConfig()
+        applySettings(starMap)
+        starView.settings = settings.copyForUI()
+        updateRegularMapVisibility(common.showRegularMap)
+        if restoreMapPosition, let pos = starMap.savedMapPosition {
+            starView.restoreMapPosition(pos)
+            compassButton.update(mapRotation: CGFloat(-pos.azimuth))
+            lastUpdatedAzimuth = pos.azimuth
+            updateStarMap()
+        } else if restoreMapPosition {
+            updateStarMap(updateAzimuth: true)
+        } else {
+            starView.setNeedsDisplay()
+        }
+        updateMagnitudeControls()
+        configureSheetController?.config = starMap
+        configureSheetController?.commonConfig = common
+        if let configureSheetController {
+            configureSheetController.applyRedFilter(enabled: starMap.showRedFilter)
+        }
+    }
+
+    private func reloadAndApplyProfileSettings(restoreMapPosition: Bool) {
+        reloadProfileSettings()
+        applyProfileSettingsToUI(restoreMapPosition: restoreMapPosition)
+    }
+
     private func syncObjectsToStarView() {
         starView.setSkyObjects(viewModel.skyObjects)
         starView.setConstellations(viewModel.constellations)
@@ -644,8 +657,17 @@ final class StarMapViewController: UIViewController, StarViewDelegate {
             config.is2DMode = starView.is2DMode
             config.showMagnitudeFilter = starView.showMagnitudeFilter || starView.magnitudeFilter != nil
             config.magnitudeFilter = starView.magnitudeFilter
+            config.savedMapPosition = AstronomyPluginSettings.MapViewPosition(
+                azimuth: starView.azimuth(),
+                altitude: starView.altitude(),
+                viewAngle: starView.viewAngleValue(),
+                roll: starView.roll,
+                panX: starView.is2DMode ? Double(starView.panX) : 0,
+                panY: starView.is2DMode ? Double(starView.panY) : 0
+            )
             return config
         }
+        starView.settings = settings.copyForUI()
         viewModel.updateSettings(settings)
     }
 
@@ -655,10 +677,11 @@ final class StarMapViewController: UIViewController, StarViewDelegate {
             updated.favorites = current.favorites
             updated.directions = current.directions
             updated.celestialPaths = current.celestialPaths
-            updated.recentlyViewed = current.recentlyViewed
+            updated.savedMapPosition = config.savedMapPosition ?? current.savedMapPosition
             return updated
         }
         applySettings(updatedConfig)
+        starView.settings = settings.copyForUI()
         viewModel.updateSettings(settings)
     }
 
@@ -674,46 +697,27 @@ final class StarMapViewController: UIViewController, StarViewDelegate {
         starView.setNeedsDisplay()
     }
 
-    func applyRedFilter(enabled: Bool) {
-        starView.showRedFilter = enabled
-        updateRedMode(enabled)
-        saveStarMapSettings()
-    }
-
-    func setRegularMapVisibility(enabled: Bool) {
-        updateRegularMapVisibility(enabled)
-        saveCommonSettings()
-    }
-
     private func apply2DMode(_ is2D: Bool) {
         if is2D {
-            previousAltitude = starView.getAltitude()
-            previousAzimuth = starView.getAzimuth()
-            previousViewAngle = starView.getViewAngle()
+            previousAltitude = starView.altitude()
+            previousAzimuth = starView.azimuth()
+            previousViewAngle = starView.viewAngleValue()
             starView.is2DMode = true
             starView.setCenter(azimuth: 180, altitude: 90)
-            if cameraHelper.isCameraOverlayEnabled {
-                cameraHelper.toggleCameraOverlay()
-            }
-            cameraButton.isHidden = true
-            if arModeHelper.isArModeEnabled {
-                arModeHelper.toggleArMode(enable: false)
-            }
-            arModeButton.isHidden = true
-            manualAzimuth = true
+            setArExperienceEnabled(false)
+            arControlCard.isHidden = true
         } else {
             starView.is2DMode = false
             starView.setCenter(azimuth: previousAzimuth, altitude: previousAltitude)
             starView.setViewAngle(previousViewAngle)
-            arModeButton.isHidden = false
-            cameraButton.isHidden = !arModeHelper.isArModeEnabled
+            arControlCard.isHidden = false
         }
         starView.setNeedsDisplay()
     }
 
     private func updateTime(_ date: Date, animate: Bool) {
         currentDate = date
-        timeSelectionView.setDateTime(date)
+        timeSelectionView.date = date
         starView.setDateTime(AstroUtils.astronomyTime(from: date), animate: animate)
         updateTimeControls()
         objectInfoController?.onTimeChanged()
@@ -729,7 +733,7 @@ final class StarMapViewController: UIViewController, StarViewDelegate {
 
     private func setTimeAutoUpdateEnabled(_ enabled: Bool) {
         isTimeAutoUpdateEnabled = enabled
-        resetTimeButton.isHidden = enabled
+        timeControlCard.setResetVisible(!enabled)
         if enabled {
             syncCurrentTimeForAutoUpdate(animate: true)
         } else {
@@ -760,7 +764,7 @@ final class StarMapViewController: UIViewController, StarViewDelegate {
 
     private func updateTimeControls() {
         let date = currentDate
-        timeSelectionView.setDateTime(date)
+        timeSelectionView.date = date
         let calendar = Calendar.current
         let now = Date()
         let formatter = DateFormatter()
@@ -770,21 +774,15 @@ final class StarMapViewController: UIViewController, StarViewDelegate {
             formatter.dateStyle = .short
             formatter.timeStyle = .short
         }
-        timeControlButton.setTitle(formatter.string(from: date), for: .normal)
+        timeControlCard.setTimeTitle(formatter.string(from: date))
 
         updateTimeControlTheme()
     }
 
     private func updateTimeControlTheme() {
-        let nightMode = OADayNightHelper.instance().isNightMode()
         let active = !timeSelectionView.isHidden
-        timeControlCard.backgroundColor = active
-            ? StarMapControlTheme.activeBackground()
-            : StarMapControlTheme.defaultBackground(nightMode: nightMode, alpha: 1)
-        timeControlButton.nightMode = nightMode
-        resetTimeButton.nightMode = nightMode
-        timeControlButton.active = active
-        resetTimeButton.active = active
+        timeControlCard.updateTheme(nightMode: nightMode, active: active)
+        timeSelectionView.updateTheme(nightMod: nightMode, active: active)
     }
 
     private func updateMagnitudeControls() {
@@ -792,47 +790,82 @@ final class StarMapViewController: UIViewController, StarViewDelegate {
         if starView.magnitudeFilter == nil || (starView.magnitudeFilter ?? 0) > Layout.maxMagnitude {
             starView.magnitudeFilter = Layout.maxMagnitude
         }
-        magnitudeSlider.value = Float(filterToUse)
         let text = String(format: "%.1f", filterToUse)
-        magnitudeFilterText.text = text
-        magnitudeSliderValue.text = text
+        magnitudeFilterButton.setValue(text)
+        magnitudeSliderPanel.setMagnitude(filterToUse)
         updateMagnitudeFilterTheme()
     }
 
     private func updateMagnitudeFilterTheme() {
-        let nightMode = OADayNightHelper.instance().isNightMode()
-        let active = !magnitudeSliderCard.isHidden
-        magnitudeFilterButton.backgroundColor = active
-            ? StarMapControlTheme.activeBackground()
-            : StarMapControlTheme.defaultBackground(nightMode: nightMode, alpha: 0.92)
-        magnitudeFilterIcon.tintColor = StarMapControlTheme.foreground(active: active, nightMode: nightMode)
-        magnitudeFilterText.textColor = StarMapControlTheme.foreground(active: active, nightMode: nightMode)
-        magnitudeSliderCard.backgroundColor = StarMapControlTheme.defaultBackground(nightMode: nightMode, alpha: 0.94)
-        magnitudeSliderTitle.textColor = StarMapControlTheme.textColor(nightMode: nightMode)
-        magnitudeSliderValue.textColor = StarMapControlTheme.activeBackground()
-    }
-
-    private func updateArModeUI(_ enabled: Bool) {
-        arModeButton.active = enabled
-        cameraButton.isHidden = !enabled || starView.is2DMode
+        magnitudeFilterButton.nightMode = nightMode
+        magnitudeFilterButton.active = magnitudeSliderPanel.isExpanded
+        
+        magnitudeSliderPanel.updateTheme(nightMode: nightMode)
+    }
+
+    private func setArExperienceEnabled(_ enabled: Bool) {
         if enabled {
-            starView.isCameraMode = true
-            starView.setNeedsDisplay()
+            enableArExperience()
         } else {
-            starView.roll = 0
-            starView.setNeedsDisplay()
-            if cameraHelper.isCameraOverlayEnabled {
-                cameraHelper.toggleCameraOverlay()
-            }
-            updateCameraUI(false)
+            disableArExperience()
+        }
+    }
+
+    private func enableArExperience() {
+        guard !starView.is2DMode else { return }
+        guard !isArCameraActive else {
+            syncControlUI()
+            return
+        }
+        guard !isApplyingControlChange else { return }
+        isApplyingControlChange = true
+        defer {
+            isApplyingControlChange = false
+            syncControlUI()
+        }
+        
+        guard arModeHelper.toggleArMode(enable: true) else { return }
+        
+        if !cameraHelper.isCameraOverlayEnabled {
+            cameraHelper.toggleCameraOverlay(in: mainLayout, below: starView)
         }
     }
 
-    private func updateCameraUI(_ enabled: Bool) {
-        cameraButton.active = enabled
-        sliderContainer.isHidden = !enabled
-        resetFovButton.isHidden = !enabled
-        starView.isCameraMode = enabled || arModeHelper.isRunning
+    private func disableArExperience(force: Bool = false) {
+        guard force || isGyroActive || isArCameraActive else {
+            syncControlUI()
+            return
+        }
+        guard force || !isApplyingControlChange else { return }
+        isApplyingControlChange = true
+        defer {
+            isApplyingControlChange = false
+            syncControlUI()
+        }
+        if cameraHelper.isCameraOverlayEnabled {
+            cameraHelper.toggleCameraOverlay(in: mainLayout, below: starView)
+        }
+        if arModeHelper.isArModeEnabled {
+            arModeHelper.toggleArMode(enable: false)
+        }
+        starView.roll = 0
+    }
+    
+    private func syncControlUI() {
+        let gyroEnabled = isGyroActive
+        let cameraEnabled = isArCameraActive
+        
+        compassButton.setArDirectionEnabled(gyroEnabled)
+        
+        arControlCard.setArActive(cameraEnabled)
+        arControlCard.updateTheme(nightMode: nightMode, arActive: cameraEnabled)
+        arControlCard.setCameraControlsVisible(cameraEnabled)
+        starView.isCameraMode = cameraEnabled
+        starView.isGyroTrackingEnabled = gyroEnabled
+        if !gyroEnabled {
+            starView.roll = 0
+        }
+        starView.setNeedsDisplay()
     }
 
     private func updateMapControlThemes() {
@@ -842,16 +875,15 @@ final class StarMapViewController: UIViewController, StarViewDelegate {
     }
 
     private func updateButtonsNightMode() {
-        let nightMode = OADayNightHelper.instance().isNightMode()
-        arModeButton.nightMode = nightMode
-        cameraButton.nightMode = nightMode
-        resetFovButton.nightMode = nightMode
+        arControlCard.updateTheme(nightMode: nightMode, arActive: isArCameraActive)
         closeButton.nightMode = nightMode
         settingsButton.nightMode = nightMode
         searchButton.nightMode = nightMode
         compassButton.nightMode = nightMode
-        resetTimeButton.nightMode = nightMode
-        timeControlButton.nightMode = nightMode
+        magnitudeFilterButton.nightMode = nightMode
+        magnitudeSliderPanel.updateTheme(nightMode: nightMode)
+        zoomInButton.nightMode = nightMode
+        zoomOutButton.nightMode = nightMode
     }
 
     private func updateRedMode(_ enabled: Bool) {
@@ -859,16 +891,15 @@ final class StarMapViewController: UIViewController, StarViewDelegate {
         AstroRedFilter.apply(enabled,
                              to: timeControlCard,
                              timeSelectionView,
-                             arModeButton,
-                             cameraButton,
-                             resetFovButton,
                              magnitudeFilterButton,
-                             magnitudeSliderCard,
+                             magnitudeSliderPanel,
                              compassButton,
                              searchButton,
                              closeButton,
                              settingsButton,
-                             sliderContainer,
+                             arControlCard,
+                             zoomInButton,
+                             zoomOutButton,
                              regularMapContainer)
         objectInfoController?.applyRedFilter(enabled: enabled)
         configureSheetController?.applyRedFilter(enabled: enabled)
@@ -958,7 +989,11 @@ final class StarMapViewController: UIViewController, StarViewDelegate {
 
     @objc private func onDayNightModeChanged() {
         DispatchQueue.main.async { [weak self] in
-            self?.updateMapControlThemes()
+            guard let self else { return }
+            let newValue = OADayNightHelper.instance().isNightMode()
+            guard newValue != nightMode else { return }
+            nightMode = newValue
+            updateMapControlThemes()
         }
     }
 
@@ -1002,14 +1037,6 @@ final class StarMapViewController: UIViewController, StarViewDelegate {
         starView.setNeedsDisplay()
     }
 
-    func trackableObjects() -> [SkyObject] {
-        viewModel.skyObjects + viewModel.constellations.map { $0 as SkyObject }
-    }
-
-    func findTrackableObjectById(_ id: String) -> SkyObject? {
-        trackableObjects().first { $0.id == id }
-    }
-
     private func hideBottomSheet() {
         hideBottomSheet(clearSelection: true)
     }
@@ -1232,53 +1259,19 @@ final class StarMapViewController: UIViewController, StarViewDelegate {
         present(alert, animated: true)
     }
 
-    func starView(_ starView: StarView, didSelect object: SkyObject?) {
-        selectedObject = object
-        updateTimeControls()
-    }
-
     private func handleSearchObjectSelected(_ obj: SkyObject) {
-        manualAzimuth = true
         selectedObject = obj
         starView.setSelectedObject(obj)
         showObjectInfo(obj, centerInVisibleMapOnPresentation: true)
     }
 
-    @objc func showSearchDialog() {
-        if UIDevice.current.userInterfaceIdiom == .pad, searchViewController != nil {
+    @objc private func showSearchDialog() {
+        if OAUtilities.isIPad(), searchViewController != nil {
             dismissSearchDialog(animated: true)
         } else {
             showSearchDialog(initialCatalogWid: nil)
         }
     }
-
-    func showSearchDialog(initialCatalogWid: String? = nil) {
-        clearPreviousSearchDialog()
-        let controller = StarMapSearchViewController.newInstance(initialCatalogWid: initialCatalogWid,
-                                                                 parent: self,
-                                                                 plugin: plugin)
-        controller.onObjectSelected = { [weak self] obj in
-            self?.handleSearchObjectSelected(obj)
-        }
-        controller.onDismiss = { [weak self] in
-            self?.dismissSearchDialog(animated: true)
-        }
-        controller.applyRedFilter(enabled: starView.showRedFilter)
-        searchViewController = controller
-        
-        let nav = UINavigationController(rootViewController: controller)
-        nav.modalPresentationStyle = .fullScreen
-        nav.navigationBar.prefersLargeTitles = true
-        searchNavigationController = nav
-        
-        if UIDevice.current.userInterfaceIdiom == .pad {
-            showLeftPanel(nav)
-            updateMapControlsVisibility()
-        } else {
-            nav.modalPresentationStyle = .fullScreen
-            (presentedViewController ?? self).present(nav, animated: true)
-        }
-    }
     
     private func dismissSearchDialog(animated: Bool, completion: (() -> Void)? = nil) {
         guard let navigationController = searchNavigationController else {
@@ -1309,30 +1302,6 @@ final class StarMapViewController: UIViewController, StarViewDelegate {
         dismissSearchDialog(animated: false)
     }
 
-    func searchableObjects() -> [SkyObject] {
-        trackableObjects()
-    }
-
-    func searchConstellations() -> [Constellation] {
-        viewModel.constellations
-    }
-
-    func searchObserver() -> Observer {
-        starView.observer
-    }
-
-    func searchCurrentDate() -> Date {
-        currentDate
-    }
-
-    func searchStarMapConfig() -> AstronomyPluginSettings.StarMapConfig {
-        settings.starMap
-    }
-
-    func isSearchRedFilterEnabled() -> Bool {
-        starView.showRedFilter
-    }
-    
     func makeSearchObjectActionHandler() -> StarMapObjectActionHandler {
         StarMapObjectActionHandler(
             onFavoriteChanged: { [weak self] object, enabled in
@@ -1390,13 +1359,12 @@ final class StarMapViewController: UIViewController, StarViewDelegate {
         hideBottomSheet(clearSelection: false)
 
         let sheet = AstroConfigureViewBottomSheet()
-        sheet.config = settings.starMap
-        sheet.commonConfig = settings.common
+        sheet.config = settings.starMapConfig()
+        sheet.commonConfig = settings.commonConfig()
         sheet.onConfigChanged = { [weak self] config in
             self?.setStarMapSettings(config)
         }
         sheet.onCommonConfigChanged = { [weak self] config in
-            self?.settings.common = config
             self?.updateRegularMapVisibility(config.showRegularMap)
             self?.saveCommonSettings()
         }
@@ -1523,6 +1491,9 @@ final class StarMapViewController: UIViewController, StarViewDelegate {
     @objc private func toggleTimeSelection() {
         timeSelectionView.isHidden.toggle()
         updateTimeControlTheme()
+        if !timeSelectionView.isHidden && !magnitudeSliderPanel.isHidden {
+            toggleMagnitudeSlider()
+        }
     }
 
     @objc private func resetTimeButtonPressed() {
@@ -1530,38 +1501,85 @@ final class StarMapViewController: UIViewController, StarViewDelegate {
     }
 
     @objc private func toggleARMode() {
-        arModeHelper.toggleArMode()
+        setArExperienceEnabled(!isArCameraActive)
     }
-
-    @objc private func toggleCamera() {
-        cameraHelper.toggleCameraOverlay(in: view, below: starView)
+    
+    @objc private func toggleGyroMode() {
+        setGyroEnabled(!isGyroActive)
     }
-
-    @objc private func transparencyChanged() {
-        cameraHelper.setTransparency(progress: Int(transparencySlider.value))
+    
+    private func setGyroEnabled(_ enabled: Bool) {
+        guard !starView.is2DMode else { return }
+        guard isGyroActive != enabled else {
+            syncControlUI()
+            return
+        }
+        isApplyingControlChange = true
+        defer {
+            isApplyingControlChange = false
+            syncControlUI()
+        }
+        if enabled {
+            arModeHelper.toggleArMode(enable: true)
+        } else {
+            arModeHelper.toggleArMode(enable: false)
+            starView.roll = 0
+        }
     }
 
     @objc private func resetFov() {
         cameraHelper.resetFov()
+        arControlCard.setTransparencyValue(StarMapCameraHelper.defaultTransparency)
     }
 
     @objc private func toggleMagnitudeSlider() {
-        magnitudeSliderCard.isHidden.toggle()
+        magnitudeSliderPanel.toggle()
         updateMagnitudeFilterTheme()
+        
+        if !timeSelectionView.isHidden && !magnitudeSliderPanel.isHidden {
+            toggleTimeSelection()
+        }
     }
 
-    @objc private func magnitudeChanged() {
-        starView.magnitudeFilter = Double(magnitudeSlider.value)
+    private func applyMagnitudeFilter(_ value: Double) {
+        starView.magnitudeFilter = value
         starView.showMagnitudeFilter = true
         settings.updateStarMapConfig { current in
             var config = current
             config.showMagnitudeFilter = true
-            config.magnitudeFilter = starView.magnitudeFilter
+            config.magnitudeFilter = value
             return config
         }
         updateMagnitudeControls()
         starView.setNeedsDisplay()
     }
+    
+    @objc private func zoomInPressed() {
+        starView.zoomIn()
+        updateZoomButtonsEnabled()
+    }
+
+    @objc private func zoomOutPressed() {
+        starView.zoomOut()
+        updateZoomButtonsEnabled()
+    }
+
+    private func updateZoomButtonsEnabled() {
+        guard zoomButtonsVisible else { return }
+
+        zoomInButton.isEnabled = starView.canZoomIn()
+        zoomOutButton.isEnabled = starView.canZoomOut()
+    }
+    
+    deinit {
+        mapLocationObserver?.detach()
+        dayNightModeObserver?.detach()
+        applicationModeObserver?.detach()
+        if let screenOrientationObserver {
+            NotificationCenter.default.removeObserver(screenOrientationObserver)
+        }
+        restoreRegularMapIfNeeded(refresh: false)
+    }
 }
 
 private final class StarMapControlsContainer: UIView {
diff --git a/Sources/Plugins/Astronomy/StarObjectsViewModel.swift b/Sources/Plugins/Astronomy/StarObjectsViewModel.swift
index 4e6583ba3d..71095b7f3b 100644
--- a/Sources/Plugins/Astronomy/StarObjectsViewModel.swift
+++ b/Sources/Plugins/Astronomy/StarObjectsViewModel.swift
@@ -9,12 +9,14 @@
 import Foundation
 
 final class StarObjectsViewModel {
-    private let provider: AstroDataProvider
+    var onDataChanged: (() -> Void)?
+    
     private(set) var settings: AstronomyPluginSettings
 
-    var onDataChanged: (() -> Void)?
     private(set) var skyObjects: [SkyObject] = []
     private(set) var constellations: [Constellation] = []
+    
+    private let provider: AstroDataProvider
 
     init(provider: AstroDataProvider, settings: AstronomyPluginSettings) {
         self.provider = provider
@@ -36,7 +38,8 @@ final class StarObjectsViewModel {
             let constellations = provider.getConstellations(preferredLocale: preferredLocale)
             DispatchQueue.main.async {
                 self.applyObjectSettings(to: objects + constellations.map { $0 as SkyObject })
-                let favoriteOrder = Dictionary(uniqueKeysWithValues: self.settings.starMap.favorites.enumerated().map { ($0.element.id, $0.offset) })
+                let starMap = self.settings.starMapConfig()
+                let favoriteOrder = Dictionary(uniqueKeysWithValues: starMap.favorites.enumerated().map { ($0.element.id, $0.offset) })
                 self.skyObjects = objects.sorted { (favoriteOrder[$0.id] ?? Int.max) < (favoriteOrder[$1.id] ?? Int.max) }
                 self.constellations = constellations.sorted { (favoriteOrder[$0.id] ?? Int.max) < (favoriteOrder[$1.id] ?? Int.max) }
                 self.onDataChanged?()
@@ -52,9 +55,10 @@ final class StarObjectsViewModel {
             targetObjects = skyObjects + constellations.map { $0 as SkyObject }
         }
 
-        let favoritesMap = Dictionary(uniqueKeysWithValues: settings.starMap.favorites.map { ($0.id, $0) })
-        let directionsMap = Dictionary(uniqueKeysWithValues: settings.starMap.directions.map { ($0.id, $0) })
-        let celestialPathsMap = Dictionary(uniqueKeysWithValues: settings.starMap.celestialPaths.map { ($0.id, $0) })
+        let starMap = settings.starMapConfig()
+        let favoritesMap = Dictionary(uniqueKeysWithValues: starMap.favorites.map { ($0.id, $0) })
+        let directionsMap = Dictionary(uniqueKeysWithValues: starMap.directions.map { ($0.id, $0) })
+        let celestialPathsMap = Dictionary(uniqueKeysWithValues: starMap.celestialPaths.map { ($0.id, $0) })
         for object in targetObjects {
             object.isFavorite = favoritesMap[object.id] != nil
             object.showDirection = directionsMap[object.id] != nil
diff --git a/Sources/Plugins/Astronomy/StarView.swift b/Sources/Plugins/Astronomy/StarView.swift
index 18ab054db0..ee0a466691 100644
--- a/Sources/Plugins/Astronomy/StarView.swift
+++ b/Sources/Plugins/Astronomy/StarView.swift
@@ -39,6 +39,8 @@ final class StarView: UIView {
         let targetAzimuth: Double
         let startAltitude: Double
         let targetAltitude: Double
+        let startRoll: Double
+        let targetRoll: Double
         let startViewAngle: Double
         let targetViewAngle: Double
         let startPan: CGPoint
@@ -51,8 +53,21 @@ final class StarView: UIView {
         static let max2D = 220.0
     }
 
-    weak var delegate: StarViewDelegate?
+    var isCameraMode = false
+    var isGyroTrackingEnabled = false
+    var onAnimationFinished: (() -> Void)?
+    var onAzimuthManualChangeListener: ((Double) -> Void)?
+    var onViewAngleChangeListener: ((Double) -> Void)?
 
+    private(set) var panX: CGFloat = 0
+    private(set) var panY: CGFloat = 0
+    private(set) var centerAzimuth = 180.0
+    private(set) var centerAltitude = 45.0
+    private(set) var viewAngle = 60.0
+    var roll = 0.0
+    
+    weak var delegate: StarViewDelegate?
+    
     var viewModel: StarObjectsViewModel? {
         didSet {
             rebuildObjectMap()
@@ -75,16 +90,6 @@ final class StarView: UIView {
         }
     }
 
-    var isCameraMode = false
-    var onAnimationFinished: (() -> Void)?
-    var onAzimuthManualChangeListener: ((Double) -> Void)?
-    var onViewAngleChangeListener: ((Double) -> Void)?
-
-    private(set) var centerAzimuth = 180.0
-    private(set) var centerAltitude = 45.0
-    private(set) var viewAngle = 60.0
-    var roll = 0.0
-
     var showAzimuthalGrid: Bool {
         get { settings.starMap.showAzimuthalGrid }
         set { settings.starMap.showAzimuthalGrid = newValue; setNeedsDisplay() }
@@ -202,11 +207,65 @@ final class StarView: UIView {
 
     var is2DMode: Bool {
         get { settings.starMap.is2DMode }
-        set { settings.starMap.is2DMode = newValue; setNeedsDisplay() }
+        set {
+            cancelFocusAnimation()
+            settings.starMap.is2DMode = newValue
+            if newValue {
+                roll = 0
+            } else {
+                panX = 0
+                panY = 0
+            }
+            setNeedsDisplay()
+        }
+    }
+    
+    var currentTime: Time {
+        get {
+            explicitCurrentTime ?? AstroUtils.astronomyTime(from: Date())
+        }
+        set {
+            explicitCurrentTime = newValue
+        }
+    }
+
+    var observer: Observer {
+        get {
+            explicitObserver ?? AstroUtils.observer(from: nil)
+        }
+        set {
+            explicitObserver = newValue
+        }
+    }
+
+    private var skyObjects: [SkyObject] {
+        (manualSkyObjects ?? viewModel?.skyObjects ?? [])
+            .filter { $0.type != .CONSTELLATION }
+            .sorted { $0.magnitude < $1.magnitude }
+    }
+
+    private var constellations: [Constellation] {
+        manualConstellations ?? viewModel?.constellations ?? []
+    }
+
+    private var trackableObjects: [SkyObject] {
+        skyObjects + constellations.map { $0 as SkyObject }
+    }
+
+    private var screenScale: CGFloat {
+        window?.screen.scale ?? UIScreen.main.scale
     }
+    
+    private let timeAnimationDuration: CFTimeInterval = 0.4
+    private let focusAnimationDuration: CFTimeInterval = 0.5
+    private let eclipticStep = 10
+    private let equatorStep = 2
+    private let galacticStep = 5
+    private let inertialDecelerationRate: CGFloat = 0.998
+    private let inertialStopSpeed: CGFloat = 5
+    private let inertialMinStartSpeed: CGFloat = 80
+    private let gyroSnapBackDelay: TimeInterval = 0.5
 
-    private var panX: CGFloat = 0
-    private var panY: CGFloat = 0
     private var lastTouchPoint = CGPoint.zero
     private var isPanning = false
 
@@ -234,29 +293,24 @@ final class StarView: UIView {
     private var explicitObserver: Observer?
     private var timeAnimationDisplayLink: CADisplayLink?
     private var timeAnimationStartTime: CFTimeInterval = 0
-    private let timeAnimationDuration: CFTimeInterval = 0.4
     private var focusAnimationDisplayLink: CADisplayLink?
     private var focusAnimationStartTime: CFTimeInterval = 0
-    private let focusAnimationDuration: CFTimeInterval = 0.5
     private var focusAnimation: FocusAnimation?
     private var onObjectClickListener: ((SkyObject?) -> Void)?
     private var onConstellationClickListener: ((Constellation?) -> Void)?
 
-    private let eclipticStep = 10
     private var eclipticAzimuths: [Double] = []
     private var eclipticAltitudes: [Double] = []
     private var lastEclipticTimeT = -1.0
     private var lastEclipticLat = -999.0
     private var lastEclipticLon = -999.0
-
-    private let equatorStep = 2
+    
     private var equatorAzimuths: [Double] = []
     private var equatorAltitudes: [Double] = []
     private var lastEquatorTimeT = -1.0
     private var lastEquatorLat = -999.0
     private var lastEquatorLon = -999.0
 
-    private let galacticStep = 5
     private var galacticAzimuths: [Double] = []
     private var galacticAltitudes: [Double] = []
     private var lastGalacticTimeT = -1.0
@@ -274,66 +328,82 @@ final class StarView: UIView {
     private var lastEquGridTimeT = -1.0
     private var lastEquGridLat = -999.0
     private var lastEquGridLon = -999.0
-
-    var currentTime: Time {
-        get {
-            explicitCurrentTime ?? AstroUtils.astronomyTime(from: Date())
-        }
-        set {
-            explicitCurrentTime = newValue
-        }
-    }
-
-    var observer: Observer {
-        get {
-            explicitObserver ?? AstroUtils.observer(from: nil)
-        }
-        set {
-            explicitObserver = newValue
-        }
-    }
-
-    private var skyObjects: [SkyObject] {
-        (manualSkyObjects ?? viewModel?.skyObjects ?? [])
-            .filter { $0.type != .CONSTELLATION }
-            .sorted { $0.magnitude < $1.magnitude }
-    }
-
-    private var constellations: [Constellation] {
-        manualConstellations ?? viewModel?.constellations ?? []
-    }
-
-    private var trackableObjects: [SkyObject] {
-        skyObjects + constellations.map { $0 as SkyObject }
-    }
-
-    private var screenScale: CGFloat {
-        window?.screen.scale ?? UIScreen.main.scale
-    }
+    
+    private var inertialDisplayLink: CADisplayLink?
+    private var inertialVelocity: CGPoint = .zero
+    private var lastInertialTimestamp: CFTimeInterval = 0
+    private var didPanThisGesture = false
+    
+    private var gyroTargetAzimuth = 0.0
+    private var gyroTargetAltitude = 45.0
+    private var gyroTargetRoll = 0.0
+    private var isGyroPanOverride = false
+    private var gyroSnapBackWorkItem: DispatchWorkItem?
 
     override init(frame: CGRect) {
         super.init(frame: frame)
         commonInit()
     }
 
-    deinit {
-        timeAnimationDisplayLink?.invalidate()
-        focusAnimationDisplayLink?.invalidate()
-    }
-
     required init?(coder: NSCoder) {
         super.init(coder: coder)
         commonInit()
     }
+    
+    override func draw(_ rect: CGRect) {
+        guard let context = UIGraphicsGetCurrentContext() else {
+            return
+        }
 
-    private func commonInit() {
-        backgroundColor = .clear
-        isOpaque = false
-        contentMode = .redraw
+        updateProjectionCache()
+        rebuildObjectMap()
+        occupiedRects.removeAll(keepingCapacity: true)
 
-        addGestureRecognizer(UIPanGestureRecognizer(target: self, action: #selector(handlePan(_:))))
-        addGestureRecognizer(UIPinchGestureRecognizer(target: self, action: #selector(handlePinch(_:))))
-        addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(handleTap(_:))))
+        context.saveGState()
+        drawBackground(in: context)
+        if settings.starMap.showEquatorialGrid {
+            drawEquatorialGrid(in: context)
+        }
+        if settings.starMap.showAzimuthalGrid {
+            drawAzimuthalGrid(in: context)
+        }
+        if settings.starMap.showEclipticLine {
+            drawEclipticLine(in: context)
+        }
+        if settings.starMap.showMeridianLine {
+            drawMeridianLine(in: context)
+        }
+        if settings.starMap.showEquatorLine {
+            drawEquatorLine(in: context)
+        }
+        if settings.starMap.showGalacticLine {
+            drawGalacticLine(in: context)
+        }
+        drawConstellationLines(in: context)
+        drawHorizon(in: context)
+        drawCelestialPaths(in: context)
+        drawConstellationLabels(in: context)
+        drawSkyObjects(in: context)
+        drawHighlights(in: context)
+        drawDirectionArrows(in: context)
+
+        context.restoreGState()
+    }
+    
+    func restoreMapPosition(_ position: AstronomyPluginSettings.MapViewPosition) {
+        setCenter(azimuth: position.azimuth, altitude: position.altitude)
+        viewAngle = position.viewAngle
+        setViewAngle(position.viewAngle)
+        roll = position.roll
+        if settings.starMap.is2DMode {
+            panX = CGFloat(position.panX)
+            panY = CGFloat(position.panY)
+        } else {
+            panX = 0
+            panY = 0
+        }
+        notifyAzimuthChanged()
+        setNeedsDisplay()
     }
 
     func resetView() {
@@ -360,9 +430,16 @@ final class StarView: UIView {
     }
 
     func setCameraOrientation(azimuth: Double, altitude: Double, roll: Double) {
+        gyroTargetAzimuth = azimuth
+        gyroTargetAltitude = altitude
+        gyroTargetRoll = roll
+        
+        guard !isGyroPanOverride else { return }
+        
         setCenter(azimuth: azimuth, altitude: altitude)
         self.roll = roll
         setNeedsDisplay()
+        notifyAzimuthChanged()
     }
 
     func setCenter(azimuth: Double, altitude: Double, animate: Bool = false) {
@@ -375,6 +452,269 @@ final class StarView: UIView {
         centerAltitude = max(-90, min(90, altitude))
         setNeedsDisplay()
     }
+    
+    func altitude() -> Double {
+        centerAltitude
+    }
+
+    func azimuth() -> Double {
+        centerAzimuth
+    }
+
+    func viewAngleValue() -> Double {
+        viewAngle
+    }
+
+    func setAzimuth(_ azimuth: Double, animate: Bool = false, fps: Int? = 30) {
+        guard abs(centerAzimuth - azimuth) >= 0.5 else {
+            return
+        }
+        if animate {
+            animateTo(azimuth: azimuth, altitude: centerAltitude)
+        } else {
+            cancelFocusAnimation()
+            centerAzimuth = normalizedDegrees(azimuth)
+            setNeedsDisplay()
+        }
+        notifyAzimuthChanged()
+    }
+
+    func setSkyObjects(_ objects: [SkyObject]) {
+        manualSkyObjects = objects.sorted { $0.magnitude < $1.magnitude }
+        rebuildObjectMap()
+        rebuildConstellationCenterCache()
+        recalculatePositions(time: currentTime, updateTargets: false, force: true)
+        let celestialPathObjects = Set(objects.filter { $0.showCelestialPath })
+        let staleObjects = pinnedObjects.filter { !($0 is Constellation) && !celestialPathObjects.contains($0) }
+        pinnedObjects.subtract(staleObjects)
+        for object in staleObjects {
+            pathCache.removeValue(forKey: object.id)
+        }
+        pinnedObjects.formUnion(celestialPathObjects)
+        setNeedsDisplay()
+    }
+
+    func setConstellations(_ list: [Constellation]) {
+        manualConstellations = list
+        rebuildObjectMap()
+        rebuildConstellationCenterCache()
+        recalculatePositions(time: currentTime, updateTargets: false, force: true)
+        let celestialPathConstellations = Set<SkyObject>(list.filter { $0.showCelestialPath }.map { $0 as SkyObject })
+        let staleConstellations = pinnedObjects.filter { $0 is Constellation && !celestialPathConstellations.contains($0) }
+        pinnedObjects.subtract(staleConstellations)
+        for constellation in staleConstellations {
+            pathCache.removeValue(forKey: constellation.id)
+        }
+        pinnedObjects.formUnion(celestialPathConstellations)
+        setNeedsDisplay()
+    }
+
+    func refreshObjects() {
+        recalculatePositions(time: currentTime, updateTargets: false)
+        setNeedsDisplay()
+    }
+
+    func updateRedFilter() {
+        AstroRedFilter.apply(settings.starMap.showRedFilter, to: self)
+        setNeedsDisplay()
+    }
+
+    func setOnObjectClickListener(_ listener: @escaping (SkyObject?) -> Void) {
+        onObjectClickListener = listener
+    }
+
+    func setOnConstellationClickListener(_ listener: @escaping (Constellation?) -> Void) {
+        onConstellationClickListener = listener
+    }
+
+    func selectedConstellationItem() -> Constellation? {
+        guard let selectedConstellationId else {
+            return nil
+        }
+        return constellations.first { $0.id == selectedConstellationId }
+    }
+
+    func setSelectedObject(_ object: SkyObject?, center: Bool = false, animate: Bool = false) {
+        if let constellation = object as? Constellation {
+            setSelectedConstellation(constellation, center: center, animate: animate)
+            return
+        }
+        selectedConstellationId = nil
+        selectedConstellationStarIds.removeAll()
+        selectedObject = object
+        if let object {
+            if object.azimuth == 0 && object.altitude == 0 {
+                calculatePosition(object)
+            }
+            if center {
+                setCenter(azimuth: object.azimuth, altitude: object.altitude, animate: animate)
+            }
+        }
+        setNeedsDisplay()
+    }
+
+    func setSelectedObject(_ object: SkyObject?, centerAt targetPoint: CGPoint, animate: Bool = false) {
+        if let constellation = object as? Constellation {
+            setSelectedConstellation(constellation, centerAt: targetPoint, animate: animate)
+            return
+        }
+        selectedConstellationId = nil
+        selectedConstellationStarIds.removeAll()
+        selectedObject = object
+        if let object {
+            if object.azimuth == 0 && object.altitude == 0 {
+                calculatePosition(object)
+            }
+            setCenter(azimuth: object.azimuth, altitude: object.altitude, at: targetPoint, animate: animate)
+        }
+        setNeedsDisplay()
+    }
+
+    func setSelectedConstellation(_ constellation: Constellation?, center: Bool = false, animate: Bool = false) {
+        selectedConstellationId = constellation?.id
+        selectedObject = constellation
+        selectedConstellationStarIds.removeAll()
+        for (first, second) in constellation?.lines ?? [] {
+            selectedConstellationStarIds.insert(first)
+            selectedConstellationStarIds.insert(second)
+        }
+        for object in skyObjects where selectedConstellationStarIds.contains(object.hip) {
+            calculatePosition(object, time: currentTime, updateTargets: false)
+            object.azimuth = object.targetAzimuth
+            object.altitude = object.targetAltitude
+        }
+        if let constellation, center {
+            let centers = constellationCenters()
+            if let center = centers[constellation.id] {
+                let targetAngle = targetViewAngle(for: constellation, center: center)
+                if animate {
+                    animateTo(azimuth: center.azimuth, altitude: center.altitude, targetViewAngle: targetAngle)
+                } else {
+                    setCenter(azimuth: center.azimuth, altitude: center.altitude)
+                    setViewAngle(targetAngle)
+                }
+            }
+        }
+        setNeedsDisplay()
+    }
+
+    func setSelectedConstellation(_ constellation: Constellation?, centerAt targetPoint: CGPoint, animate: Bool = false) {
+        selectedConstellationId = constellation?.id
+        selectedObject = constellation
+        selectedConstellationStarIds.removeAll()
+        for (first, second) in constellation?.lines ?? [] {
+            selectedConstellationStarIds.insert(first)
+            selectedConstellationStarIds.insert(second)
+        }
+        for object in skyObjects where selectedConstellationStarIds.contains(object.hip) {
+            calculatePosition(object, time: currentTime, updateTargets: false)
+            object.azimuth = object.targetAzimuth
+            object.altitude = object.targetAltitude
+        }
+        if let constellation {
+            let centers = constellationCenters()
+            if let center = centers[constellation.id] {
+                setCenter(azimuth: center.azimuth,
+                          altitude: center.altitude,
+                          at: targetPoint,
+                          animate: animate,
+                          targetViewAngle: targetViewAngle(for: constellation, center: center))
+            }
+        }
+        setNeedsDisplay()
+    }
+    
+    func isObjectPinned(_ object: SkyObject) -> Bool {
+        pinnedObjects.contains(object)
+    }
+
+    func setObjectPinned(_ object: SkyObject, pinned: Bool, forceUpdate: Bool = false) {
+        if pinned {
+            pinnedObjects.insert(object)
+        } else {
+            pinnedObjects.remove(object)
+            pathCache.removeValue(forKey: object.id)
+        }
+        if forceUpdate {
+            setNeedsDisplay()
+        }
+    }
+
+    func setDateTime(_ time: Time, animate: Bool = true) {
+        timeAnimationDisplayLink?.invalidate()
+        timeAnimationDisplayLink = nil
+
+        if animate {
+            for object in skyObjects {
+                object.startAzimuth = object.azimuth
+                object.startAltitude = object.altitude
+            }
+            captureConstellationAnimationStarts()
+            recalculatePositions(time: time, updateTargets: true, force: true)
+            currentTime = time
+            timeAnimationStartTime = CACurrentMediaTime()
+            let displayLink = CADisplayLink(target: self, selector: #selector(handleTimeAnimationFrame(_:)))
+            timeAnimationDisplayLink = displayLink
+            displayLink.add(to: .main, forMode: .common)
+        } else {
+            currentTime = time
+            recalculatePositions(time: time, updateTargets: true, force: true)
+            for object in skyObjects {
+                object.azimuth = object.targetAzimuth
+                object.altitude = object.targetAltitude
+            }
+            var updatedCenters = constellationCenterCache
+            for (id, center) in constellationCenterCache {
+                var updated = center
+                updated.azimuth = center.targetAzimuth
+                updated.altitude = center.targetAltitude
+                updatedCenters[id] = updated
+            }
+            constellationCenterCache = updatedCenters
+            updateConstellationObjectPositions()
+            setNeedsDisplay()
+            onAnimationFinished?()
+        }
+    }
+    
+    func setViewAngle(_ angle: Double) {
+        updateViewAngle(angle)
+    }
+
+    func zoomIn() {
+        updateViewAngle(viewAngle / 1.5)
+    }
+
+    func zoomOut() {
+        updateViewAngle(viewAngle * 1.5)
+    }
+    
+    func canZoomIn() -> Bool {
+        viewAngle > ViewAngleBounds.min + 0.5
+    }
+    
+    func canZoomOut() -> Bool {
+        viewAngle < maxViewAngle - 0.5
+    }
+
+    func project(object: SkyObject) -> CGPoint? {
+        updateProjectionCache()
+        return skyToScreen(azimuth: object.azimuth, altitude: object.altitude)
+    }
+    
+    func calculatePosition(_ object: SkyObject) {
+        calculatePosition(object, time: currentTime, updateTargets: false)
+    }
+    
+    private func commonInit() {
+        backgroundColor = .clear
+        isOpaque = false
+        contentMode = .redraw
+
+        addGestureRecognizer(UIPanGestureRecognizer(target: self, action: #selector(handlePan(_:))))
+        addGestureRecognizer(UIPinchGestureRecognizer(target: self, action: #selector(handlePinch(_:))))
+        addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(handleTap(_:))))
+    }
 
     private func setCenter(azimuth: Double,
                            altitude: Double,
@@ -441,12 +781,15 @@ final class StarView: UIView {
     private func animateTo(azimuth: Double,
                            altitude: Double,
                            targetViewAngle: Double? = nil,
-                           targetPan: CGPoint? = nil) {
+                           targetPan: CGPoint? = nil,
+                           targetRoll: Double? = nil) {
         cancelFocusAnimation()
         focusAnimation = FocusAnimation(startAzimuth: centerAzimuth,
                                         targetAzimuth: normalizedDegrees(azimuth),
                                         startAltitude: centerAltitude,
                                         targetAltitude: max(-90, min(90, altitude)),
+                                        startRoll: roll,
+                                        targetRoll: targetRoll ?? roll,
                                         startViewAngle: viewAngle,
                                         targetViewAngle: targetViewAngle.map { boundedViewAngle($0) } ?? viewAngle,
                                         startPan: CGPoint(x: panX, y: panY),
@@ -460,214 +803,67 @@ final class StarView: UIView {
     private func cancelFocusAnimation() {
         focusAnimationDisplayLink?.invalidate()
         focusAnimationDisplayLink = nil
-        focusAnimation = nil
-    }
-
-    @objc private func handleFocusAnimationFrame(_ displayLink: CADisplayLink) {
-        guard let animation = focusAnimation else {
-            cancelFocusAnimation()
-            return
-        }
-
-        let rawFraction = min(1.0, max(0.0, (displayLink.timestamp - focusAnimationStartTime) / focusAnimationDuration))
-        let fraction = 1.0 - pow(1.0 - rawFraction, 2.0)
-        applyFocusAnimation(animation, fraction: fraction)
-        if rawFraction >= 1 {
-            applyFocusAnimation(animation, fraction: 1)
-            cancelFocusAnimation()
-            onAnimationFinished?()
-        }
-    }
-
-    private func applyFocusAnimation(_ animation: FocusAnimation, fraction: Double) {
-        centerAzimuth = interpolateAngle(start: animation.startAzimuth, end: animation.targetAzimuth, fraction: fraction)
-        centerAltitude = animation.startAltitude + (animation.targetAltitude - animation.startAltitude) * fraction
-        viewAngle = animation.startViewAngle + (animation.targetViewAngle - animation.startViewAngle) * fraction
-        if let targetPan = animation.targetPan {
-            let cgFraction = CGFloat(fraction)
-            panX = animation.startPan.x + (targetPan.x - animation.startPan.x) * cgFraction
-            panY = animation.startPan.y + (targetPan.y - animation.startPan.y) * cgFraction
-        }
-        if abs(animation.targetViewAngle - animation.startViewAngle) > 0.001 {
-            onViewAngleChangeListener?(viewAngle)
-        }
-        setNeedsDisplay()
-    }
-
-    func getAltitude() -> Double {
-        centerAltitude
-    }
-
-    func getAzimuth() -> Double {
-        centerAzimuth
-    }
-
-    func getViewAngle() -> Double {
-        viewAngle
-    }
-
-    func setAzimuth(_ azimuth: Double, animate: Bool = false, fps: Int? = 30) {
-        guard abs(centerAzimuth - azimuth) >= 0.5 else {
-            return
-        }
-        if animate {
-            animateTo(azimuth: azimuth, altitude: centerAltitude)
-        } else {
-            cancelFocusAnimation()
-            centerAzimuth = normalizedDegrees(azimuth)
-            setNeedsDisplay()
-        }
-        onAzimuthManualChangeListener?(centerAzimuth)
-    }
-
-    func setSkyObjects(_ objects: [SkyObject]) {
-        manualSkyObjects = objects.sorted { $0.magnitude < $1.magnitude }
-        rebuildObjectMap()
-        rebuildConstellationCenterCache()
-        recalculatePositions(time: currentTime, updateTargets: false, force: true)
-        let celestialPathObjects = Set(objects.filter { $0.showCelestialPath })
-        let staleObjects = pinnedObjects.filter { !($0 is Constellation) && !celestialPathObjects.contains($0) }
-        pinnedObjects.subtract(staleObjects)
-        for object in staleObjects {
-            pathCache.removeValue(forKey: object.id)
-        }
-        pinnedObjects.formUnion(celestialPathObjects)
-        setNeedsDisplay()
-    }
-
-    func setConstellations(_ list: [Constellation]) {
-        manualConstellations = list
-        rebuildObjectMap()
-        rebuildConstellationCenterCache()
-        recalculatePositions(time: currentTime, updateTargets: false, force: true)
-        let celestialPathConstellations = Set<SkyObject>(list.filter { $0.showCelestialPath }.map { $0 as SkyObject })
-        let staleConstellations = pinnedObjects.filter { $0 is Constellation && !celestialPathConstellations.contains($0) }
-        pinnedObjects.subtract(staleConstellations)
-        for constellation in staleConstellations {
-            pathCache.removeValue(forKey: constellation.id)
-        }
-        pinnedObjects.formUnion(celestialPathConstellations)
-        setNeedsDisplay()
-    }
-
-    func updateVisibility() {
-        recalculatePositions(time: currentTime, updateTargets: false)
-        setNeedsDisplay()
-    }
-
-    func refreshObjects() {
-        recalculatePositions(time: currentTime, updateTargets: false)
-        setNeedsDisplay()
-    }
-
-    func updateRedFilter() {
-        AstroRedFilter.apply(settings.starMap.showRedFilter, to: self)
-        setNeedsDisplay()
-    }
-
-    func setOnObjectClickListener(_ listener: @escaping (SkyObject?) -> Void) {
-        onObjectClickListener = listener
+        focusAnimation = nil
+        
+        cancelInertialScroll()
     }
-
-    func setOnConstellationClickListener(_ listener: @escaping (Constellation?) -> Void) {
-        onConstellationClickListener = listener
+    
+    private func cancelGyroSnapBack() {
+        gyroSnapBackWorkItem?.cancel()
+        gyroSnapBackWorkItem = nil
+        cancelFocusAnimation()
     }
 
-    func getSelectedConstellationItem() -> Constellation? {
-        guard let selectedConstellationId else {
-            return nil
+    private func scheduleGyroSnapBack() {
+        cancelGyroSnapBack()
+        isGyroPanOverride = true
+
+        let work = DispatchWorkItem { [weak self] in
+            self?.animateSnapBackToGyro()
         }
-        return constellations.first { $0.id == selectedConstellationId }
+        gyroSnapBackWorkItem = work
+        DispatchQueue.main.asyncAfter(deadline: .now() + gyroSnapBackDelay, execute: work)
     }
 
-    func setSelectedObject(_ object: SkyObject?, center: Bool = false, animate: Bool = false) {
-        if let constellation = object as? Constellation {
-            setSelectedConstellation(constellation, center: center, animate: animate)
-            return
-        }
-        selectedConstellationId = nil
-        selectedConstellationStarIds.removeAll()
-        selectedObject = object
-        if let object {
-            if object.azimuth == 0 && object.altitude == 0 {
-                calculatePosition(object)
-            }
-            if center {
-                setCenter(azimuth: object.azimuth, altitude: object.altitude, animate: animate)
-            }
-        }
-        setNeedsDisplay()
+    private func animateSnapBackToGyro() {
+        gyroSnapBackWorkItem = nil
+        animateTo(azimuth: gyroTargetAzimuth,
+                  altitude: gyroTargetAltitude,
+                  targetRoll: gyroTargetRoll)
     }
 
-    func setSelectedObject(_ object: SkyObject?, centerAt targetPoint: CGPoint, animate: Bool = false) {
-        if let constellation = object as? Constellation {
-            setSelectedConstellation(constellation, centerAt: targetPoint, animate: animate)
+    @objc private func handleFocusAnimationFrame(_ displayLink: CADisplayLink) {
+        guard let animation = focusAnimation else {
+            cancelFocusAnimation()
             return
         }
-        selectedConstellationId = nil
-        selectedConstellationStarIds.removeAll()
-        selectedObject = object
-        if let object {
-            if object.azimuth == 0 && object.altitude == 0 {
-                calculatePosition(object)
-            }
-            setCenter(azimuth: object.azimuth, altitude: object.altitude, at: targetPoint, animate: animate)
-        }
-        setNeedsDisplay()
-    }
 
-    func setSelectedConstellation(_ constellation: Constellation?, center: Bool = false, animate: Bool = false) {
-        selectedConstellationId = constellation?.id
-        selectedObject = constellation
-        selectedConstellationStarIds.removeAll()
-        for (first, second) in constellation?.lines ?? [] {
-            selectedConstellationStarIds.insert(first)
-            selectedConstellationStarIds.insert(second)
-        }
-        for object in skyObjects where selectedConstellationStarIds.contains(object.hip) {
-            calculatePosition(object, time: currentTime, updateTargets: false)
-            object.azimuth = object.targetAzimuth
-            object.altitude = object.targetAltitude
-        }
-        if let constellation, center {
-            let centers = constellationCenters()
-            if let center = centers[constellation.id] {
-                let targetAngle = targetViewAngle(for: constellation, center: center)
-                if animate {
-                    animateTo(azimuth: center.azimuth, altitude: center.altitude, targetViewAngle: targetAngle)
-                } else {
-                    setCenter(azimuth: center.azimuth, altitude: center.altitude)
-                    setViewAngle(targetAngle)
-                }
-            }
+        let rawFraction = min(1.0, max(0.0, (displayLink.timestamp - focusAnimationStartTime) / focusAnimationDuration))
+        let fraction = 1.0 - pow(1.0 - rawFraction, 2.0)
+        applyFocusAnimation(animation, fraction: fraction)
+        if rawFraction >= 1 {
+            applyFocusAnimation(animation, fraction: 1)
+            isGyroPanOverride = false
+            cancelFocusAnimation()
+            onAnimationFinished?()
         }
-        setNeedsDisplay()
     }
 
-    func setSelectedConstellation(_ constellation: Constellation?, centerAt targetPoint: CGPoint, animate: Bool = false) {
-        selectedConstellationId = constellation?.id
-        selectedObject = constellation
-        selectedConstellationStarIds.removeAll()
-        for (first, second) in constellation?.lines ?? [] {
-            selectedConstellationStarIds.insert(first)
-            selectedConstellationStarIds.insert(second)
-        }
-        for object in skyObjects where selectedConstellationStarIds.contains(object.hip) {
-            calculatePosition(object, time: currentTime, updateTargets: false)
-            object.azimuth = object.targetAzimuth
-            object.altitude = object.targetAltitude
+    private func applyFocusAnimation(_ animation: FocusAnimation, fraction: Double) {
+        centerAzimuth = interpolateAngle(start: animation.startAzimuth, end: animation.targetAzimuth, fraction: fraction)
+        centerAltitude = animation.startAltitude + (animation.targetAltitude - animation.startAltitude) * fraction
+        roll = animation.startRoll + (animation.targetRoll - animation.startRoll) * fraction
+        viewAngle = animation.startViewAngle + (animation.targetViewAngle - animation.startViewAngle) * fraction
+        if let targetPan = animation.targetPan {
+            let cgFraction = CGFloat(fraction)
+            panX = animation.startPan.x + (targetPan.x - animation.startPan.x) * cgFraction
+            panY = animation.startPan.y + (targetPan.y - animation.startPan.y) * cgFraction
         }
-        if let constellation {
-            let centers = constellationCenters()
-            if let center = centers[constellation.id] {
-                setCenter(azimuth: center.azimuth,
-                          altitude: center.altitude,
-                          at: targetPoint,
-                          animate: animate,
-                          targetViewAngle: targetViewAngle(for: constellation, center: center))
-            }
+        if abs(animation.targetViewAngle - animation.startViewAngle) > 0.001 {
+            onViewAngleChangeListener?(viewAngle)
         }
         setNeedsDisplay()
+        notifyAzimuthChanged()
     }
 
     private func targetViewAngle(for constellation: Constellation, center: ConstellationCenter) -> Double {
@@ -686,59 +882,6 @@ final class StarView: UIView {
         return maxDistance > 0 ? max(20, min(120, maxDistance * 3.5)) : viewAngle
     }
 
-    func isObjectPinned(_ object: SkyObject) -> Bool {
-        pinnedObjects.contains(object)
-    }
-
-    func setObjectPinned(_ object: SkyObject, pinned: Bool, forceUpdate: Bool = false) {
-        if pinned {
-            pinnedObjects.insert(object)
-        } else {
-            pinnedObjects.remove(object)
-            pathCache.removeValue(forKey: object.id)
-        }
-        if forceUpdate {
-            setNeedsDisplay()
-        }
-    }
-
-    func setDateTime(_ time: Time, animate: Bool = true) {
-        timeAnimationDisplayLink?.invalidate()
-        timeAnimationDisplayLink = nil
-
-        if animate {
-            for object in skyObjects {
-                object.startAzimuth = object.azimuth
-                object.startAltitude = object.altitude
-            }
-            captureConstellationAnimationStarts()
-            recalculatePositions(time: time, updateTargets: true, force: true)
-            currentTime = time
-            timeAnimationStartTime = CACurrentMediaTime()
-            let displayLink = CADisplayLink(target: self, selector: #selector(handleTimeAnimationFrame(_:)))
-            timeAnimationDisplayLink = displayLink
-            displayLink.add(to: .main, forMode: .common)
-        } else {
-            currentTime = time
-            recalculatePositions(time: time, updateTargets: true, force: true)
-            for object in skyObjects {
-                object.azimuth = object.targetAzimuth
-                object.altitude = object.targetAltitude
-            }
-            var updatedCenters = constellationCenterCache
-            for (id, center) in constellationCenterCache {
-                var updated = center
-                updated.azimuth = center.targetAzimuth
-                updated.altitude = center.targetAltitude
-                updatedCenters[id] = updated
-            }
-            constellationCenterCache = updatedCenters
-            updateConstellationObjectPositions()
-            setNeedsDisplay()
-            onAnimationFinished?()
-        }
-    }
-
     private func captureConstellationAnimationStarts() {
         var updatedCenters = constellationCenterCache
         for (id, center) in constellationCenterCache {
@@ -774,62 +917,9 @@ final class StarView: UIView {
             onAnimationFinished?()
         }
     }
-
-    func setViewAngle(_ angle: Double) {
-        updateViewAngle(angle)
-    }
-
-    func zoomIn() {
-        updateViewAngle(viewAngle / 1.5)
-    }
-
-    func zoomOut() {
-        updateViewAngle(viewAngle * 1.5)
-    }
-
-    func project(object: SkyObject) -> CGPoint? {
-        updateProjectionCache()
-        return skyToScreen(azimuth: object.azimuth, altitude: object.altitude)
-    }
-
-    override func draw(_ rect: CGRect) {
-        guard let context = UIGraphicsGetCurrentContext() else {
-            return
-        }
-
-        updateProjectionCache()
-        rebuildObjectMap()
-        occupiedRects.removeAll(keepingCapacity: true)
-
-        context.saveGState()
-        drawBackground(in: context)
-        if settings.starMap.showEquatorialGrid {
-            drawEquatorialGrid(in: context)
-        }
-        if settings.starMap.showAzimuthalGrid {
-            drawAzimuthalGrid(in: context)
-        }
-        if settings.starMap.showEclipticLine {
-            drawEclipticLine(in: context)
-        }
-        if settings.starMap.showMeridianLine {
-            drawMeridianLine(in: context)
-        }
-        if settings.starMap.showEquatorLine {
-            drawEquatorLine(in: context)
-        }
-        if settings.starMap.showGalacticLine {
-            drawGalacticLine(in: context)
-        }
-        drawConstellationLines(in: context)
-        drawHorizon(in: context)
-        drawCelestialPaths(in: context)
-        drawConstellationLabels(in: context)
-        drawSkyObjects(in: context)
-        drawHighlights(in: context)
-        drawDirectionArrows(in: context)
-
-        context.restoreGState()
+    
+    private func notifyAzimuthChanged() {
+        onAzimuthManualChangeListener?(centerAzimuth)
     }
 
     private func rebuildObjectMap() {
@@ -849,9 +939,9 @@ final class StarView: UIView {
     private func drawBackground(in context: CGContext) {
         if isCameraMode {
             context.clear(bounds)
-            UIColor.black.withAlphaComponent(0.20).setFill()
+            UIColor.mapBgZenith.withAlphaComponent(0.20).setFill()
         } else {
-            UIColor.black.setFill()
+            UIColor.mapBgZenith.setFill()
         }
         context.fill(bounds)
     }
@@ -875,7 +965,7 @@ final class StarView: UIView {
         var baseSize: CGFloat = 15
         if object.type == .STAR && zoomFactor > 0.3 && object.magnitude > 2.5 {
             baseSize = 8
-            color = .gray
+            color = .starDotDimmed
         }
 
         var radius = max(2, baseSize - CGFloat(object.magnitude) * 2)
@@ -903,7 +993,7 @@ final class StarView: UIView {
             .foregroundColor: labelColor(for: object)
         ]
         let size = text.size(withAttributes: attributes)
-        let origin = CGPoint(x: point.x + radius + pixelsToPoints(5), y: point.y - size.height * 0.75)
+        let origin = CGPoint(x: point.x + radius + 6, y: point.y - size.height * 0.5)
         let labelPadding = pixelsToPoints(5)
         let labelRect = CGRect(origin: origin, size: size).insetBy(dx: -labelPadding, dy: -labelPadding)
         let overlaps = occupiedRects.contains { $0.intersects(labelRect) }
@@ -930,12 +1020,12 @@ final class StarView: UIView {
 
     private func labelColor(for object: SkyObject) -> UIColor {
         if object === selectedObject {
-            return .red
+            return .mapTextSelected
         }
         if settings.starMap.showCelestialPaths && object.showCelestialPath {
-            return .yellow
+            return .mapObjectPath
         }
-        return .lightGray
+        return .mapTextPrimary
     }
 
     private func drawHighlights(in context: CGContext) {
@@ -949,7 +1039,7 @@ final class StarView: UIView {
 
         if let object = selectedObject,
            let point = skyToScreen(azimuth: object.azimuth, altitude: object.altitude) {
-            strokeCircle(at: point, radius: pixelsToPoints(25), color: .red, width: pixelsToPoints(3), in: context)
+            strokeCircle(at: point, radius: pixelsToPoints(25), color: .mapTextSelected, width: pixelsToPoints(3), in: context)
         }
 
         if settings.starMap.showDirections {
@@ -976,12 +1066,12 @@ final class StarView: UIView {
         appendSkyLine(to: path, range: stride(from: 0.0, through: 360.0, by: 2.0)) { azimuth in
             (azimuth, 0.0)
         }
-        stroke(path, color: .green, width: 1.2, in: context)
+        stroke(path, color: .mapLineHorizon, width: 1.2, in: context)
 
-        drawOutsideLabel("N", azimuth: 0, altitude: 0, color: .green, offset: 30, in: context)
-        drawOutsideLabel("E", azimuth: 90, altitude: 0, color: .green, offset: 30, in: context)
-        drawOutsideLabel("S", azimuth: 180, altitude: 0, color: .green, offset: 30, in: context)
-        drawOutsideLabel("W", azimuth: 270, altitude: 0, color: .green, offset: 30, in: context)
+        drawOutsideLabel("N", azimuth: 0, altitude: 0, color: .mapLineHorizon, offset: 30, in: context)
+        drawOutsideLabel("E", azimuth: 90, altitude: 0, color: .mapLineHorizon, offset: 30, in: context)
+        drawOutsideLabel("S", azimuth: 180, altitude: 0, color: .mapLineHorizon, offset: 30, in: context)
+        drawOutsideLabel("W", azimuth: 270, altitude: 0, color: .mapLineHorizon, offset: 30, in: context)
     }
 
     private func drawAzimuthalGrid(in context: CGContext) {
@@ -995,13 +1085,16 @@ final class StarView: UIView {
         }
 
         let path = CGMutablePath()
+        var altitudeLabels: [(String, Double, Double)] = []
+        var azimuthLabels: [(String, Double)] = []
+        
         for altitude in stride(from: -80, through: 80, by: density.altStep) {
             appendSkyLine(to: path, range: stride(from: 0.0, through: 360.0, by: Double(density.lineStep))) { azimuth in
                 (azimuth, Double(altitude))
             }
             if altitude != 0 {
-                drawGridLabel("\(altitude)°", azimuth: centerAzimuth, altitude: Double(altitude), align: .left, color: UIColor(white: 0.55, alpha: 1), in: context)
-                drawGridLabel("\(altitude)°", azimuth: centerAzimuth + 180, altitude: Double(altitude), align: .left, color: UIColor(white: 0.55, alpha: 1), in: context)
+                altitudeLabels.append(("\(altitude)°", centerAzimuth, Double(altitude)))
+                altitudeLabels.append(("\(altitude)°", centerAzimuth + 180, Double(altitude)))
             }
         }
 
@@ -1010,10 +1103,19 @@ final class StarView: UIView {
                 (Double(azimuth), altitude)
             }
             if !azimuth.isMultiple(of: 90) {
-                drawOutsideLabel("\(azimuth)°", azimuth: Double(azimuth), altitude: 0, color: UIColor(white: 0.55, alpha: 1), offset: 25, in: context)
+                azimuthLabels.append(("\(azimuth)°", Double(azimuth)))
             }
         }
-        stroke(path, color: UIColor(white: 0.27, alpha: 1), width: 2.0, in: context)
+        stroke(path, color: .mapGridSecondary, width: 2.0, in: context)
+        
+        let labelColor = UIColor.mapGridSecondaryText
+        
+        for (label, az, alt) in altitudeLabels {
+            drawGridLabel(label, azimuth: az, altitude: alt, align: .left, color: labelColor, in: context)
+        }
+        for (label, az) in azimuthLabels {
+            drawOutsideLabel(label, azimuth: az, altitude: 0, color: labelColor, offset: 25, in: context)
+        }
     }
 
     private func updateEquatorialGridCache() {
@@ -1092,6 +1194,9 @@ final class StarView: UIView {
         var bestRaIndex = -1
         var minCenterDistSq = CGFloat.greatestFiniteMagnitude
         let center = CGPoint(x: bounds.midX, y: bounds.midY)
+        
+        var raLabels: [(String, CGPoint)] = []
+        var decLabels: [(String, Double, Double)] = []
 
         for i in 0..<equRaAzimuths.count {
             var first = true
@@ -1124,7 +1229,7 @@ final class StarView: UIView {
                 let hours = totalMinutes / 60
                 let minutes = totalMinutes % 60
                 let label = minutes == 0 ? "\(hours)h" : "\(hours)h\(minutes)"
-                drawText(label, at: CGPoint(x: point.x, y: point.y - 18), color: UIColor(red: 0, green: 0.74, blue: 0.74, alpha: 1), font: .systemFont(ofSize: 11), align: .center)
+                raLabels.append((label, CGPoint(x: point.x, y: point.y - 18)))
             }
         }
 
@@ -1148,12 +1253,22 @@ final class StarView: UIView {
                 if dec != 0 {
                     let ra = Double(bestRaIndex * equRaStepMin) / 60.0
                     let hor = AstronomyKt.horizon(time: currentTime, observer: observer, ra: ra, dec: Double(dec), refraction: Refraction.normal)
-                    drawGridLabel("\(dec)°", azimuth: hor.azimuth, altitude: hor.altitude, align: .left, color: UIColor(red: 0, green: 0.74, blue: 0.74, alpha: 1), in: context)
+                    decLabels.append(("\(dec)°", hor.azimuth, hor.altitude))
                 }
             }
         }
 
-        stroke(path, color: UIColor(red: 0, green: 0.40, blue: 0.40, alpha: 1), width: 0.8, in: context)
+        stroke(path, color: .mapGridMain, width: 0.8, in: context)
+        
+        let labelColor = UIColor.mapGridMainText
+        let font = UIFont.systemFont(ofSize: 11)
+        
+        for (label, point) in raLabels {
+            drawText(label, at: point, color: labelColor, font: font, align: .center)
+        }
+        for (label, az, alt) in decLabels {
+            drawGridLabel(label, azimuth: az, altitude: alt, align: .left, color: labelColor, in: context)
+        }
     }
 
     private func updateEclipticCache() {
@@ -1185,7 +1300,7 @@ final class StarView: UIView {
     private func drawEclipticLine(in context: CGContext) {
         updateEclipticCache()
         stroke(cachedLinePath(azimuths: eclipticAzimuths, altitudes: eclipticAltitudes),
-               color: .yellow,
+               color: .mapLineEcliptic,
                width: 1.2,
                dash: [8, 8],
                in: context)
@@ -1199,7 +1314,7 @@ final class StarView: UIView {
         appendSkyLine(to: path, range: stride(from: -90.0, through: 90.0, by: 2.0)) { altitude in
             (180.0, altitude)
         }
-        stroke(path, color: .green, width: 1.2, dash: [12, 8], in: context)
+        stroke(path, color: .mapLineMeridian, width: 1.2, dash: [12, 8], in: context)
     }
 
     private func updateEquatorCache() {
@@ -1226,7 +1341,7 @@ final class StarView: UIView {
     private func drawEquatorLine(in context: CGContext) {
         updateEquatorCache()
         stroke(cachedLinePath(azimuths: equatorAzimuths, altitudes: equatorAltitudes),
-               color: UIColor(red: 0, green: 0.67, blue: 0.67, alpha: 1),
+               color: .mapLineEquator,
                width: 1.2,
                dash: [12, 8],
                in: context)
@@ -1261,7 +1376,7 @@ final class StarView: UIView {
     private func drawGalacticLine(in context: CGContext) {
         updateGalacticCache()
         stroke(cachedLinePath(azimuths: galacticAzimuths, altitudes: galacticAltitudes),
-               color: .magenta,
+               color: .mapLineGalactic,
                width: 1.2,
                dash: [8, 8],
                in: context)
@@ -1286,7 +1401,7 @@ final class StarView: UIView {
                 path.addLine(to: p2)
             }
             stroke(path,
-                   color: isSelected ? UIColor(red: 1, green: 0.84, blue: 0, alpha: 1) : UIColor(red: 0.33, green: 0.60, blue: 1.0, alpha: 0.58),
+                   color: isSelected ? .constellationSelected : .constellationLine,
                    width: isSelected ? 1.8 : 0.9,
                    in: context)
         }
@@ -1304,7 +1419,7 @@ final class StarView: UIView {
                 continue
             }
 
-            let color = isSelected ? UIColor(red: 1, green: 0.84, blue: 0, alpha: 1) : UIColor(red: 0.67, green: 0.73, blue: 1.0, alpha: 1)
+            let color = isSelected ? UIColor.constellationSelected : UIColor.constellationText
             let font = UIFont.italicSystemFont(ofSize: 16)
             let text = constellation.getDisplayName()
             let size = text.size(withAttributes: [.font: font])
@@ -1400,7 +1515,7 @@ final class StarView: UIView {
             }
             previousPoint = point
         }
-        stroke(path, color: .cyan, width: 1.1, dash: [5, 8], in: context)
+        stroke(path, color: .mapTrajectoryLine, width: 1.1, dash: [5, 8], in: context)
 
         var drawnLabels: Set<String> = []
         for index in 0..<drawCount {
@@ -1427,7 +1542,7 @@ final class StarView: UIView {
             let labelAngle = Double(angle - .pi / 2)
             let labelPoint = CGPoint(x: point.x + 30 * CGFloat(cos(labelAngle)),
                                      y: point.y + 30 * CGFloat(sin(labelAngle)) + 8)
-            drawText(label, at: labelPoint, color: .cyan, font: .systemFont(ofSize: 12), align: .center)
+            drawText(label, at: labelPoint, color: .mapTrajectoryLine, font: .systemFont(ofSize: 12), align: .center)
             drawArrow(at: point, angle: angle, in: context)
         }
     }
@@ -1539,10 +1654,6 @@ final class StarView: UIView {
         }
     }
 
-    func calculatePosition(_ object: SkyObject) {
-        calculatePosition(object, time: currentTime, updateTargets: false)
-    }
-
     private func calculatePosition(_ object: SkyObject, time: Time, updateTargets: Bool, force: Bool = false) {
         if !force && object.lastUpdateTime == time.tt && !updateTargets {
             return
@@ -1607,7 +1718,7 @@ final class StarView: UIView {
         path.addLine(to: CGPoint(x: -10, y: -6))
         path.addLine(to: CGPoint(x: -10, y: 6))
         path.closeSubpath()
-        UIColor.cyan.setFill()
+        UIColor.mapTrajectoryLine.setFill()
         context.addPath(path)
         context.fillPath()
         context.restoreGState()
@@ -1869,32 +1980,91 @@ final class StarView: UIView {
         let point = recognizer.location(in: self)
         switch recognizer.state {
         case .began:
-            cancelFocusAnimation()
+            if isGyroTrackingEnabled {
+                cancelGyroSnapBack()
+                isGyroPanOverride = true
+            } else {
+                cancelFocusAnimation()
+            }
             lastTouchPoint = point
             isPanning = false
+            didPanThisGesture = false
         case .changed:
             let dx = point.x - lastTouchPoint.x
             let dy = point.y - lastTouchPoint.y
-            if isCameraMode && hypot(dx, dy) > 10 {
-                isPanning = true
-            } else if hypot(dx, dy) > 0 || isPanning {
+
+            if hypot(dx, dy) > 0 {
                 isPanning = true
-                if settings.starMap.is2DMode {
-                    panX += dx
-                    panY += dy
-                } else {
-                    let scale = viewAngle / Double(max(bounds.width, 1))
-                    centerAzimuth = normalizedDegrees(centerAzimuth - Double(dx) * scale)
-                    centerAltitude = max(-90, min(90, centerAltitude + Double(dy) * scale))
-                    onAzimuthManualChangeListener?(centerAzimuth)
-                }
+                didPanThisGesture = true
+                applyPanDelta(dx: dx, dy: dy)
                 lastTouchPoint = point
                 setNeedsDisplay()
             }
+        case .ended, .cancelled:
+            if didPanThisGesture && isGyroTrackingEnabled {
+                isPanning = false
+                scheduleGyroSnapBack()
+            } else if didPanThisGesture && !isGyroTrackingEnabled {
+                startInertialScroll(velocity: recognizer.velocity(in: self))
+            } else if isGyroTrackingEnabled {
+                isGyroPanOverride = false
+            }
+            isPanning = false
+            didPanThisGesture = false
         default:
             isPanning = false
         }
     }
+    
+    private func applyPanDelta(dx: CGFloat, dy: CGFloat) {
+        if settings.starMap.is2DMode {
+            panX += dx
+            panY += dy
+        } else {
+            let scale = viewAngle / Double(max(bounds.width, 1))
+            centerAzimuth = normalizedDegrees(centerAzimuth - Double(dx) * scale)
+            centerAltitude = max(-90, min(90, centerAltitude + Double(dy) * scale))
+            notifyAzimuthChanged()
+        }
+        setNeedsDisplay()
+    }
+    
+    private func startInertialScroll(velocity: CGPoint) {
+        guard hypot(velocity.x, velocity.y) >= inertialMinStartSpeed else { return }
+
+        cancelInertialScroll()
+        cancelFocusAnimation()
+
+        inertialVelocity = velocity
+        lastInertialTimestamp = CACurrentMediaTime()
+
+        let link = CADisplayLink(target: self, selector: #selector(handleInertialFrame(_:)))
+        inertialDisplayLink = link
+        link.add(to: .main, forMode: .common)
+    }
+
+    private func cancelInertialScroll() {
+        inertialDisplayLink?.invalidate()
+        inertialDisplayLink = nil
+        inertialVelocity = .zero
+    }
+
+    @objc private func handleInertialFrame(_ link: CADisplayLink) {
+        let now = link.timestamp
+        let dt = CGFloat(max(0, min(0.05, now - lastInertialTimestamp)))
+        lastInertialTimestamp = now
+        guard dt > 0 else { return }
+
+        applyPanDelta(dx: inertialVelocity.x * dt, dy: inertialVelocity.y * dt)
+
+        let decay = pow(inertialDecelerationRate, dt * 1000)
+        inertialVelocity.x *= decay
+        inertialVelocity.y *= decay
+
+        if hypot(inertialVelocity.x, inertialVelocity.y) < inertialStopSpeed {
+            cancelInertialScroll()
+        }
+    }
 
     @objc private func handlePinch(_ recognizer: UIPinchGestureRecognizer) {
         guard recognizer.state == .changed || recognizer.state == .ended else {
@@ -2035,4 +2205,10 @@ final class StarView: UIView {
         }
         return value
     }
+    
+    deinit {
+        timeAnimationDisplayLink?.invalidate()
+        focusAnimationDisplayLink?.invalidate()
+        inertialDisplayLink?.invalidate()
+    }
 }
diff --git a/Sources/Plugins/Astronomy/search/StarMapMyDataViewController.swift b/Sources/Plugins/Astronomy/search/StarMapMyDataViewController.swift
index c2f5a10b4f..d0174d6b00 100644
--- a/Sources/Plugins/Astronomy/search/StarMapMyDataViewController.swift
+++ b/Sources/Plugins/Astronomy/search/StarMapMyDataViewController.swift
@@ -430,7 +430,7 @@ final class StarMapMyDataViewController: UIViewController {
 
         DispatchQueue.global(qos: .userInitiated).async { [weak self] in
             guard let self else { return }
-            let insertionOrderById = self.getMyDataInsertionOrderMap(stateSnapshot.quickPresetType)
+            let insertionOrderById = self.myDataInsertionOrderMap(stateSnapshot.quickPresetType)
             let filteredEntries = stateSnapshot.filterAndSort(
                 preparedEntries: preparedEntriesSnapshot.map { $0.copy() },
                 visibleTonightProvider: self.searchHelper.getVisibleTonight,
@@ -467,8 +467,8 @@ final class StarMapMyDataViewController: UIViewController {
         }
     }
 
-    private func getMyDataInsertionOrderMap(_ quickPresetType: StarMapSearchQuickPresetType) -> [String: Int] {
-        let config = parentStarMapController?.searchStarMapConfig() ?? AstronomyPluginSettings.load().starMap
+    private func myDataInsertionOrderMap(_ quickPresetType: StarMapSearchQuickPresetType) -> [String: Int] {
+        let config = parentStarMapController?.searchStarMapConfig() ?? plugin.astroSettings.starMapConfig()
         let ids: [String]
         switch quickPresetType {
         case .MY_DATA_FAVORITES:
@@ -488,7 +488,7 @@ final class StarMapMyDataViewController: UIViewController {
     }
     
     private func currentTabHasData() -> Bool {
-        let config = parentStarMapController?.searchStarMapConfig() ?? AstronomyPluginSettings.load().starMap
+        let config = parentStarMapController?.searchStarMapConfig() ?? plugin.astroSettings.starMapConfig()
         switch currentTab {
         case .favorites:
             return !config.favorites.isEmpty
diff --git a/Sources/Plugins/Astronomy/search/StarMapSearchViewController.swift b/Sources/Plugins/Astronomy/search/StarMapSearchViewController.swift
index 8e310c4149..af368f9030 100644
--- a/Sources/Plugins/Astronomy/search/StarMapSearchViewController.swift
+++ b/Sources/Plugins/Astronomy/search/StarMapSearchViewController.swift
@@ -797,7 +797,7 @@ final class StarMapSearchViewController: UIViewController {
             StarMapExploreRowConfig(quickPresetType: .CATEGORY_STAR_CLUSTERS, iconRes: "ic_custom_star_clusters", titleRes: "astro_star_clusters", subtitleRes: nil),
             StarMapExploreRowConfig(quickPresetType: .CATEGORY_DEEP_SKY, iconRes: "ic_custom_galaxy", titleRes: "astro_deep_sky", subtitleRes: "astro_explore_deep_sky_subtitle")
         ]
-        let config = parentStarMapController?.searchStarMapConfig() ?? AstronomyPluginSettings.load().starMap
+        let config = parentStarMapController?.searchStarMapConfig() ?? plugin.astroSettings.starMapConfig()
         let myDataItems: [(StarMapExploreRowConfig, Int)] = [
             (StarMapExploreRowConfig(quickPresetType: .MY_DATA_FAVORITES, iconRes: "ic_custom_bookmark", titleRes: "favorites_item", subtitleRes: nil), config.favorites.count),
             (StarMapExploreRowConfig(quickPresetType: .MY_DATA_DAILY_PATH, iconRes: "ic_custom_target_path_on", titleRes: "astro_daily_path", subtitleRes: nil), config.celestialPaths.count),
@@ -1050,17 +1050,22 @@ final class StarMapSearchViewController: UIViewController {
 
     private func addRecentChip(_ entry: StarMapSearchEntry) {
         searchState.addRecentChip(label: entry.displayName, objectId: entry.objectRef.id)
-        
-        var settings = AstronomyPluginSettings.load()
-        settings.addRecentlyViewed(id: entry.objectRef.id, label: entry.displayName)
-        
+        plugin.recentSearchChips.removeAll()
+        plugin.recentSearchChips.append(contentsOf: searchState.recentChips)
+        plugin.saveRecentSearchChips()
         renderRecentChips()
     }
 
     private func syncRecentChipsWithSession() {
-        let persisted = AstronomyPluginSettings.load().starMap.recentlyViewed
-            .map { StarMapRecentChip(label: $0.label, objectId: $0.id) }
-        searchState.replaceRecentChips(persisted)
+        if plugin.recentSearchChips.isEmpty {
+            plugin.recentSearchChips = plugin.astroSettings.recentChips()
+        }
+        if plugin.recentSearchChips.isEmpty {
+            plugin.recentSearchChips.append(contentsOf: searchState.recentChips)
+            plugin.saveRecentSearchChips()
+        } else {
+            searchState.replaceRecentChips(plugin.recentSearchChips)
+        }
     }
 
     private func renderRecentChips() {