diff --git a/public/favicon.ico b/public/favicon.ico
deleted file mode 100644
index 27cd2f2..0000000
Binary files a/public/favicon.ico and /dev/null differ
diff --git a/public/favicon.png b/public/favicon.png
new file mode 100644
index 0000000..96669d2
Binary files /dev/null and b/public/favicon.png differ
diff --git a/src/consts/environments.ts b/src/consts/environments.ts
index fcdd857..6a63992 100644
--- a/src/consts/environments.ts
+++ b/src/consts/environments.ts
@@ -4,6 +4,10 @@ export enum Environment {
   Testnet = 'testnet',
 }
 
-export const environments = Object.values(Environment);
+export const ENVIRONMENT_BUCKET_SEGMENT: Record<Environment, string> = {
+  [Environment.Mainnet]: 'mainnet3',
+  [Environment.Testnet]: 'testnet4',
+};
 
+// TODO replace with SDK version
 export const MAILBOX_VERSION = 3;
diff --git a/src/pages/_document.tsx b/src/pages/_document.tsx
index bc51ab8..b293d14 100644
--- a/src/pages/_document.tsx
+++ b/src/pages/_document.tsx
@@ -13,7 +13,7 @@ export default function Document() {
         <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png" />
         <link rel="manifest" href="/site.webmanifest" />
         <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#2362C1" />
-        <link rel="shortcut icon" href="/favicon.ico" />
+        <link rel="shortcut icon" href="/favicon.png" />
         <meta name="msapplication-TileColor" content="#2362C1" />
         <meta name="theme-color" content="#ffffff" />
 
diff --git a/src/pages/api/latest-nonce.ts b/src/pages/api/latest-nonce.ts
index dc393a2..3da1984 100644
--- a/src/pages/api/latest-nonce.ts
+++ b/src/pages/api/latest-nonce.ts
@@ -4,7 +4,7 @@ import NextCors from 'nextjs-cors';
 
 import { MultiProvider } from '@hyperlane-xyz/sdk';
 
-import { Environment } from '../../consts/environments';
+import { ENVIRONMENT_BUCKET_SEGMENT } from '../../consts/environments';
 import { getChainEnvironment, isPiChain } from '../../features/chains/utils';
 import { logger } from '../../utils/logger';
 import { fetchWithTimeout } from '../../utils/timeout';
@@ -47,9 +47,9 @@ async function fetchLatestNonce(multiProvider: MultiProvider, chainId: ChainId)
 // Partly copied from https://github.com/hyperlane-xyz/hyperlane-monorepo/blob/1fc65f3b7f31f86722204a9de08506f212720a52/typescript/infra/config/environments/mainnet/validators.ts#L12
 function getS3BucketUrl(multiProvider: MultiProvider, chainId: ChainId) {
   const chainName = multiProvider.getChainName(chainId);
-  const environment =
-    getChainEnvironment(multiProvider, chainId) === Environment.Mainnet ? 'mainnet2' : 'testnet3';
-  const bucketName = `hyperlane-${environment}-${chainName}-validator-0`;
+  const environment = getChainEnvironment(multiProvider, chainId);
+  const segment = ENVIRONMENT_BUCKET_SEGMENT[environment];
+  const bucketName = `hyperlane-${segment}-${chainName}-validator-0`;
   return `https://${bucketName}.s3.us-east-1.amazonaws.com/checkpoint_latest_index.json`;
 }
 
diff --git a/src/styles/global.css b/src/styles/global.css
index d516cb4..6e5655e 100755
--- a/src/styles/global.css
+++ b/src/styles/global.css
@@ -51,33 +51,16 @@ Text and shadows
   text-shadow: 0 0 #010101;
 }
 
-/*
+/* 
 Scrollbar Overrides
 ===================
 */
 
-html {
-  --scrollbarBG: rgba(255, 255, 255, 0);
-  --thumbBG: #dddddd;
-}
 body {
   scroll-behavior: smooth;
   scrollbar-width: thin;
-  scrollbar-color: var(--thumbBG) var(--scrollbarBG);
-}
-::-webkit-scrollbar {
-  width: 8px;
-  height: 8px;
-  background-color: var(--scrollbarBG);
-}
-::-webkit-scrollbar-track {
-  background-color: var(--scrollbarBG);
-}
-::-webkit-scrollbar-thumb {
-  background-color: var(--thumbBG);
-  border-radius: 6px;
-  border: 3px solid var(--scrollbarBG);
 }
+
 /* phones */
 @media only screen and (max-width: 767px) {
   ::-webkit-scrollbar {