diff --git a/src/constants/app.ts b/src/constants/app.ts
index 313e4721b..f4be36477 100644
--- a/src/constants/app.ts
+++ b/src/constants/app.ts
@@ -12,11 +12,11 @@ export enum AppString {
 
   DEFAULT_ENDORSER_API_SERVER = TEST_ENDORSER_API_SERVER,
 
-  PROD_PUSH_SERVER = "https://push.endorser.ch",
-  TEST_PUSH_SERVER = "https://timesafari-pwa.anomalistlabs.com",
-  LOCAL_PUSH_SERVER = "http://localhost:3001",
+  PROD_PUSH_SERVER = "https://timesafari.app",
+  TEST1_PUSH_SERVER = "https://test.timesafari.app",
+  TEST2_PUSH_SERVER = "https://timesafari-pwa.anomalistlabs.com",
 
-  DEFAULT_PUSH_SERVER = TEST_PUSH_SERVER,
+  DEFAULT_PUSH_SERVER = TEST1_PUSH_SERVER,
 }
 
 /**
diff --git a/src/views/AccountViewView.vue b/src/views/AccountViewView.vue
index 9e2908043..f0ee90a81 100644
--- a/src/views/AccountViewView.vue
+++ b/src/views/AccountViewView.vue
@@ -323,19 +323,19 @@
           <fa icon="floppy-disk" class="fa-fw" color="white"></fa>
         </button>
         <button
-          class="px-4 rounded bg-slate-200 border border-slate-400"
+          class="px-3 rounded bg-slate-200 border border-slate-400"
           @click="apiServerInput = AppConstants.PROD_ENDORSER_API_SERVER"
         >
           Use Prod
         </button>
         <button
-          class="px-4 rounded bg-slate-200 border border-slate-400"
+          class="px-3 rounded bg-slate-200 border border-slate-400"
           @click="apiServerInput = AppConstants.TEST_ENDORSER_API_SERVER"
         >
           Use Test
         </button>
         <button
-          class="px-4 rounded bg-slate-200 border border-slate-400"
+          class="px-3 rounded bg-slate-200 border border-slate-400"
           @click="apiServerInput = AppConstants.LOCAL_ENDORSER_API_SERVER"
         >
           Use Local
@@ -359,22 +359,22 @@
           <fa icon="floppy-disk" class="fa-fw" color="white"></fa>
         </button>
         <button
-          class="px-4 rounded bg-slate-200 border border-slate-400"
+          class="px-3 rounded bg-slate-200 border border-slate-400"
           @click="webPushServerInput = AppConstants.PROD_PUSH_SERVER"
         >
           Use Prod
         </button>
         <button
-          class="px-4 rounded bg-slate-200 border border-slate-400"
-          @click="webPushServerInput = AppConstants.TEST_PUSH_SERVER"
+          class="px-3 rounded bg-slate-200 border border-slate-400"
+          @click="webPushServerInput = AppConstants.TEST1_PUSH_SERVER"
         >
-          Use Test
+          Use Test 1
         </button>
         <button
-          class="px-4 rounded bg-slate-200 border border-slate-400"
-          @click="webPushServerInput = AppConstants.LOCAL_PUSH_SERVER"
+          class="px-3 rounded bg-slate-200 border border-slate-400"
+          @click="webPushServerInput = AppConstants.TEST2_PUSH_SERVER"
         >
-          Use Local
+          Use Test 2
         </button>
       </div>
     </div>