diff --git a/src/smallmap_gui.cpp b/src/smallmap_gui.cpp
index 3d1604385a..a56d2e73c8 100644
--- a/src/smallmap_gui.cpp
+++ b/src/smallmap_gui.cpp
@@ -1063,7 +1063,6 @@ void SmallMapWindow::SetupWidgetData()
 
 SmallMapWindow::SmallMapWindow(WindowDesc *desc, int window_number) :
 		Window(desc),
-		show_legend(true),
 		row_height(max(GetMinSizing(NWST_STEP, FONT_HEIGHT_SMALL) * 2 / 3, uint(FONT_HEIGHT_SMALL))), // Default spacing makes legend too tall - shrink it by 1/3
 		refresh(GUITimer(FORCE_REFRESH_PERIOD))
 {
@@ -1077,7 +1076,6 @@ SmallMapWindow::SmallMapWindow(WindowDesc *desc, int window_number) :
 	//this->SetWidgetLoweredState(WID_SM_SHOW_HEIGHT, _smallmap_show_heightmap);
 
 	this->SetWidgetLoweredState(WID_SM_TOGGLETOWNNAME, this->show_towns);
-	//this->SetWidgetLoweredState(WID_SM_SHOW_LEGEND, this->show_legend);
 
 	this->SetupWidgetData();
 
@@ -1158,17 +1156,17 @@ void SmallMapWindow::RebuildColourIndexIfNecessary()
 					str = tbl->legend;
 				}
 			} else {
-				if (tbl->col_break) {
-					//this->min_number_of_fixed_rows = max(this->min_number_of_fixed_rows, height);
-					height = 0;
-					num_columns++;
-				}
-				height++;
 				str = tbl->legend;
 			}
+			if (tbl->col_break) {
+				this->min_number_of_fixed_rows = max(this->min_number_of_fixed_rows, height);
+				height = 0;
+				num_columns++;
+			}
+			height++;
 			min_width = max(GetStringBoundingBox(str).width, min_width);
 		}
-		//this->min_number_of_fixed_rows = max(this->min_number_of_fixed_rows, height);
+		this->min_number_of_fixed_rows = max(this->min_number_of_fixed_rows, height);
 		this->min_number_of_columns = max(this->min_number_of_columns, num_columns);
 	}
 
@@ -1458,14 +1456,6 @@ int SmallMapWindow::GetPositionOnLegend(Point pt)
 			if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
 			break;
 
-		case WID_SM_SHOW_LEGEND: {
-				int oldHeight = this->GetLegendHeight(this->min_number_of_columns);
-				this->show_legend = !this->show_legend;
-				this->SetWidgetLoweredState(WID_SM_SHOW_LEGEND, this->show_legend);
-				this->ReInit(0, this->GetLegendHeight(this->min_number_of_columns) - oldHeight);
-				break;
-			}
-
 		case WID_SM_LEGEND: // Legend
 			if (this->map_type == SMT_INDUSTRY || this->map_type == SMT_LINKSTATS || this->map_type == SMT_OWNER) {
 				int click_pos = this->GetPositionOnLegend(pt);
@@ -1688,7 +1678,7 @@ Point SmallMapWindow::GetStationMiddle(const Station *st) const
 {
 	if (widget != WID_SM_LEGEND) return;
 
-	size->width = this->GetMinLegendWidth();
+	size->width = WD_FRAMERECT_LEFT + this->column_width;
 	size->height = this->GetLegendHeight(this->min_number_of_columns);
 }
 
@@ -1723,7 +1713,7 @@ public:
 		this->smallmap_window = dynamic_cast<SmallMapWindow *>(w);
 
 		assert(this->smallmap_window != NULL);
-		this->smallest_x = max(display->smallest_x, max(bar->smallest_x, smallmap_window->GetMinLegendWidth()));
+		this->smallest_x = max(display->smallest_x, max(bar->smallest_x, WD_FRAMERECT_LEFT + smallmap_window->column_width));
 		this->smallest_y = display->smallest_y + max(bar->smallest_y, smallmap_window->GetLegendHeight(smallmap_window->min_number_of_columns));
 		this->fill_x = max(display->fill_x, bar->fill_x);
 		this->fill_y = (display->fill_y == 0 && bar->fill_y == 0) ? 0 : min(display->fill_y, bar->fill_y);
@@ -1774,7 +1764,7 @@ public:
 /** Widget parts of the smallmap display. */
 static const NWidgetPart _nested_smallmap_display[] = {
 	NWidget(WWT_PANEL, COLOUR_BROWN, WID_SM_MAP_BORDER),
-		NWidget(WWT_INSET, COLOUR_BROWN, WID_SM_MAP), SetMinimalSize(140, 140), SetResize(1, 1), SetPadding(2, 2, 2, 2), EndContainer(),
+		NWidget(WWT_INSET, COLOUR_BROWN, WID_SM_MAP), SetMinimalSize(100, 140), SetResize(1, 1), SetPadding(2, 2, 2, 2), EndContainer(),
 	EndContainer(),
 };
 
@@ -1782,15 +1772,11 @@ static const NWidgetPart _nested_smallmap_display[] = {
 static const NWidgetPart _nested_smallmap_bar[] = {
 	NWidget(WWT_PANEL, COLOUR_BROWN),
 		NWidget(NWID_HORIZONTAL),
-			NWidget(NWID_HORIZONTAL),
+			NWidget(NWID_VERTICAL),
 				/* Top button row. */
 				NWidget(NWID_HORIZONTAL, NC_EQUALSIZE),
-					//NWidget(WWT_IMGBTN, COLOUR_BROWN, WID_SM_SHOW_LEGEND),
-					//		SetDataTip(SPR_IMG_QUERY, STR_SMALLMAP_TOOLTIP_SHOW_LEGEND), SetFill(1, 1),
 					NWidget(WWT_PUSHIMGBTN, COLOUR_BROWN, WID_SM_ZOOM_IN),
 							SetDataTip(SPR_IMG_ZOOMIN, STR_TOOLBAR_TOOLTIP_ZOOM_THE_VIEW_IN), SetFill(1, 1),
-					NWidget(WWT_PUSHIMGBTN, COLOUR_BROWN, WID_SM_ZOOM_OUT),
-							SetDataTip(SPR_IMG_ZOOMOUT, STR_TOOLBAR_TOOLTIP_ZOOM_THE_VIEW_OUT), SetFill(1, 1),
 					NWidget(WWT_PUSHIMGBTN, COLOUR_BROWN, WID_SM_CENTERMAP),
 							SetDataTip(SPR_IMG_SMALLMAP, STR_SMALLMAP_CENTER), SetFill(1, 1),
 					NWidget(WWT_IMGBTN, COLOUR_BROWN, WID_SM_CONTOUR),
@@ -1801,6 +1787,12 @@ static const NWidgetPart _nested_smallmap_bar[] = {
 							SetDataTip(SPR_IMG_INDUSTRY, STR_SMALLMAP_TOOLTIP_SHOW_INDUSTRIES_ON_MAP), SetFill(1, 1),
 					NWidget(WWT_IMGBTN, COLOUR_BROWN, WID_SM_TOGGLETOWNNAME),
 							SetDataTip(SPR_IMG_TOWN, STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF), SetFill(1, 1),
+					NWidget(NWID_SPACER), SetResize(1, 0), SetMinimalSize(0, 1),
+				EndContainer(),
+				/* Bottom button row. */
+				NWidget(NWID_HORIZONTAL, NC_EQUALSIZE),
+					NWidget(WWT_PUSHIMGBTN, COLOUR_BROWN, WID_SM_ZOOM_OUT),
+							SetDataTip(SPR_IMG_ZOOMOUT, STR_TOOLBAR_TOOLTIP_ZOOM_THE_VIEW_OUT), SetFill(1, 1),
 					NWidget(WWT_IMGBTN, COLOUR_BROWN, WID_SM_LINKSTATS),
 							SetDataTip(SPR_IMG_CARGOFLOW, STR_SMALLMAP_TOOLTIP_SHOW_LINK_STATS_ON_MAP), SetFill(1, 1),
 					NWidget(WWT_IMGBTN, COLOUR_BROWN, WID_SM_ROUTES),
@@ -1869,6 +1861,10 @@ static WindowDesc _smallmap_desc(
 void ShowSmallMap()
 {
 	AllocateWindowDescFront<SmallMapWindow>(&_smallmap_desc, 0);
+	SmallMapWindow *w = dynamic_cast<SmallMapWindow *>(FindWindowByClass(WC_SMALLMAP));
+	if (w && w->GetMinLegendWidth() > w->width) {
+		ResizeWindow(w, w->GetMinLegendWidth() - w->width, 0);
+	}
 }
 
 /**
diff --git a/src/smallmap_gui.h b/src/smallmap_gui.h
index b0e1a83249..9bc072642d 100644
--- a/src/smallmap_gui.h
+++ b/src/smallmap_gui.h
@@ -71,7 +71,6 @@ protected:
 	static const uint FORCE_REFRESH_PERIOD = 930; ///< map is redrawn after that many milliseconds.
 	static const uint BLINK_PERIOD         = 450; ///< highlight blinking interval in milliseconds.
 
-	bool show_legend;              ///< Display legend.
 	uint min_number_of_columns;    ///< Minimal number of columns in legends.
 	uint min_number_of_fixed_rows; ///< Minimal number of rows in the legends for the fixed layouts only (all except #SMT_INDUSTRY).
 	uint column_width;             ///< Width of a column in the #WID_SM_LEGEND widget.
@@ -112,15 +111,6 @@ protected:
 		GfxFillRect(x2 - 3, y, x2,    y, PC_VERY_LIGHT_YELLOW);
 	}
 
-	/**
-	 * Compute minimal required width of the legends.
-	 * @return Minimally needed width for displaying the smallmap legends in pixels.
-	 */
-	inline uint GetMinLegendWidth() const
-	{
-		return show_legend ? WD_FRAMERECT_LEFT + this->min_number_of_columns * this->column_width : 0;
-	}
-
 	/**
 	 * Return number of columns that can be displayed in \a width pixels.
 	 * @return Number of columns to display.
@@ -137,8 +127,8 @@ protected:
 	 */
 	inline uint GetLegendHeight(uint num_columns) const
 	{
-		return show_legend ? WD_FRAMERECT_TOP + WD_FRAMERECT_BOTTOM +
-				this->min_number_of_fixed_rows * this->row_height : 0;
+		return WD_FRAMERECT_TOP + WD_FRAMERECT_BOTTOM +
+				this->min_number_of_fixed_rows * this->row_height;
 	}
 
 	/**
@@ -182,6 +172,16 @@ public:
 	void SmallMapCenterOnCurrentPos();
 	Point GetStationMiddle(const Station *st) const;
 
+	/**
+	 * Compute minimal required width of the legends.
+	 * @return Minimally needed width for displaying the smallmap legends in pixels.
+	 */
+	inline int GetMinLegendWidth() const
+	{
+		printf("GetMinLegendWidth: this->min_number_of_columns %d this->column_width %d\n", this->min_number_of_columns, this->column_width);
+		return WD_FRAMERECT_LEFT + this->min_number_of_columns * this->column_width;
+	}
+
 	virtual void SetStringParameters(int widget) const;
 	virtual void OnInit();
 	virtual void OnPaint();
@@ -194,6 +194,7 @@ public:
 	virtual void OnScroll(Point delta);
 	virtual void OnMouseOver(Point pt, int widget);
 	virtual void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize);
+
 };
 
 #endif /* SMALLMAP_GUI_H */
diff --git a/src/widgets/smallmap_widget.h b/src/widgets/smallmap_widget.h
index 753dcb74e3..0b1daea03f 100644
--- a/src/widgets/smallmap_widget.h
+++ b/src/widgets/smallmap_widget.h
@@ -34,7 +34,6 @@ enum SmallMapWidgets {
 	WID_SM_ENABLE_ALL,     ///< Button to enable display of all legend entries.
 	WID_SM_DISABLE_ALL,    ///< Button to disable display of all legend entries.
 	WID_SM_SHOW_HEIGHT,    ///< Show heightmap toggle button.
-	WID_SM_SHOW_LEGEND,    ///< Show/hide legend area.
 };
 
 #endif /* WIDGETS_SMALLMAP_WIDGET_H */
diff --git a/todo.txt b/todo.txt
index 763cac9ba1..c877343a03 100644
--- a/todo.txt
+++ b/todo.txt
@@ -1,8 +1,6 @@
 
 - 'Place Sign' does not work. Landscaping - Place Sign works.
 
-- Smallmap UI won't fit all FIRS industries.
-
 - Add 'Goal' menu item somewhere to compact toolbar.
 
 - Misclicking station from orders dialog should hide the dialog for 3 times.