diff --git a/src/Experimental.h b/src/Experimental.h
index 961a00e43..b6178e6fc 100644
--- a/src/Experimental.h
+++ b/src/Experimental.h
@@ -92,7 +92,7 @@
 //#define EXPERIMENTAL_THEME_PREFS
 
 // This shows the zoom toggle button on the edit toolbar.
-//#define EXPERIMENTAL_ZOOM_TOGGLE_BUTTON
+#define EXPERIMENTAL_ZOOM_TOGGLE_BUTTON
 
 //Next line enables Mic monitoring at times when it was previously off.
 //More work is needed as after recording or playing it results in an
diff --git a/src/Menus.cpp b/src/Menus.cpp
index 4e2fea6e6..73f49054f 100644
--- a/src/Menus.cpp
+++ b/src/Menus.cpp
@@ -700,7 +700,7 @@ void AudacityProject::CreateMenusAndCommands()
 
       c->AddSeparator();
 
-      c->AddItem(wxT("ZeroCross"), _("At &Zero Crossings"), FN(OnZeroCrossing), wxT("Z"));
+      c->AddItem(wxT("ZeroCross"), _("At &Zero Crossings"), FN(OnZeroCrossing), wxT(""));
 
       c->EndMenu();
 
@@ -722,7 +722,7 @@ void AudacityProject::CreateMenusAndCommands()
       c->AddItem(wxT("ZoomSel"), _("&Zoom to Selection"), FN(OnZoomSel), wxT("Ctrl+E"), 
          TimeSelectedFlag, 
          TimeSelectedFlag);
-      c->AddItem(wxT("ZoomToggle"), _("Zoom &Toggle"), FN(OnZoomToggle), wxT(""),
+      c->AddItem(wxT("ZoomToggle"), _("Zoom &Toggle"), FN(OnZoomToggle), wxT("Z"),
          TracksExistFlag, 
          TracksExistFlag);
       c->EndSubMenu();
@@ -6544,7 +6544,7 @@ void AudacityProject::OnZoomToggle(const CommandContext &)
    double Zoom1 = GetZoomOfPref(
       wxT("/GUI/ZoomPreset1"), WaveTrack::kZoomDefault );
    double Zoom2 = GetZoomOfPref(
-      wxT("/GUI/ZoomPreset2"), WaveTrack::kZoom4To1 );
+      wxT("/GUI/ZoomPreset2"), WaveTrack::kZoomMinutes );
    double Z = mViewInfo.GetZoom();// Current Zoom.
    double ChosenZoom = abs(log(Zoom1 / Z)) > abs(log( Z / Zoom2)) ? Zoom1:Zoom2;
 
diff --git a/src/prefs/TracksPrefs.cpp b/src/prefs/TracksPrefs.cpp
index e58752724..a813f21e4 100644
--- a/src/prefs/TracksPrefs.cpp
+++ b/src/prefs/TracksPrefs.cpp
@@ -86,7 +86,7 @@ void TracksPrefs::Populate()
    mSampleDisplayChoices.Add(_("Stem plot"));
    mSampleDisplayCodes.Add((int) WaveTrack::StemPlot);
 
-   mZoomChoices.Add( _("Zoom to Fit") );
+   mZoomChoices.Add( _("Fit to Width") );
    mZoomCodes.Add( WaveTrack::kZoomToFit );
    mZoomChoices.Add( _("Zoom to Selection") );
    mZoomCodes.Add( WaveTrack::kZoomToSelection );
@@ -176,7 +176,7 @@ void TracksPrefs::PopulateOrExchange(ShuttleGui & S)
 
          S.TieChoice(_("Preset 2:"),
                      wxT("/GUI/ZoomPreset2"),
-                     WaveTrack::kZoom4To1,
+                     WaveTrack::kZoomMinutes,
                      mZoomChoices,
                      mZoomCodes);
          S.SetSizeHints(mZoomChoices);
diff --git a/src/toolbars/EditToolBar.cpp b/src/toolbars/EditToolBar.cpp
index 8ab94dcef..f586804e6 100644
--- a/src/toolbars/EditToolBar.cpp
+++ b/src/toolbars/EditToolBar.cpp
@@ -159,16 +159,17 @@ void EditToolBar::Populate()
       _("Zoom In"));
    AddButton(bmpZoomOut, bmpZoomOut, bmpZoomOutDisabled, ETBZoomOutID,
       _("Zoom Out"));
+   AddButton(bmpZoomSel, bmpZoomSel, bmpZoomSelDisabled, ETBZoomSelID,
+      _("Fit selection in window"));
+   AddButton(bmpZoomFit, bmpZoomFit, bmpZoomFitDisabled, ETBZoomFitID,
+      _("Fit project in window"));
 
 #ifdef EXPERIMENTAL_ZOOM_TOGGLE_BUTTON
    AddButton(bmpZoomToggle, bmpZoomToggle, bmpZoomToggleDisabled, ETBZoomToggleID,
       _("Zoom Toggle"));
 #endif
 
-   AddButton(bmpZoomSel, bmpZoomSel, bmpZoomSelDisabled, ETBZoomSelID,
-      _("Fit selection in window"));
-   AddButton(bmpZoomFit, bmpZoomFit, bmpZoomFitDisabled, ETBZoomFitID,
-      _("Fit project in window"));
+
 
    mButtons[ETBZoomInID]->SetEnabled(false);
    mButtons[ETBZoomOutID]->SetEnabled(false);