diff --git a/indra/newview/skins/metaharper/xui/en/panel_navigation_bar.xml b/indra/newview/skins/metaharper/xui/en/panel_navigation_bar.xml
index bbf77319bf..4bc0457fe8 100644
--- a/indra/newview/skins/metaharper/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/metaharper/xui/en/panel_navigation_bar.xml
@@ -134,11 +134,7 @@
 	     label="Sky" 
 	     tool_tip="Pops up Sky Editor window"
 	     top_delta="0"
-	     width="30">
-		 <button.commit_callback
-               function="World.EnvPreset"
-               parameter="edit_sky" />
-		 </button>
+	     width="30" />
           <!-- end of Windlight Button -->
 
 	</layout_panel>
diff --git a/indra/newview/skins/starlight/xui/en/panel_navigation_bar.xml b/indra/newview/skins/starlight/xui/en/panel_navigation_bar.xml
index fab54ec1a5..03c293ae8c 100644
--- a/indra/newview/skins/starlight/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/starlight/xui/en/panel_navigation_bar.xml
@@ -139,9 +139,9 @@
 	     tool_tip="Pops up Environment Settings window"
 	     top_delta="0"
 	     width="38">
-		 <button.commit_callback
-               function="World.EnvSettings"
-               parameter="editor" />
+		 <button.init_callback
+               function="Button.SetFloaterToggle"
+               parameter="env_settings" />
 		 </button>
           <!-- end of Windlight Button -->
 
diff --git a/indra/newview/skins/starlightcui/xui/en/panel_navigation_bar.xml b/indra/newview/skins/starlightcui/xui/en/panel_navigation_bar.xml
index c8b669a022..7e0349ea6f 100644
--- a/indra/newview/skins/starlightcui/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/starlightcui/xui/en/panel_navigation_bar.xml
@@ -138,9 +138,9 @@
 	     tool_tip="Pops up Environment Settings window"
 	     top_delta="0"
 	     width="38">
-		 <button.commit_callback
-               function="World.EnvSettings"
-               parameter="editor" />
+		 <button.init_callback
+               function="Button.SetFloaterToggle"
+               parameter="env_settings" />
 		 </button>
           <!-- end of Windlight Button -->