diff --git a/cm_changelog.txt b/cm_changelog.txt
index f54dc7a141..4ea7ba27a0 100644
--- a/cm_changelog.txt
+++ b/cm_changelog.txt
@@ -78,7 +78,10 @@ This is usable for any OpenTTD servers
 - Add new minimap mode showing industries, height and farms at the same time.
 - Rename "CB town border" zone to "CB cargo acceptance", switch it to a new colored highlight and fix for new CB mode.
 - Rename "New CB borders" zone to "CB town limit" and switch it to a new colored highlight. Remove old "CB borders" zone.
+- In CB modes added CB town limit to outer town zones highlight (red border).
 - Show engine id in build window in newgrf developer mode.
+- Fixed crash on selecting tram station build tool.
+- Fixed zoning hotkeys.
 
 *** 1.10.1 (15 Apr 2020) ***
 - Add a setting to autoopen vehicle window when cloning vehicles while sharing orders.
diff --git a/src/rev.cpp b/src/rev.cpp
index f915434ee6..a4094d00f6 100644
--- a/src/rev.cpp
+++ b/src/rev.cpp
@@ -83,4 +83,4 @@ const byte _openttd_revision_tagged = 1;
 const uint32 _openttd_newgrf_version = 1 << 28 | 10 << 24 | 0 << 20 | 1 << 19 | 28004;
 
 
-const char _citymania_version[] = "20200519-master-m7275346033 19.05.20";
+const char _citymania_version[] = "20200519-master-m25fce2d061 19.05.20";
diff --git a/src/road_gui.cpp b/src/road_gui.cpp
index 7873ec58b8..5730b3a5c4 100644
--- a/src/road_gui.cpp
+++ b/src/road_gui.cpp
@@ -1234,8 +1234,14 @@ struct BuildRoadStationWindow : public PickerWindowBase {
 		const RoadTypeInfo *rti = GetRoadTypeInfo(_cur_roadtype);
 		this->GetWidget<NWidgetCore>(WID_BROS_CAPTION)->widget_data = rti->strings.picker_title[rs];
 
-		for (uint i = RoadTypeIsTram(_cur_roadtype) ? WID_BROS_STATION_X : WID_BROS_STATION_NE; i < WID_BROS_LT_OFF; i++) {
-			this->GetWidget<NWidgetCore>(i)->tool_tip = rti->strings.picker_tooltip[rs];
+		if (RoadTypeIsTram(_cur_roadtype)) {
+			this->GetWidget<NWidgetCore>(WID_BROS_STATION_X)->tool_tip = rti->strings.picker_tooltip[rs];
+			this->GetWidget<NWidgetCore>(WID_BROS_STATION_Y)->tool_tip = rti->strings.picker_tooltip[rs];
+			this->GetWidget<NWidgetCore>(WID_BROS_STATION_XY_AUTO)->tool_tip = rti->strings.picker_tooltip[rs];
+		} else {
+			for (uint i = WID_BROS_STATION_NE; i < WID_BROS_LT_OFF; i++) {
+				this->GetWidget<NWidgetCore>(i)->tool_tip = rti->strings.picker_tooltip[rs];
+			}
 		}
 
 		this->LowerWidget(_road_station_picker_orientation + WID_BROS_STATION_NE);