diff --git a/indra/newview/llinventoryicon.cpp b/indra/newview/llinventoryicon.cpp
index ceaa18c865..1f613c1201 100644
--- a/indra/newview/llinventoryicon.cpp
+++ b/indra/newview/llinventoryicon.cpp
@@ -136,7 +136,10 @@ const std::string& LLInventoryIcon::getIconName(LLAssetType::EType asset_type,
 			idx = (misc_flag != 0) ? LLInventoryType::ICONNAME_CALLINGCARD_ONLINE : LLInventoryType::ICONNAME_CALLINGCARD_OFFLINE;
 			break;
 		case LLAssetType::AT_LANDMARK:
-			idx = (misc_flag != 0) ? LLInventoryType::ICONNAME_LANDMARK_VISITED : LLInventoryType::ICONNAME_LANDMARK;
+			// <FS:Ansariel> FIRE-20693: Get rid of visited landmark icon that hasnn't been working anymore for ages
+			//idx = (misc_flag != 0) ? LLInventoryType::ICONNAME_LANDMARK_VISITED : LLInventoryType::ICONNAME_LANDMARK;
+			idx = LLInventoryType::ICONNAME_LANDMARK;
+			// </FS:Ansariel>
 			break;
 		case LLAssetType::AT_SCRIPT:
 		case LLAssetType::AT_LSL_TEXT:
diff --git a/indra/newview/skins/default/xui/en/menu_teleport_history_timezone.xml b/indra/newview/skins/default/xui/en/menu_teleport_history_timezone.xml
new file mode 100644
index 0000000000..214ddbee57
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_teleport_history_timezone.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!-- FS:Beq [timezone support for teleport history] -->
+<toggleable_menu
+     name="menu_teleport_history_timezone"
+     left="0" bottom="0" visible="false"
+     mouse_opaque="false">
+  <menu_item_check
+      name="teleport_history_tz_utc"
+      label="UTC">
+    <on_click
+      function="TeleportHistory.TimeZone.Set"
+      parameter="utc" />
+    <on_check
+      function="TeleportHistory.TimeZone.Check"
+      parameter="utc" />
+  </menu_item_check>
+  <menu_item_check
+      name="teleport_history_tz_slt"
+      label="SLT">
+    <on_click
+      function="TeleportHistory.TimeZone.Set"
+      parameter="slt" />
+    <on_check
+      function="TeleportHistory.TimeZone.Check"
+      parameter="slt" />
+  </menu_item_check>
+  <menu_item_check
+      name="teleport_history_tz_local"
+      label="Local">
+    <on_click
+      function="TeleportHistory.TimeZone.Set"
+      parameter="local" />
+    <on_check
+      function="TeleportHistory.TimeZone.Check"
+      parameter="local" />
+  </menu_item_check>
+</toggleable_menu>
+
+<!-- /FS:Beq [timezone support for teleport history] -->
\ No newline at end of file