diff --git a/BuildParams b/BuildParams
index 5250dab03ccb43856ee8b293336f125bd7cb6a39..10d16ff7d75f22cf09867f349fb3b30cd4a44d88 100755
--- a/BuildParams
+++ b/BuildParams
@@ -154,6 +154,8 @@ oz_project-4.codeticket_add_context = false
 
 oz_viewer-beta-review.build_debug_release_separately = true
 oz_viewer-beta-review.codeticket_add_context = false
+oz_viewer-beta-review.viewer_channel = "Second Life Beta Viewer"
+oz_viewer-beta-review.login_channel = "Second Life Beta Viewer"
 
 oz_viewer-poreview.build_debug_release_separately = true
 oz_viewer-poreview.codeticket_add_context = false
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 86fbc248b0d8ad51def206ac78689a2aae5c830c..7e1d46f0e82688e6cb13b68c64c17d41737ad3ae 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1253,10 +1253,13 @@ if (WINDOWS)
     endif(USE_PRECOMPILED_HEADERS)
 
     # Replace the icons with the appropriate ones for the channel
+    # ('test' is the default)
     set(ICON_PATH "test")
     string(TOLOWER ${VIEWER_CHANNEL} channel_lower)
-    if(channel_lower MATCHES "^(release|beta|development)")
+    if(channel_lower MATCHES "^(release|development)")
         set(ICON_PATH ${channel_lower})
+    elseif(channel_lower MATCHES "^(beta.*)")
+        set(ICON_PATH "beta")
     elseif(channel_lower MATCHES "^(project.*)")
         set(ICON_PATH "project")
     endif()
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 34565835e923d8afe362a45ad12b18a4e48f13e1..37099bf29b9d7bbc6aef7ded775b7de35e6acd93 100644
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -147,10 +147,11 @@ def icon_path(self):
         icon_path="icons/"
         channel_type=self.channel_lowerword()
         if channel_type == 'release' \
-        or channel_type == 'beta' \
         or channel_type == 'development' \
         :
             icon_path += channel_type
+        elif channel_type == 'betaviewer' :
+            icon_path += 'beta'
         elif re.match('project.*',channel_type) :
             icon_path += 'project'
         else :