diff --git a/fonts/PublicSans-Bold.woff b/fonts/PublicSans-Bold.woff
deleted file mode 100644
index a6ec97c04..000000000
Binary files a/fonts/PublicSans-Bold.woff and /dev/null differ
diff --git a/fonts/PublicSans-BoldItalic.woff b/fonts/PublicSans-BoldItalic.woff
deleted file mode 100644
index 1cfc35bd8..000000000
Binary files a/fonts/PublicSans-BoldItalic.woff and /dev/null differ
diff --git a/fonts/PublicSans-Italic.woff b/fonts/PublicSans-Italic.woff
deleted file mode 100644
index 5193fdceb..000000000
Binary files a/fonts/PublicSans-Italic.woff and /dev/null differ
diff --git a/fonts/PublicSans-Light.woff b/fonts/PublicSans-Light.woff
deleted file mode 100644
index 079c8d9a3..000000000
Binary files a/fonts/PublicSans-Light.woff and /dev/null differ
diff --git a/fonts/PublicSans-LightItalic.woff b/fonts/PublicSans-LightItalic.woff
deleted file mode 100644
index 6cca8467b..000000000
Binary files a/fonts/PublicSans-LightItalic.woff and /dev/null differ
diff --git a/fonts/PublicSans-Regular.woff b/fonts/PublicSans-Regular.woff
deleted file mode 100644
index fbe27e2cc..000000000
Binary files a/fonts/PublicSans-Regular.woff and /dev/null differ
diff --git a/fonts/Roboto-Bold.ttf b/fonts/Roboto-Bold.ttf
new file mode 100644
index 000000000..374245790
Binary files /dev/null and b/fonts/Roboto-Bold.ttf differ
diff --git a/fonts/Roboto-BoldItalic.ttf b/fonts/Roboto-BoldItalic.ttf
new file mode 100644
index 000000000..e85e7fb9e
Binary files /dev/null and b/fonts/Roboto-BoldItalic.ttf differ
diff --git a/fonts/Roboto-Italic.ttf b/fonts/Roboto-Italic.ttf
new file mode 100644
index 000000000..c9df607a4
Binary files /dev/null and b/fonts/Roboto-Italic.ttf differ
diff --git a/fonts/Roboto-Light.ttf b/fonts/Roboto-Light.ttf
new file mode 100644
index 000000000..0e977514f
Binary files /dev/null and b/fonts/Roboto-Light.ttf differ
diff --git a/fonts/Roboto-LightItalic.ttf b/fonts/Roboto-LightItalic.ttf
new file mode 100644
index 000000000..3ad14fa7c
Binary files /dev/null and b/fonts/Roboto-LightItalic.ttf differ
diff --git a/fonts/Roboto-Regular.ttf b/fonts/Roboto-Regular.ttf
new file mode 100644
index 000000000..3d6861b42
Binary files /dev/null and b/fonts/Roboto-Regular.ttf differ
diff --git a/stylesheets/_modules.scss b/stylesheets/_modules.scss
index 7b1a95861..a4a7de617 100644
--- a/stylesheets/_modules.scss
+++ b/stylesheets/_modules.scss
@@ -1247,7 +1247,7 @@
 }
 
 .module-conversation-list-item__message__text--has-unread {
-  font-weight: 300;
+  font-weight: 400;
   color: $color-gray-05;
 }
 
diff --git a/stylesheets/_session_constants.scss b/stylesheets/_session_constants.scss
index 1187dcf87..364edc36e 100644
--- a/stylesheets/_session_constants.scss
+++ b/stylesheets/_session_constants.scss
@@ -2,7 +2,7 @@
 // /////////////////// Fonts ////////////////////
 // //////////////////////////////////////////////
 
-$session-font-default: 'Public Sans';
+$session-font-default: 'Roboto';
 $session-font-accent: 'Loor';
 $session-font-mono: 'SpaceMono';
 
@@ -27,36 +27,36 @@ $session-font-mono: 'SpaceMono';
   font-style: italic;
 }
 
-// Public Sans is an open replacement for $session-font-default
+// Roboto is an open replacement for $session-font-default
 @font-face {
   font-family: $session-font-default;
-  src: url('../fonts/PublicSans-Regular.woff') format('woff');
+  src: url('../fonts/Roboto-Regular.ttf') format('truetype');
 }
 @font-face {
   font-family: $session-font-default;
-  src: url('../fonts/PublicSans-Italic.woff') format('woff');
+  src: url('../fonts/Roboto-Italic.ttf') format('truetype');
   font-style: italic;
 }
 @font-face {
   font-family: $session-font-default;
-  src: url('../fonts/PublicSans-Bold.woff') format('woff');
-  font-weight: bold;
+  src: url('../fonts/Roboto-Bold.ttf') format('truetype');
+  font-weight: 600;
 }
 @font-face {
   font-family: $session-font-default;
-  src: url('../fonts/PublicSans-BoldItalic.woff') format('woff');
-  font-weight: bold;
+  src: url('../fonts/Roboto-BoldItalic.ttf') format('truetype');
+  font-weight: 600;
   font-style: italic;
 }
 @font-face {
   font-family: $session-font-default;
-  src: url('../fonts/PublicSans-Light.woff') format('woff');
-  font-weight: lighter;
+  src: url('../fonts/Roboto-Light.ttf') format('truetype');
+  font-weight: 200;
 }
 @font-face {
   font-family: $session-font-default;
-  src: url('../fonts/PublicSans-LightItalic.woff') format('woff');
-  font-weight: lighter;
+  src: url('../fonts/Roboto-LightItalic.ttf') format('truetype');
+  font-weight: 200;
   font-style: italic;
 }
 
diff --git a/ts/state/ducks/SessionTheme.tsx b/ts/state/ducks/SessionTheme.tsx
index 7b43e06dc..f045df4ea 100644
--- a/ts/state/ducks/SessionTheme.tsx
+++ b/ts/state/ducks/SessionTheme.tsx
@@ -15,7 +15,7 @@ const borderAvatarColor = '#00000059';
 
 const common = {
   fonts: {
-    sessionFontDefault: 'Public Sans',
+    sessionFontDefault: 'Roboto',
     sessionFontAccent: 'Loor',
     sessionFontMono: 'SpaceMono',
     xs: '11px',