diff --git a/stylesheets/_session_constants.scss b/stylesheets/_session_constants.scss
index e4c3d1fdf..c977852ee 100644
--- a/stylesheets/_session_constants.scss
+++ b/stylesheets/_session_constants.scss
@@ -27,7 +27,7 @@ $session-font-mono: 'SpaceMono';
   font-style: italic;
 }
 
-// Public Sans is an open replacement for 'SF Pro Text'
+// Public Sans is an open replacement for $session-font-default
 @font-face {
   font-family: $session-font-default;
   src: url('../fonts/PublicSans-Regular.woff') format('woff');
diff --git a/stylesheets/_session_conversation.scss b/stylesheets/_session_conversation.scss
index d403be638..911d89a9e 100644
--- a/stylesheets/_session_conversation.scss
+++ b/stylesheets/_session_conversation.scss
@@ -204,7 +204,7 @@ $composition-container-height: 60px;
     padding: 16px 0px;
 
     textarea {
-      font-family: 'SF Pro Text';
+      font-family: $session-font-default;
       min-height: $composition-container-height / 3;
       max-height: 2 * $composition-container-height;
       margin-right: $session-margin-md;
@@ -253,7 +253,7 @@ $composition-container-height: 60px;
       top: -2px;
 
       span {
-        font-family: 'SF Pro Text';
+        font-family: $session-font-default;
         padding-top: $session-margin-sm;
         background-color: $session-shade-4;
       }
@@ -367,7 +367,7 @@ $composition-container-height: 60px;
       align-items: center;
       width: 173px;
       font-weight: 300;
-      font-family: 'SF Pro Text';
+      font-family: $session-font-default;
 
       &.primary {
         cursor: default;
@@ -385,7 +385,7 @@ $composition-container-height: 60px;
   &--timer {
     display: inline-flex;
     align-items: center;
-    font-family: 'SF Pro Text';
+    font-family: $session-font-default;
     font-weight: bold;
     font-size: 14px;
 
diff --git a/stylesheets/_session_password.scss b/stylesheets/_session_password.scss
index 98d548277..72130a66c 100644
--- a/stylesheets/_session_password.scss
+++ b/stylesheets/_session_password.scss
@@ -32,7 +32,7 @@
     }
 
     &-container {
-      font-family: 'SF Pro Text';
+      font-family: $session-font-default;
       color: $session-color-white;
       display: inline-flex;
       flex-direction: column;
@@ -82,7 +82,7 @@
         text-align: center;
         font-size: 24px;
         letter-spacing: 5px;
-        font-family: 'SF Pro Text';
+        font-family: $session-font-default;
       }
     }
   }