diff --git a/Client/src/Components/NavBar/index.css b/Client/src/Components/NavBar/index.css
index d412c0a20..71eeb73b7 100644
--- a/Client/src/Components/NavBar/index.css
+++ b/Client/src/Components/NavBar/index.css
@@ -30,3 +30,9 @@
   height: 16px;
   color: var(--env-var-color-25);
 }
+
+#bw-uptime-logo-dashboard {
+  height: 16px;
+  float: left;
+  margin-left: 15px;
+}
diff --git a/Client/src/Components/NavBar/index.jsx b/Client/src/Components/NavBar/index.jsx
index 524c0a179..f0aea882e 100644
--- a/Client/src/Components/NavBar/index.jsx
+++ b/Client/src/Components/NavBar/index.jsx
@@ -23,6 +23,8 @@ import UserSvg from "../../assets/icons/user.svg?react";
 import TeamSvg from "../../assets/icons/user-two.svg?react";
 import LogoutSvg from "../../assets/icons/logout.svg?react";
 
+import BWULogo from "../../assets/Images/bwl-logo.svg";
+
 const settings = ["Profile", "Password", "Team", "Logout"];
 const icons = {
   Profile: <UserSvg />,
@@ -103,22 +105,11 @@ function NavBar() {
     >
       <Container maxWidth="xxl" sx={{ width: "100%" }}>
         <Toolbar disableGutters>
-          <Typography
-            variant="h6"
-            noWrap
-            component="a"
-            href="#"
-            sx={{
-              mr: 2,
-              display: { xs: "none", md: "flex" },
-              fontWeight: theme.typography.fontWeightBold,
-              letterSpacing: theme.spacing(0.3),
-              color: "var(--env-var-color-11)",
-              textDecoration: "none",
-            }}
-          >
-            Peak Watch
-          </Typography>
+          <img
+            id="bw-uptime-logo-dashboard"
+            src={BWULogo}
+            alt="BlueWave Uptime Logo"
+          />
 
           <Box sx={{ flexGrow: 1, display: { xs: "flex", md: "none" } }}>
             <IconButton
diff --git a/Client/src/Pages/Login/index.css b/Client/src/Pages/Login/index.css
index 195b87001..0a915d8cd 100644
--- a/Client/src/Pages/Login/index.css
+++ b/Client/src/Pages/Login/index.css
@@ -18,7 +18,9 @@
 }
 
 .login-form-header-logo {
-  margin: 0 auto;
+  margin: 30px auto;
+  margin-bottom: 60px;
+  width: 353px;
 }
 
 .login-form-v-spacing {
diff --git a/Client/src/Pages/Login/index.jsx b/Client/src/Pages/Login/index.jsx
index a9fcde0d5..d91a0f688 100644
--- a/Client/src/Pages/Login/index.jsx
+++ b/Client/src/Pages/Login/index.jsx
@@ -3,7 +3,7 @@ import { useNavigate } from "react-router-dom";
 
 import "./index.css";
 import BackgroundPattern from "../../Components/BackgroundPattern/BackgroundPattern";
-import Logomark from "../../assets/Images/Logomark.png";
+import Logomark from "../../assets/Images/bwl-logo.svg";
 import EmailTextField from "../../Components/TextFields/Email/EmailTextField";
 import CheckBox from "../../Components/Checkbox/Checkbox";
 import Button from "../../Components/Button";
diff --git a/Client/src/assets/Images/bwl-logo.svg b/Client/src/assets/Images/bwl-logo.svg
new file mode 100644
index 000000000..4a4ac9486
--- /dev/null
+++ b/Client/src/assets/Images/bwl-logo.svg
@@ -0,0 +1,4 @@
+<svg width="160" height="21" viewBox="0 0 160 21" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0.76 1.84H5.08C5.66667 1.84 6.24 1.9 6.8 2.02C7.36 2.14 7.86 2.34 8.3 2.62C8.74 2.88667 9.09333 3.24 9.36 3.68C9.64 4.12 9.78 4.66667 9.78 5.32C9.78 6.14667 9.55333 6.83333 9.1 7.38C8.66 7.91333 8.06 8.29333 7.3 8.52V8.56C7.75333 8.6 8.17333 8.72 8.56 8.92C8.96 9.10667 9.3 9.35333 9.58 9.66C9.87333 9.96667 10.1 10.3267 10.26 10.74C10.42 11.14 10.5 11.5733 10.5 12.04C10.5 12.8267 10.3333 13.4733 10 13.98C9.68 14.4867 9.25333 14.8933 8.72 15.2C8.2 15.4933 7.60667 15.7 6.94 15.82C6.28667 15.94 5.63333 16 4.98 16H0.76V1.84ZM2.44 7.84H4.76C5.16 7.84 5.54667 7.81333 5.92 7.76C6.30667 7.70667 6.65333 7.6 6.96 7.44C7.26667 7.26667 7.51333 7.03333 7.7 6.74C7.88667 6.43333 7.98 6.03333 7.98 5.54C7.98 5.1 7.89333 4.74667 7.72 4.48C7.54667 4.2 7.31333 3.98 7.02 3.82C6.74 3.66 6.41333 3.55333 6.04 3.5C5.68 3.43333 5.31333 3.4 4.94 3.4H2.44V7.84ZM2.44 14.44H5.28C5.69333 14.44 6.1 14.4 6.5 14.32C6.91333 14.2267 7.28 14.0867 7.6 13.9C7.93333 13.7 8.2 13.4467 8.4 13.14C8.6 12.82 8.7 12.4333 8.7 11.98C8.7 11.4867 8.6 11.0733 8.4 10.74C8.21333 10.4067 7.96 10.14 7.64 9.94C7.33333 9.74 6.97333 9.6 6.56 9.52C6.16 9.44 5.74667 9.4 5.32 9.4H2.44V14.44ZM13.2177 0.879999H14.7777V16H13.2177V0.879999ZM26.0423 13.78C26.0423 14.2067 26.0557 14.6067 26.0823 14.98C26.109 15.3533 26.1223 15.6933 26.1223 16H24.6423C24.6423 15.7467 24.6357 15.4933 24.6223 15.24C24.609 14.9867 24.6023 14.7267 24.6023 14.46H24.5623C24.4557 14.6867 24.3023 14.9067 24.1023 15.12C23.9157 15.3333 23.689 15.5267 23.4223 15.7C23.1557 15.86 22.8557 15.9867 22.5223 16.08C22.189 16.1867 21.829 16.24 21.4423 16.24C20.829 16.24 20.2957 16.1467 19.8423 15.96C19.4023 15.7733 19.0357 15.5133 18.7423 15.18C18.449 14.8467 18.229 14.4467 18.0823 13.98C17.949 13.5 17.8823 12.98 17.8823 12.42V6.64H19.4423V12.26C19.4423 13.0467 19.6157 13.6667 19.9623 14.12C20.309 14.5733 20.849 14.8 21.5823 14.8C22.089 14.8 22.5223 14.7133 22.8823 14.54C23.2557 14.3667 23.5557 14.12 23.7823 13.8C24.0223 13.48 24.1957 13.1 24.3023 12.66C24.4223 12.22 24.4823 11.7333 24.4823 11.2V6.64H26.0423V13.78ZM37.3556 14.3C36.7956 15.02 36.1823 15.5267 35.5156 15.82C34.849 16.1 34.0756 16.24 33.1956 16.24C32.4623 16.24 31.8023 16.1133 31.2156 15.86C30.629 15.5933 30.129 15.24 29.7156 14.8C29.3156 14.36 29.0023 13.84 28.7756 13.24C28.5623 12.64 28.4556 12 28.4556 11.32C28.4556 10.6 28.5756 9.94 28.8156 9.34C29.0556 8.72667 29.389 8.20667 29.8156 7.78C30.2423 7.34 30.749 7 31.3356 6.76C31.9223 6.52 32.5623 6.4 33.2556 6.4C33.909 6.4 34.509 6.51333 35.0556 6.74C35.6023 6.95333 36.069 7.27333 36.4556 7.7C36.8556 8.11333 37.1623 8.62667 37.3756 9.24C37.589 9.84 37.6956 10.5267 37.6956 11.3V11.8H30.1356C30.1623 12.2 30.2556 12.5867 30.4156 12.96C30.589 13.32 30.809 13.64 31.0756 13.92C31.3423 14.1867 31.6556 14.4 32.0156 14.56C32.3756 14.72 32.769 14.8 33.1956 14.8C33.8756 14.8 34.449 14.68 34.9156 14.44C35.3823 14.2 35.8023 13.8467 36.1756 13.38L37.3556 14.3ZM36.0156 10.48C35.989 9.68 35.729 9.04 35.2356 8.56C34.7423 8.08 34.0623 7.84 33.1956 7.84C32.329 7.84 31.629 8.08 31.0956 8.56C30.5623 9.04 30.2423 9.68 30.1356 10.48H36.0156ZM38.7489 1.84H40.6089L43.8289 13.6H43.8689L47.3489 1.84H49.2289L52.6889 13.6H52.7289L56.0089 1.84H57.7689L53.6089 16H51.7889L48.2889 4H48.2489L44.7289 16H42.8889L38.7489 1.84ZM58.5045 7.84C58.9845 7.34667 59.5512 6.98667 60.2045 6.76C60.8712 6.52 61.5445 6.4 62.2245 6.4C63.6112 6.4 64.6112 6.72667 65.2245 7.38C65.8379 8.03333 66.1445 9.02667 66.1445 10.36V14.38C66.1445 14.6467 66.1579 14.9267 66.1845 15.22C66.2112 15.5 66.2445 15.76 66.2845 16H64.7845C64.7312 15.7867 64.6979 15.5533 64.6845 15.3C64.6845 15.0333 64.6845 14.8 64.6845 14.6H64.6445C64.3379 15.08 63.9245 15.4733 63.4045 15.78C62.8979 16.0867 62.2845 16.24 61.5645 16.24C61.0845 16.24 60.6312 16.18 60.2045 16.06C59.7912 15.94 59.4245 15.7667 59.1045 15.54C58.7979 15.3 58.5512 15.0067 58.3645 14.66C58.1779 14.3133 58.0845 13.9133 58.0845 13.46C58.0845 12.6867 58.2845 12.08 58.6845 11.64C59.0845 11.2 59.5779 10.8733 60.1645 10.66C60.7645 10.4467 61.4045 10.3133 62.0845 10.26C62.7779 10.2067 63.4112 10.18 63.9845 10.18H64.5845V9.9C64.5845 9.22 64.3779 8.70667 63.9645 8.36C63.5645 8.01333 62.9979 7.84 62.2645 7.84C61.7579 7.84 61.2579 7.92667 60.7645 8.1C60.2845 8.26 59.8579 8.51333 59.4845 8.86L58.5045 7.84ZM63.0245 11.5C62.0245 11.5 61.2312 11.64 60.6445 11.92C60.0579 12.2 59.7645 12.66 59.7645 13.3C59.7645 13.8867 59.9579 14.3067 60.3445 14.56C60.7445 14.8 61.2379 14.92 61.8245 14.92C62.2779 14.92 62.6712 14.8467 63.0045 14.7C63.3512 14.54 63.6379 14.3333 63.8645 14.08C64.0912 13.8267 64.2645 13.5333 64.3845 13.2C64.5045 12.8533 64.5712 12.4867 64.5845 12.1V11.5H63.0245ZM73.2556 16H71.5356L67.7156 6.64H69.5356L72.4556 13.98H72.4956L75.2756 6.64H76.9556L73.2556 16ZM87.0041 14.3C86.4441 15.02 85.8307 15.5267 85.1641 15.82C84.4974 16.1 83.7241 16.24 82.8441 16.24C82.1107 16.24 81.4507 16.1133 80.8641 15.86C80.2774 15.5933 79.7774 15.24 79.3641 14.8C78.9641 14.36 78.6507 13.84 78.4241 13.24C78.2107 12.64 78.1041 12 78.1041 11.32C78.1041 10.6 78.2241 9.94 78.4641 9.34C78.7041 8.72667 79.0374 8.20667 79.4641 7.78C79.8907 7.34 80.3974 7 80.9841 6.76C81.5707 6.52 82.2107 6.4 82.9041 6.4C83.5574 6.4 84.1574 6.51333 84.7041 6.74C85.2507 6.95333 85.7174 7.27333 86.1041 7.7C86.5041 8.11333 86.8107 8.62667 87.0241 9.24C87.2374 9.84 87.3441 10.5267 87.3441 11.3V11.8H79.7841C79.8107 12.2 79.9041 12.5867 80.0641 12.96C80.2374 13.32 80.4574 13.64 80.7241 13.92C80.9907 14.1867 81.3041 14.4 81.6641 14.56C82.0241 14.72 82.4174 14.8 82.8441 14.8C83.5241 14.8 84.0974 14.68 84.5641 14.44C85.0307 14.2 85.4507 13.8467 85.8241 13.38L87.0041 14.3ZM85.6641 10.48C85.6374 9.68 85.3774 9.04 84.8841 8.56C84.3907 8.08 83.7107 7.84 82.8441 7.84C81.9774 7.84 81.2774 8.08 80.7441 8.56C80.2107 9.04 79.8907 9.68 79.7841 10.48H85.6641Z" fill="#344054"/>
+<path d="M106.224 10.6C106.224 11.3733 106.124 12.1067 105.924 12.8C105.737 13.4933 105.43 14.1067 105.004 14.64C104.59 15.16 104.044 15.58 103.364 15.9C102.684 16.2067 101.857 16.36 100.884 16.36C99.9104 16.36 99.0838 16.2067 98.4038 15.9C97.7238 15.58 97.1704 15.16 96.7438 14.64C96.3304 14.1067 96.0238 13.4933 95.8238 12.8C95.6371 12.1067 95.5438 11.3733 95.5438 10.6V1.84H97.2238V10.36C97.2238 10.9333 97.2838 11.4867 97.4038 12.02C97.5238 12.5533 97.7238 13.0267 98.0038 13.44C98.2838 13.8533 98.6571 14.1867 99.1237 14.44C99.5904 14.68 100.177 14.8 100.884 14.8C101.59 14.8 102.177 14.68 102.644 14.44C103.11 14.1867 103.484 13.8533 103.764 13.44C104.044 13.0267 104.244 12.5533 104.364 12.02C104.484 11.4867 104.544 10.9333 104.544 10.36V1.84H106.224V10.6ZM109.326 6.64H110.886V8H110.926C111.352 7.49333 111.846 7.1 112.406 6.82C112.979 6.54 113.606 6.4 114.286 6.4C115.019 6.4 115.686 6.52667 116.286 6.78C116.899 7.02 117.419 7.36 117.846 7.8C118.272 8.24 118.606 8.76 118.846 9.36C119.086 9.96 119.206 10.6133 119.206 11.32C119.206 12.0267 119.086 12.68 118.846 13.28C118.606 13.88 118.272 14.4 117.846 14.84C117.432 15.28 116.939 15.6267 116.366 15.88C115.792 16.12 115.179 16.24 114.526 16.24C113.686 16.24 112.946 16.06 112.306 15.7C111.679 15.3267 111.219 14.8733 110.926 14.34H110.886V20.56H109.326V6.64ZM110.886 11.32C110.886 11.8133 110.959 12.2733 111.106 12.7C111.266 13.1133 111.492 13.48 111.786 13.8C112.079 14.1067 112.426 14.3533 112.826 14.54C113.239 14.7133 113.699 14.8 114.206 14.8C114.712 14.8 115.166 14.7133 115.566 14.54C115.979 14.3533 116.332 14.1067 116.626 13.8C116.919 13.48 117.139 13.1133 117.286 12.7C117.446 12.2733 117.526 11.8133 117.526 11.32C117.526 10.8267 117.446 10.3733 117.286 9.96C117.139 9.53333 116.919 9.16667 116.626 8.86C116.332 8.54 115.979 8.29333 115.566 8.12C115.166 7.93333 114.712 7.84 114.206 7.84C113.699 7.84 113.239 7.93333 112.826 8.12C112.426 8.29333 112.079 8.54 111.786 8.86C111.492 9.16667 111.266 9.53333 111.106 9.96C110.959 10.3733 110.886 10.8267 110.886 11.32ZM126.752 7.96H123.992V12.64C123.992 12.9467 123.999 13.2333 124.012 13.5C124.026 13.7533 124.079 13.98 124.172 14.18C124.266 14.3667 124.406 14.52 124.592 14.64C124.779 14.7467 125.046 14.8 125.392 14.8C125.619 14.8 125.852 14.7733 126.092 14.72C126.332 14.6667 126.559 14.5867 126.772 14.48L126.832 15.9C126.566 16.02 126.266 16.1067 125.932 16.16C125.612 16.2133 125.306 16.24 125.012 16.24C124.452 16.24 124.006 16.1667 123.672 16.02C123.339 15.8733 123.079 15.6667 122.892 15.4C122.706 15.1333 122.579 14.8067 122.512 14.42C122.459 14.02 122.432 13.58 122.432 13.1V7.96H120.392V6.64H122.432V3.98H123.992V6.64H126.752V7.96ZM128.823 6.64H130.383V16H128.823V6.64ZM128.463 2.98C128.463 2.67333 128.57 2.40667 128.783 2.18C129.01 1.95333 129.283 1.84 129.603 1.84C129.923 1.84 130.19 1.95333 130.403 2.18C130.63 2.40667 130.743 2.67333 130.743 2.98C130.743 3.31333 130.636 3.58667 130.423 3.8C130.21 4.01333 129.936 4.12 129.603 4.12C129.27 4.12 128.996 4.01333 128.783 3.8C128.57 3.58667 128.463 3.31333 128.463 2.98ZM133.488 8.86C133.488 8.43333 133.474 8.03333 133.448 7.66C133.421 7.28667 133.408 6.94667 133.408 6.64H134.888C134.888 6.89333 134.894 7.14667 134.908 7.4C134.921 7.65333 134.928 7.91333 134.928 8.18H134.968C135.074 7.95333 135.221 7.73333 135.408 7.52C135.608 7.30667 135.841 7.12 136.108 6.96C136.374 6.78667 136.674 6.65333 137.008 6.56C137.341 6.45333 137.701 6.4 138.088 6.4C138.594 6.4 139.014 6.46667 139.348 6.6C139.694 6.72 139.981 6.87333 140.208 7.06C140.434 7.23333 140.608 7.42667 140.728 7.64C140.861 7.84 140.968 8.02 141.048 8.18C141.394 7.62 141.794 7.18667 142.248 6.88C142.701 6.56 143.288 6.4 144.008 6.4C144.674 6.4 145.234 6.49333 145.688 6.68C146.141 6.85333 146.508 7.11333 146.788 7.46C147.068 7.79333 147.268 8.20667 147.388 8.7C147.508 9.18 147.568 9.72 147.568 10.32V16H146.008V10.4C146.008 10.08 145.974 9.76667 145.908 9.46C145.841 9.15333 145.721 8.88 145.548 8.64C145.374 8.4 145.141 8.20667 144.848 8.06C144.554 7.91333 144.181 7.84 143.728 7.84C143.394 7.84 143.081 7.90667 142.788 8.04C142.494 8.17333 142.234 8.36 142.008 8.6C141.794 8.84 141.621 9.13333 141.488 9.48C141.368 9.81333 141.308 10.1867 141.308 10.6V16H139.748V10.7C139.748 9.66 139.608 8.92667 139.328 8.5C139.048 8.06 138.588 7.84 137.948 7.84C137.441 7.84 137.001 7.92667 136.628 8.1C136.268 8.27333 135.968 8.52 135.728 8.84C135.501 9.16 135.328 9.54 135.208 9.98C135.101 10.42 135.048 10.9067 135.048 11.44V16H133.488V8.86ZM158.879 14.3C158.319 15.02 157.706 15.5267 157.039 15.82C156.372 16.1 155.599 16.24 154.719 16.24C153.986 16.24 153.326 16.1133 152.739 15.86C152.152 15.5933 151.652 15.24 151.239 14.8C150.839 14.36 150.526 13.84 150.299 13.24C150.086 12.64 149.979 12 149.979 11.32C149.979 10.6 150.099 9.94 150.339 9.34C150.579 8.72667 150.912 8.20667 151.339 7.78C151.766 7.34 152.272 7 152.859 6.76C153.446 6.52 154.086 6.4 154.779 6.4C155.432 6.4 156.032 6.51333 156.579 6.74C157.126 6.95333 157.592 7.27333 157.979 7.7C158.379 8.11333 158.686 8.62667 158.899 9.24C159.112 9.84 159.219 10.5267 159.219 11.3V11.8H151.659C151.686 12.2 151.779 12.5867 151.939 12.96C152.112 13.32 152.332 13.64 152.599 13.92C152.866 14.1867 153.179 14.4 153.539 14.56C153.899 14.72 154.292 14.8 154.719 14.8C155.399 14.8 155.972 14.68 156.439 14.44C156.906 14.2 157.326 13.8467 157.699 13.38L158.879 14.3ZM157.539 10.48C157.512 9.68 157.252 9.04 156.759 8.56C156.266 8.08 155.586 7.84 154.719 7.84C153.852 7.84 153.152 8.08 152.619 8.56C152.086 9.04 151.766 9.68 151.659 10.48H157.539Z" fill="#1570EF"/>
+</svg>