diff --git a/app/src/common/shared/org/mozilla/vrbrowser/browser/SettingsStore.java b/app/src/common/shared/org/mozilla/vrbrowser/browser/SettingsStore.java
index ccb3e9e72..4bdb239c5 100644
--- a/app/src/common/shared/org/mozilla/vrbrowser/browser/SettingsStore.java
+++ b/app/src/common/shared/org/mozilla/vrbrowser/browser/SettingsStore.java
@@ -287,12 +287,7 @@ public void setMaxWindowHeight(int aMaxWindowHeight) {
     }
 
     public String getEnvironment() {
-        String env = mPrefs.getString(mContext.getString(R.string.settings_key_env), ENV_DEFAULT);
-        // Remove when the meadow is ready
-        if (env.equalsIgnoreCase("meadow")) {
-            env = ENV_DEFAULT;
-        }
-        return env;
+        return mPrefs.getString(mContext.getString(R.string.settings_key_env), ENV_DEFAULT);
     }
 
     public void setEnvironment(String aEnv) {
diff --git a/app/src/main/assets/cubemap/meadow/negx.ktx b/app/src/main/assets/cubemap/meadow/negx.ktx
index 6af58cd3f..06fe8b8f1 100644
Binary files a/app/src/main/assets/cubemap/meadow/negx.ktx and b/app/src/main/assets/cubemap/meadow/negx.ktx differ
diff --git a/app/src/main/assets/cubemap/meadow/negy.ktx b/app/src/main/assets/cubemap/meadow/negy.ktx
index 8e36022ae..674636b1c 100644
Binary files a/app/src/main/assets/cubemap/meadow/negy.ktx and b/app/src/main/assets/cubemap/meadow/negy.ktx differ
diff --git a/app/src/main/assets/cubemap/meadow/negz.ktx b/app/src/main/assets/cubemap/meadow/negz.ktx
index 06c5b0a4e..0e74a7641 100644
Binary files a/app/src/main/assets/cubemap/meadow/negz.ktx and b/app/src/main/assets/cubemap/meadow/negz.ktx differ
diff --git a/app/src/main/assets/cubemap/meadow/posx.ktx b/app/src/main/assets/cubemap/meadow/posx.ktx
index 8ee12220f..8a297b22d 100644
Binary files a/app/src/main/assets/cubemap/meadow/posx.ktx and b/app/src/main/assets/cubemap/meadow/posx.ktx differ
diff --git a/app/src/main/assets/cubemap/meadow/posy.ktx b/app/src/main/assets/cubemap/meadow/posy.ktx
index 03cc8255b..d68d1819f 100644
Binary files a/app/src/main/assets/cubemap/meadow/posy.ktx and b/app/src/main/assets/cubemap/meadow/posy.ktx differ
diff --git a/app/src/main/assets/cubemap/meadow/posz.ktx b/app/src/main/assets/cubemap/meadow/posz.ktx
index 2b8088dcc..0e3299bcc 100644
Binary files a/app/src/main/assets/cubemap/meadow/posz.ktx and b/app/src/main/assets/cubemap/meadow/posz.ktx differ
diff --git a/app/src/main/assets/cubemap/underwater/negx.ktx b/app/src/main/assets/cubemap/underwater/negx.ktx
index c7544d951..852814781 100644
Binary files a/app/src/main/assets/cubemap/underwater/negx.ktx and b/app/src/main/assets/cubemap/underwater/negx.ktx differ
diff --git a/app/src/main/assets/cubemap/underwater/negy.ktx b/app/src/main/assets/cubemap/underwater/negy.ktx
index 38269bd2f..79aca10c9 100644
Binary files a/app/src/main/assets/cubemap/underwater/negy.ktx and b/app/src/main/assets/cubemap/underwater/negy.ktx differ
diff --git a/app/src/main/assets/cubemap/underwater/negz.ktx b/app/src/main/assets/cubemap/underwater/negz.ktx
index 91b2ffa12..def3481b9 100644
Binary files a/app/src/main/assets/cubemap/underwater/negz.ktx and b/app/src/main/assets/cubemap/underwater/negz.ktx differ
diff --git a/app/src/main/assets/cubemap/underwater/posx.ktx b/app/src/main/assets/cubemap/underwater/posx.ktx
index fc30b78ce..def3481b9 100644
Binary files a/app/src/main/assets/cubemap/underwater/posx.ktx and b/app/src/main/assets/cubemap/underwater/posx.ktx differ
diff --git a/app/src/main/assets/cubemap/underwater/posy.ktx b/app/src/main/assets/cubemap/underwater/posy.ktx
index da716833b..c93a3b203 100644
Binary files a/app/src/main/assets/cubemap/underwater/posy.ktx and b/app/src/main/assets/cubemap/underwater/posy.ktx differ
diff --git a/app/src/main/assets/cubemap/underwater/posz.ktx b/app/src/main/assets/cubemap/underwater/posz.ktx
index 39d829377..37d944eed 100644
Binary files a/app/src/main/assets/cubemap/underwater/posz.ktx and b/app/src/main/assets/cubemap/underwater/posz.ktx differ
diff --git a/app/src/main/assets/cubemap/winter/negx.ktx b/app/src/main/assets/cubemap/winter/negx.ktx
index 769981c5e..d1ce0924f 100644
Binary files a/app/src/main/assets/cubemap/winter/negx.ktx and b/app/src/main/assets/cubemap/winter/negx.ktx differ
diff --git a/app/src/main/assets/cubemap/winter/negy.ktx b/app/src/main/assets/cubemap/winter/negy.ktx
index aa24deecf..acffdc0a7 100644
Binary files a/app/src/main/assets/cubemap/winter/negy.ktx and b/app/src/main/assets/cubemap/winter/negy.ktx differ
diff --git a/app/src/main/assets/cubemap/winter/negz.ktx b/app/src/main/assets/cubemap/winter/negz.ktx
index d8a75f193..9c118cfeb 100644
Binary files a/app/src/main/assets/cubemap/winter/negz.ktx and b/app/src/main/assets/cubemap/winter/negz.ktx differ
diff --git a/app/src/main/assets/cubemap/winter/posx.ktx b/app/src/main/assets/cubemap/winter/posx.ktx
index 45d9c4feb..bcc607bb7 100644
Binary files a/app/src/main/assets/cubemap/winter/posx.ktx and b/app/src/main/assets/cubemap/winter/posx.ktx differ
diff --git a/app/src/main/assets/cubemap/winter/posy.ktx b/app/src/main/assets/cubemap/winter/posy.ktx
index bce6f075f..1301ec9ec 100644
Binary files a/app/src/main/assets/cubemap/winter/posy.ktx and b/app/src/main/assets/cubemap/winter/posy.ktx differ
diff --git a/app/src/main/assets/cubemap/winter/posz.ktx b/app/src/main/assets/cubemap/winter/posz.ktx
index 7030c8573..ece6ba8a1 100644
Binary files a/app/src/main/assets/cubemap/winter/posz.ktx and b/app/src/main/assets/cubemap/winter/posz.ktx differ
diff --git a/app/src/main/cpp/BrowserWorld.cpp b/app/src/main/cpp/BrowserWorld.cpp
index 6f0a5c790..48c75be0d 100644
--- a/app/src/main/cpp/BrowserWorld.cpp
+++ b/app/src/main/cpp/BrowserWorld.cpp
@@ -1131,10 +1131,7 @@ BrowserWorld::CreateSkyBox(const std::string& aBasePath, const std::string& aExt
   const bool empty = aBasePath == "cubemap/void";
   const std::string extension = aExtension.empty() ? ".ktx" : aExtension;
   const GLenum glFormat = extension == ".ktx" ? GL_COMPRESSED_RGB8_ETC2 : GL_RGB8;
-  float size = 1024;
-  if (aBasePath == "cubemap/underwater" || aBasePath == "cubemap/winter") {
-    size = 1000;
-  }
+  const float size = 1024;
   if (m.skybox && empty) {
     m.skybox->SetVisible(false);
     return;
diff --git a/app/src/main/res/layout/options_environment.xml b/app/src/main/res/layout/options_environment.xml
index 23b8e742d..dae3ffd52 100644
--- a/app/src/main/res/layout/options_environment.xml
+++ b/app/src/main/res/layout/options_environment.xml
@@ -38,7 +38,7 @@
             style="@style/scrollbar"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:padding="0dp"
+            android:paddingRight="15dp"
             android:layout_above="@+id/separatorBottom"
             android:layout_below="@+id/separatorTop">
 
diff --git a/app/src/main/res/values/options_values.xml b/app/src/main/res/values/options_values.xml
index b70fd1fc9..87e79f031 100644
--- a/app/src/main/res/values/options_values.xml
+++ b/app/src/main/res/values/options_values.xml
@@ -5,24 +5,27 @@
         <item>@string/developer_options_env_void</item>
         <item>@string/developer_options_env_cave</item>
         <item>@string/developer_options_env_offworld</item>
-        <item>@string/developer_options_env_underwater</item>
+        <!--<item>@string/developer_options_env_underwater</item>-->
         <item>@string/developer_options_env_winter</item>
+        <item>@string/developer_options_env_meadow</item>
     </string-array>
 
     <string-array name="developer_options_environments_values" translatable="false">
         <item>void</item>
         <item>cave</item>
         <item>offworld</item>
-        <item>underwater</item>
+        <!--<item>underwater</item>-->
         <item>winter</item>
+        <item>meadow</item>
     </string-array>
 
     <array name="developer_options_environments_images" translatable="false">
         <item>@color/black</item>
         <item>@drawable/environment_cave</item>
         <item>@drawable/environment_offworld</item>
-        <item>@drawable/environment_underwater</item>
+        <!--<item>@drawable/environment_underwater</item>-->
         <item>@drawable/environment_winter</item>
+        <item>@drawable/environment_meadow</item>
     </array>
 
     <!-- Pointer Options -->
diff --git a/app/src/uncompressed_assets/main/assets/cubemap/meadow/negx.jpg b/app/src/uncompressed_assets/main/assets/cubemap/meadow/negx.jpg
index 62fed6139..43fa27181 100644
Binary files a/app/src/uncompressed_assets/main/assets/cubemap/meadow/negx.jpg and b/app/src/uncompressed_assets/main/assets/cubemap/meadow/negx.jpg differ
diff --git a/app/src/uncompressed_assets/main/assets/cubemap/meadow/negy.jpg b/app/src/uncompressed_assets/main/assets/cubemap/meadow/negy.jpg
index af61de528..e92c81a8c 100644
Binary files a/app/src/uncompressed_assets/main/assets/cubemap/meadow/negy.jpg and b/app/src/uncompressed_assets/main/assets/cubemap/meadow/negy.jpg differ
diff --git a/app/src/uncompressed_assets/main/assets/cubemap/meadow/negz.jpg b/app/src/uncompressed_assets/main/assets/cubemap/meadow/negz.jpg
index 53e025dcf..337d9265a 100644
Binary files a/app/src/uncompressed_assets/main/assets/cubemap/meadow/negz.jpg and b/app/src/uncompressed_assets/main/assets/cubemap/meadow/negz.jpg differ
diff --git a/app/src/uncompressed_assets/main/assets/cubemap/meadow/posx.jpg b/app/src/uncompressed_assets/main/assets/cubemap/meadow/posx.jpg
index 57b9632e5..738489b0c 100644
Binary files a/app/src/uncompressed_assets/main/assets/cubemap/meadow/posx.jpg and b/app/src/uncompressed_assets/main/assets/cubemap/meadow/posx.jpg differ
diff --git a/app/src/uncompressed_assets/main/assets/cubemap/meadow/posy.jpg b/app/src/uncompressed_assets/main/assets/cubemap/meadow/posy.jpg
index ff9a76db2..921024cdc 100644
Binary files a/app/src/uncompressed_assets/main/assets/cubemap/meadow/posy.jpg and b/app/src/uncompressed_assets/main/assets/cubemap/meadow/posy.jpg differ
diff --git a/app/src/uncompressed_assets/main/assets/cubemap/meadow/posz.jpg b/app/src/uncompressed_assets/main/assets/cubemap/meadow/posz.jpg
index f91bbd7f4..8e3445325 100644
Binary files a/app/src/uncompressed_assets/main/assets/cubemap/meadow/posz.jpg and b/app/src/uncompressed_assets/main/assets/cubemap/meadow/posz.jpg differ
diff --git a/app/src/uncompressed_assets/main/assets/cubemap/underwater/negx.jpeg b/app/src/uncompressed_assets/main/assets/cubemap/underwater/negx.jpeg
deleted file mode 100644
index 5c84b7f67..000000000
Binary files a/app/src/uncompressed_assets/main/assets/cubemap/underwater/negx.jpeg and /dev/null differ
diff --git a/app/src/uncompressed_assets/main/assets/cubemap/underwater/negx.jpg b/app/src/uncompressed_assets/main/assets/cubemap/underwater/negx.jpg
new file mode 100644
index 000000000..c30ffabc3
Binary files /dev/null and b/app/src/uncompressed_assets/main/assets/cubemap/underwater/negx.jpg differ
diff --git a/app/src/uncompressed_assets/main/assets/cubemap/underwater/negy.jpeg b/app/src/uncompressed_assets/main/assets/cubemap/underwater/negy.jpeg
deleted file mode 100644
index 99d082de3..000000000
Binary files a/app/src/uncompressed_assets/main/assets/cubemap/underwater/negy.jpeg and /dev/null differ
diff --git a/app/src/uncompressed_assets/main/assets/cubemap/underwater/negy.jpg b/app/src/uncompressed_assets/main/assets/cubemap/underwater/negy.jpg
new file mode 100644
index 000000000..059496146
Binary files /dev/null and b/app/src/uncompressed_assets/main/assets/cubemap/underwater/negy.jpg differ
diff --git a/app/src/uncompressed_assets/main/assets/cubemap/underwater/negz.jpeg b/app/src/uncompressed_assets/main/assets/cubemap/underwater/negz.jpeg
deleted file mode 100644
index 02a67f19a..000000000
Binary files a/app/src/uncompressed_assets/main/assets/cubemap/underwater/negz.jpeg and /dev/null differ
diff --git a/app/src/uncompressed_assets/main/assets/cubemap/underwater/negz.jpg b/app/src/uncompressed_assets/main/assets/cubemap/underwater/negz.jpg
new file mode 100644
index 000000000..713cabfa5
Binary files /dev/null and b/app/src/uncompressed_assets/main/assets/cubemap/underwater/negz.jpg differ
diff --git a/app/src/uncompressed_assets/main/assets/cubemap/underwater/posx.jpeg b/app/src/uncompressed_assets/main/assets/cubemap/underwater/posx.jpeg
deleted file mode 100644
index a5d6b8b58..000000000
Binary files a/app/src/uncompressed_assets/main/assets/cubemap/underwater/posx.jpeg and /dev/null differ
diff --git a/app/src/uncompressed_assets/main/assets/cubemap/underwater/posx.jpg b/app/src/uncompressed_assets/main/assets/cubemap/underwater/posx.jpg
new file mode 100644
index 000000000..713cabfa5
Binary files /dev/null and b/app/src/uncompressed_assets/main/assets/cubemap/underwater/posx.jpg differ
diff --git a/app/src/uncompressed_assets/main/assets/cubemap/underwater/posy.jpeg b/app/src/uncompressed_assets/main/assets/cubemap/underwater/posy.jpeg
deleted file mode 100644
index bca574961..000000000
Binary files a/app/src/uncompressed_assets/main/assets/cubemap/underwater/posy.jpeg and /dev/null differ
diff --git a/app/src/uncompressed_assets/main/assets/cubemap/underwater/posy.jpg b/app/src/uncompressed_assets/main/assets/cubemap/underwater/posy.jpg
new file mode 100644
index 000000000..ea8678db5
Binary files /dev/null and b/app/src/uncompressed_assets/main/assets/cubemap/underwater/posy.jpg differ
diff --git a/app/src/uncompressed_assets/main/assets/cubemap/underwater/posz.jpeg b/app/src/uncompressed_assets/main/assets/cubemap/underwater/posz.jpeg
deleted file mode 100644
index 8ad09591b..000000000
Binary files a/app/src/uncompressed_assets/main/assets/cubemap/underwater/posz.jpeg and /dev/null differ
diff --git a/app/src/uncompressed_assets/main/assets/cubemap/underwater/posz.jpg b/app/src/uncompressed_assets/main/assets/cubemap/underwater/posz.jpg
new file mode 100644
index 000000000..7b844cf70
Binary files /dev/null and b/app/src/uncompressed_assets/main/assets/cubemap/underwater/posz.jpg differ
diff --git a/app/src/uncompressed_assets/main/assets/cubemap/winter/negx.jpg b/app/src/uncompressed_assets/main/assets/cubemap/winter/negx.jpg
index 89919a6fb..04af6c64a 100644
Binary files a/app/src/uncompressed_assets/main/assets/cubemap/winter/negx.jpg and b/app/src/uncompressed_assets/main/assets/cubemap/winter/negx.jpg differ
diff --git a/app/src/uncompressed_assets/main/assets/cubemap/winter/negy.jpg b/app/src/uncompressed_assets/main/assets/cubemap/winter/negy.jpg
index 6601b23a2..8c23d6c6f 100644
Binary files a/app/src/uncompressed_assets/main/assets/cubemap/winter/negy.jpg and b/app/src/uncompressed_assets/main/assets/cubemap/winter/negy.jpg differ
diff --git a/app/src/uncompressed_assets/main/assets/cubemap/winter/negz.jpg b/app/src/uncompressed_assets/main/assets/cubemap/winter/negz.jpg
index fcd0c86f0..bbb92d32d 100644
Binary files a/app/src/uncompressed_assets/main/assets/cubemap/winter/negz.jpg and b/app/src/uncompressed_assets/main/assets/cubemap/winter/negz.jpg differ
diff --git a/app/src/uncompressed_assets/main/assets/cubemap/winter/posx.jpg b/app/src/uncompressed_assets/main/assets/cubemap/winter/posx.jpg
index a21922dbb..3f6cf1bf9 100644
Binary files a/app/src/uncompressed_assets/main/assets/cubemap/winter/posx.jpg and b/app/src/uncompressed_assets/main/assets/cubemap/winter/posx.jpg differ
diff --git a/app/src/uncompressed_assets/main/assets/cubemap/winter/posy.jpg b/app/src/uncompressed_assets/main/assets/cubemap/winter/posy.jpg
index db8f3e83d..8b03488b1 100644
Binary files a/app/src/uncompressed_assets/main/assets/cubemap/winter/posy.jpg and b/app/src/uncompressed_assets/main/assets/cubemap/winter/posy.jpg differ
diff --git a/app/src/uncompressed_assets/main/assets/cubemap/winter/posz.jpg b/app/src/uncompressed_assets/main/assets/cubemap/winter/posz.jpg
index 398ba9851..6545681ec 100644
Binary files a/app/src/uncompressed_assets/main/assets/cubemap/winter/posz.jpg and b/app/src/uncompressed_assets/main/assets/cubemap/winter/posz.jpg differ