diff --git a/webapp/www/img/emTripLog-icon-96x96.png b/webapp/www/img/emTripLog-icon-96x96.png
new file mode 100644
index 000000000..4eead146a
Binary files /dev/null and b/webapp/www/img/emTripLog-icon-96x96.png differ
diff --git a/webapp/www/img/emission-icon-96x96.png b/webapp/www/img/emission-icon-96x96.png
new file mode 100644
index 000000000..fc37689f2
Binary files /dev/null and b/webapp/www/img/emission-icon-96x96.png differ
diff --git a/webapp/www/js/app.js b/webapp/www/js/app.js
index bf4b51fda..3231b0aed 100644
--- a/webapp/www/js/app.js
+++ b/webapp/www/js/app.js
@@ -65,7 +65,7 @@ angular.module('starter', ['ionic', 'starter.controllers', 'starter.services',
     controller: 'SetupCtrl'
   })
   .state('client_setup', {
-    url: '/client_setup?new_client&clear_local_storage&clear_usercache',
+    url: '/client_setup?base_app&new_client&clear_local_storage&clear_usercache',
     templateUrl: 'templates/client_setup.html',
     controller: 'ClientSetupCtrl'
   });
diff --git a/webapp/www/js/controllers.js b/webapp/www/js/controllers.js
index 855d8149e..bc36af0ea 100644
--- a/webapp/www/js/controllers.js
+++ b/webapp/www/js/controllers.js
@@ -92,6 +92,32 @@ angular.module('starter.controllers', ['starter.heatmap', 'starter.metrics'])
 
 .controller('ClientSetupCtrl', function($scope, $stateParams) {
     console.log("in client setup, routeParams = "+JSON.stringify($stateParams));
+    var BASE_APP_URL = {
+        "emTripLog": {
+            "android": "https://play.google.com/store/apps/details?id=edu.berkeley.eecs.embase",
+            "ios": "https://itunes.apple.com/us/app/emtriplog/id1362434685"
+        },
+        "emission": {
+            "android": "https://play.google.com/store/apps/details?id=edu.berkeley.eecs.emission",
+            "ios": "https://itunes.apple.com/us/app/emission/id1084198445"
+        }
+    }
+    if (angular.isDefined($stateParams.base_app)) {
+        if (angular.isDefined(BASE_APP_URL[$stateParams.base_app])) {
+            $scope.base_app = $stateParams.base_app;
+            console.log("base_app defined in paramters, setting to "+$scope.base_app);
+        } else {
+            // emTripLog is the default
+            $scope.base_app = "emTripLog"
+            console.log("invalid base_app "+$stateParams.base_app+" defined, defaulting to emTripLog");
+        }
+    } else {
+        // emTripLog is the default
+        $scope.base_app = "emTripLog"
+        console.log("base_app not defined in paramters, defaulting to emTripLog");
+    }
+    $scope.android_base_app = BASE_APP_URL[$scope.base_app]["android"]
+    $scope.ios_base_app = BASE_APP_URL[$scope.base_app]["ios"]
     $scope.client_label = $stateParams.new_client;
     $scope.clear_local_storage_flag = $stateParams.clear_local_storage;
     $scope.clear_usercache_flag = $stateParams.clear_usercache;
diff --git a/webapp/www/templates/client_setup.html b/webapp/www/templates/client_setup.html
index be8ae465d..b071de5ed 100644
--- a/webapp/www/templates/client_setup.html
+++ b/webapp/www/templates/client_setup.html
@@ -2,7 +2,7 @@
   <ion-content>
       <div class="redirect">
         <div>
-          <img id="logo" ng-src="img/favicon-96x96.png">
+          <img id="logo" alt="{{base_app}} logo" ng-src="img/{{base_app}}-icon-96x96.png">
         </div>
         <div>
           <h2>Thank you for participating - only two steps left!</h2>
@@ -11,7 +11,7 @@ <h2>Thank you for participating - only two steps left!</h2>
           </p>
         </div>
         <div>
-          <svg width="58px" height="49px" viewBox="0 0 58 49" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+          <svg aria-label="Step 1" width="58px" height="49px" viewBox="0 0 58 49" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
               <!-- Generator: Sketch 43.1 (39012) - http://www.bohemiancoding.com/sketch -->
               <desc>Created with Sketch.</desc>
               <defs></defs>
@@ -26,20 +26,20 @@ <h2>Thank you for participating - only two steps left!</h2>
                   </g>
               </g>
           </svg>
-        <h4>Install the e-mission app</h4>
+        <h4>Install the {{base_app}} app</h4>
         </div>
         <div class="row responsive-sm">
-          <a class="col" href='https://play.google.com/store/apps/details?id=edu.berkeley.eecs.emission'><img style="height:75px;" alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png'/></a>
-          <qrcode class="col" data="https://play.google.com/store/apps/details?id=edu.berkeley.eecs.emission" size="200"></qrcode>
+          <a class="col" href='{{android_base_app}}'><img style="height:75px;" alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png'/></a>
+          <qrcode class="col" aria-label="qrcode for google play installation" data="{{android_base_app}}" size="200"></qrcode>
             <!-- <br style="clear:both;"/> -->
         </div>
         <div class="row responsive-sm">
-          <a class="col" href="https://itunes.apple.com/us/app/emission/id1084198445?&mt=8"><img ng-src="img/apple-badge.svg"></a>
-          <qrcode class="col" data="https://itunes.apple.com/us/app/emission/id1084198445?&mt=8" size="200"></qrcode>
+          <a class="col" href="{{ios_base_app}}"><img alt='Get it on the iOS app store' ng-src="img/apple-badge.svg"></a>
+          <qrcode class="col" aria-label="qrcode for iOS app store installation" data="{{ios_base_app}}" size="200"></qrcode>
             <!-- <br style="clear:both;"/> -->
         </div>
         <div>
-          <svg width="58px" height="49px" viewBox="0 0 58 49" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+          <svg aria-label="Step 2" width="58px" height="49px" viewBox="0 0 58 49" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
               <!-- Generator: Sketch 43.1 (39012) - http://www.bohemiancoding.com/sketch -->
               <desc>Created with Sketch.</desc>
               <defs></defs>
@@ -63,7 +63,7 @@ <h4>Join this study</h4>
           </a>
         </div>
         <div>
-          <qrcode class="col" data="emission://change_client?new_client={{client_label}}&clear_local_storage={{clear_local_storage_flag}}&clear_usercache={{clear_usercache_flag}}" size="200"></qrcode>
+          <qrcode class="col" aria-label="qrcode to join the study" data="emission://change_client?new_client={{client_label}}&clear_local_storage={{clear_local_storage_flag}}&clear_usercache={{clear_usercache_flag}}" size="200"></qrcode>
         </div>
       </div>
   </ion-content>