diff --git a/indra/newview/skins/default/toolbars.xml b/indra/newview/skins/default/toolbars.xml
index 5fa8b9b652..144281f640 100644
--- a/indra/newview/skins/default/toolbars.xml
+++ b/indra/newview/skins/default/toolbars.xml
@@ -8,6 +8,7 @@
      button_alignment="left"
      button_display_mode="icons_only"
      button_layout_style="fill">
+     <command name="howto"/>
      <command name="chat"/>
      <command name="speak"/>
      <command name="voice"/>
diff --git a/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml
index 09a98364c8..6c5c819058 100644
--- a/indra/newview/skins/default/xui/de/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/de/menu_viewer.xml
@@ -262,7 +262,7 @@
 		<menu_item_call label="Firestorm Support-Gruppe beitreten" name="firestorm_support_group"/>
 		<menu_item_call label="Stundenplan Firestorm-Klassen" name="Firestorm Classes Schedule"/>
 		<menu_item_call label="Firestorm-Eventkalender" name="Firestorm Events Calendar"/>
-		<menu_item_call label="Anweisungen..." name="How To"/>
+		<menu_item_check label="Anweisungen..." name="How To"/>
 		<menu_item_call label="[CURRENT_GRID]-Hilfe" name="current_grid_help"/>
 		<menu_item_call label="Über [CURRENT_GRID]" name="current_grid_about"/>
 		<menu_item_call label="Grid-Status prüfen" name="Grid Status"/>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 66c0833be8..4c1844a0d9 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2400,13 +2400,16 @@
              parameter="WebLaunchExternalTarget,https://teamup.com/ksxdajnbw9mvw7cbwz" />
         </menu_item_call>
 
-        <menu_item_call
+        <menu_item_check
          label="Guidebook"
          name="How To">
-            <menu_item_call.on_click
+            <menu_item_check.on_click
              function="Help.ToggleHowTo"
              parameter="" />
-        </menu_item_call>
+            <menu_item_check.on_check
+             function="Floater.Visible"
+             parameter="guidebook" />
+        </menu_item_check>
 
 <!--       <menu_item_call
          label="Second Life Help"
diff --git a/indra/newview/skins/default/xui/es/menu_viewer.xml b/indra/newview/skins/default/xui/es/menu_viewer.xml
index 19afa923c7..b42f4566f5 100644
--- a/indra/newview/skins/default/xui/es/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/es/menu_viewer.xml
@@ -221,7 +221,7 @@
 		<menu_item_call label="Firestorm Wiki" name="Firestorm Wiki"/>
 		<menu_item_call label="Solución de problemas" name="Troubleshooting"/>
 		<menu_item_call label="Unirse al Grupo de Soporte de Firestorm" name="firestorm_support_group"/>
-		<menu_item_call label="Cómo..." name="How To"/>
+		<menu_item_check label="Cómo..." name="How To"/>
 		<menu_item_call label="Ayuda de [CURRENT_GRID]" name="current_grid_help"/>
 		<menu_item_call label="Acerca de [CURRENT_GRID]" name="current_grid_about"/>
 		<menu_item_call label="Tutorial" name="Tutorial"/>
diff --git a/indra/newview/skins/default/xui/fr/menu_viewer.xml b/indra/newview/skins/default/xui/fr/menu_viewer.xml
index df1eefdfca..7224832e08 100644
--- a/indra/newview/skins/default/xui/fr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml
@@ -254,7 +254,7 @@
 		<menu_item_call label="Rejoindre un groupe d'aide Firestorm" name="firestorm_support_group"/>
 		<menu_item_call label="Horaires des classes Firestorm" name="Firestorm Classes Schedule"/>
 		<menu_item_call label="Calendrier des évènements Firestorm" name="Firestorm Events Calendar"/>
-		<menu_item_call label="Guide" name="How To"/>
+		<menu_item_check label="Guide" name="How To"/>
 		<menu_item_call label="Aide [CURRENT_GRID]" name="current_grid_help"/>
 		<menu_item_call label="À propos de [CURRENT_GRID]" name="current_grid_about"/>
 		<menu_item_check label="Consulter l'état de la grille" name="Grid Status"/>
diff --git a/indra/newview/skins/default/xui/it/menu_viewer.xml b/indra/newview/skins/default/xui/it/menu_viewer.xml
index 3de06669fb..8ef9babc45 100644
--- a/indra/newview/skins/default/xui/it/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/it/menu_viewer.xml
@@ -243,7 +243,7 @@
 		<menu_item_call label="Iscriviti a Firestorm Support Group" name="firestorm_support_group"/>
 		<menu_item_call label="Calendario lezioni su Firestorm" name="Firestorm Classes Schedule"/>
 		<menu_item_call label="Calendario eventi Firestorm" name="Firestorm Events Calendar"/>
-		<menu_item_call label="Guida" name="How To"/>
+		<menu_item_check label="Guida" name="How To"/>
 		<menu_item_call label="Aiuto su [CURRENT_GRID]" name="current_grid_help"/>
 		<menu_item_call label="A proposito di [CURRENT_GRID]" name="current_grid_about"/>
 		<menu_item_check label="Controlla stato grid" name="Grid Status"/>
diff --git a/indra/newview/skins/default/xui/ja/menu_viewer.xml b/indra/newview/skins/default/xui/ja/menu_viewer.xml
index 71ff0d0cce..4d693a833f 100644
--- a/indra/newview/skins/default/xui/ja/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml
@@ -310,7 +310,7 @@
 		<menu_item_call label="Firestormサポートグループに参加" name="firestorm_support_group"/>
 		<menu_item_call label="Firestorm 勉強会スケジュール" name="Firestorm Classes Schedule" />
 		<menu_item_call label="Firestorm イベントカレンダー" name="Firestorm Events Calendar" />
-		<menu_item_call label="ハウツー..." name="How To" />
+		<menu_item_check label="ハウツー..." name="How To" />
 		<menu_item_call label="[CURRENT_GRID] ヘルプ" name="current_grid_help"/>
 		<menu_item_call label="[CURRENT_GRID] について" name="current_grid_about"/>
 		<menu_item_call label="Grid status をチェック" name="Grid Status"/>
diff --git a/indra/newview/skins/default/xui/pl/menu_viewer.xml b/indra/newview/skins/default/xui/pl/menu_viewer.xml
index 5f79ccaff6..63f8871b9c 100644
--- a/indra/newview/skins/default/xui/pl/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/pl/menu_viewer.xml
@@ -270,7 +270,7 @@
 		<menu_item_call label="Dołącz do Grupy Wsparcia Firestorma" name="firestorm_support_group"/>
 		<menu_item_call label="Harmonogram lekcji Firestorma" name="Firestorm Classes Schedule"/>
 		<menu_item_call label="Kalendarz wydarzeń Firestorma" name="Firestorm Events Calendar"/>
-		<menu_item_call label="Samouczek" name="How To"/>
+		<menu_item_check label="Samouczek" name="How To"/>
 		<!-- <menu_item_call label="Pomoc Second Life" name="Second Life Help"/> -->
 		<menu_item_call label="Pomoc: [CURRENT_GRID]" name="current_grid_help"/>
 		<menu_item_call label="Na temat [CURRENT_GRID]" name="current_grid_about"/>
diff --git a/indra/newview/skins/default/xui/ru/menu_viewer.xml b/indra/newview/skins/default/xui/ru/menu_viewer.xml
index 21ca5e8565..a394728def 100644
--- a/indra/newview/skins/default/xui/ru/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ru/menu_viewer.xml
@@ -308,7 +308,7 @@
 		<menu_item_call label="Вступить в группу поддержки Firestorm" name="firestorm_support_group"/>
 		<menu_item_call label="Расписание обучений Firestorm" name="Firestorm Classes Schedule"/>
 		<menu_item_call label="Календарь Событий Firestorm" name="Firestorm Events Calendar"/>
-		<menu_item_call label="Обучение" name="How To"/>
+		<menu_item_check label="Обучение" name="How To"/>
 		<!-- <menu_item_call label="Second Life Help" name="Second Life Help"/> -->
 		<menu_item_call label="[CURRENT_GRID] помощь" name="current_grid_help"/>
 		<menu_item_call label="О [CURRENT_GRID]" name="current_grid_about"/>
diff --git a/indra/newview/skins/default/xui/tr/menu_viewer.xml b/indra/newview/skins/default/xui/tr/menu_viewer.xml
index 871ce64583..8ca8da91be 100644
--- a/indra/newview/skins/default/xui/tr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/tr/menu_viewer.xml
@@ -154,7 +154,7 @@
 		<menu_item_call label="Yinele" name="Redo"/>
 	</menu>
 	<menu label="Yardım" name="Help">
-		<menu_item_call label="Nasıl yapılır..." name="How To"/>
+		<menu_item_check label="Nasıl yapılır..." name="How To"/>
 		<menu_item_call label="Hızlı Başlangıç" name="Quickstart"/>
 		<menu_item_call label="Bilgi Bankası" name="Knowledge Base"/>
 		<menu_item_call label="Wiki" name="Wiki"/>
diff --git a/indra/newview/skins/latency/toolbars.xml b/indra/newview/skins/latency/toolbars.xml
index 9742b72b35..04630bd0b3 100644
--- a/indra/newview/skins/latency/toolbars.xml
+++ b/indra/newview/skins/latency/toolbars.xml
@@ -8,6 +8,8 @@
      button_alignment="center"
      button_display_mode="text_only"
      button_layout_style="fill">
+        <command
+         name="howto"/>
         <command
          name="chat" />
         <command
diff --git a/indra/newview/skins/metaharper/toolbars.xml b/indra/newview/skins/metaharper/toolbars.xml
index f899fc4a8c..a804109d27 100644
--- a/indra/newview/skins/metaharper/toolbars.xml
+++ b/indra/newview/skins/metaharper/toolbars.xml
@@ -8,6 +8,8 @@
      button_alignment="left"
      button_display_mode="icons_only"
      button_layout_style="fill">
+        <command
+         name="howto"/>
         <command
          name="chat" />
         <command
diff --git a/indra/newview/skins/vintage/toolbars.xml b/indra/newview/skins/vintage/toolbars.xml
index 595177b834..8d30c8d852 100644
--- a/indra/newview/skins/vintage/toolbars.xml
+++ b/indra/newview/skins/vintage/toolbars.xml
@@ -8,6 +8,8 @@
      button_alignment="center"
      button_display_mode="text_only"
      button_layout_style="fill">
+        <command
+         name="howto"/>
         <command
          name="chat" />
         <command