diff --git a/install_files/ansible-base/group_vars/development.yml b/install_files/ansible-base/group_vars/development.yml
index 2362ce5b03..cb6ea530b0 100644
--- a/install_files/ansible-base/group_vars/development.yml
+++ b/install_files/ansible-base/group_vars/development.yml
@@ -23,7 +23,7 @@ securedrop_header_image: ""
 securedrop_app_gpg_public_key: "test_journalist_key.pub"
 securedrop_app_gpg_fingerprint: "65A1B5FF195B56353CC63DFFCC40EF1228271441"
 # Custom text that will appear on the source interface
-custom_notification_text: "This is a SecureDrop Development VM for testing ONLY"
+custom_notification_text: "This is an insecure SecureDrop Development server for testing ONLY. Do NOT submit documents here."
 
 ### Used by the mon role ###
 # The OSSEC alert GPG public key has to be in the install_files/ansible-base/ or
diff --git a/securedrop/journalist_templates/account_edit_hotp_secret.html b/securedrop/journalist_templates/account_edit_hotp_secret.html
index 95434315c4..51daa8a1d2 100644
--- a/securedrop/journalist_templates/account_edit_hotp_secret.html
+++ b/securedrop/journalist_templates/account_edit_hotp_secret.html
@@ -6,6 +6,6 @@
     <label for="otp_secret">Change Secret</label>
     <input name="otp_secret" type="text" placeholder="HOTP Secret"><br />
   </p>
-  <button type="submit">Continue</button>
+  <button class="sd-button" type="submit">CONTINUE</button>
 </form>
 {% endblock %}
diff --git a/securedrop/journalist_templates/account_new_two_factor.html b/securedrop/journalist_templates/account_new_two_factor.html
index b9813ca845..0e8ff0b82c 100644
--- a/securedrop/journalist_templates/account_new_two_factor.html
+++ b/securedrop/journalist_templates/account_new_two_factor.html
@@ -21,6 +21,6 @@ <h1>Enable Yubikey (OATH-HOTP)</h1>
   <input name="csrf_token" type="hidden" value="{{ csrf_token() }}"/>
   <label for="token">Verification code</label>
   <input name="token" id="token" type="text" placeholder="123456" />
-  <button type="submit">Submit</button>
+  <button type="submit" class="sd-button">SUBMIT</button>
 </form>
 {% endblock %}
diff --git a/securedrop/journalist_templates/admin.html b/securedrop/journalist_templates/admin.html
index 00414c8e58..cd51a64939 100644
--- a/securedrop/journalist_templates/admin.html
+++ b/securedrop/journalist_templates/admin.html
@@ -1,9 +1,9 @@
 {% extends "base.html" %}
 {% block body %}
-<h2>Admin Interface</h2>
+<h1>Admin Interface</h1>
 
 <form action="{{ url_for('admin_add_user') }}">
-  <button type="submit" class="btn" id="add-user"><i class="fa fa-plus"></i> Add user</button>
+  <button class="sd-button" type="submit" class="btn" id="add-user">ADD USER</button>
 </form>
 
 <hr class="no-line" />
diff --git a/securedrop/journalist_templates/admin_add_user.html b/securedrop/journalist_templates/admin_add_user.html
index 73fd15b3b3..90905c3023 100644
--- a/securedrop/journalist_templates/admin_add_user.html
+++ b/securedrop/journalist_templates/admin_add_user.html
@@ -18,6 +18,6 @@
     <label for="is_hotp">I'm using a Yubikey </label>
     <input name="otp_secret" type="text" placeholder="HOTP Secret" size="60"><br />
   </p>
-  <button type="submit">Add user</button>
+  <button type="submit" class="sd-button">ADD USER</button>
 </form>
 {% endblock %}
diff --git a/securedrop/journalist_templates/admin_edit_hotp_secret.html b/securedrop/journalist_templates/admin_edit_hotp_secret.html
index 8839d0f312..4a25771673 100644
--- a/securedrop/journalist_templates/admin_edit_hotp_secret.html
+++ b/securedrop/journalist_templates/admin_edit_hotp_secret.html
@@ -7,6 +7,6 @@
     <label for="otp_secret">Change Secret</label>
     <input name="otp_secret" type="text" placeholder="HOTP Secret"><br />
   </p>
-  <button type="submit">Continue</button>
+  <button class="sd-button" type="submit">CONTINUE</button>
 </form>
 {% endblock %}
diff --git a/securedrop/journalist_templates/admin_edit_user.html b/securedrop/journalist_templates/admin_edit_user.html
index 6871307d77..8155971fb6 100644
--- a/securedrop/journalist_templates/admin_edit_user.html
+++ b/securedrop/journalist_templates/admin_edit_user.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% block body %}
-<h2>Edit user "{{ user.username }}"</h2>
+<h1>Edit user "{{ user.username }}"</h1>
 <p><a href="/admin">&laquo; Back to admin interface</a></p>
 
 <form method="post">
@@ -22,7 +22,7 @@ <h2>Edit user "{{ user.username }}"</h2>
     <input name="is_admin" id="is_admin" type="checkbox" {% if user.is_admin %}checked{% endif %} />
     <label for="is_admin">Is Administrator</label>
   </p>
-  <button type="submit" id="update-user">Update user</button>
+  <button class="sd-button" type="submit" id="update-user">UPDATE USER</button>
 </form>
 
 <hr class="no-line">
@@ -32,12 +32,12 @@ <h2>Reset Two Factor Authentication</h2>
 <form method="post" action="{{ url_for('admin_reset_two_factor_totp') }}" id="reset-two-factor-totp">
   <input name="csrf_token" type="hidden" value="{{ csrf_token() }}"/>
   <input name="uid" type="hidden" value="{{ user.id }}"/>
-  <button type="submit" class="center"><i class="fa fa-refresh"></i> Reset two factor authentication (Google Authenticator)</button>
+  <button type="submit" class="pull-right">RESET TWO FACTOR AUTHENTICATION (GOOGLE AUTHENTICATOR)</button>
 </form>
 <br />
 <form method="post" action="{{ url_for('admin_reset_two_factor_hotp') }}" id="reset-two-factor-hotp">
   <input name="csrf_token" type="hidden" value="{{ csrf_token() }}"/>
   <input name="uid" type="hidden" value="{{ user.id }}"/>
-  <button type="submit" class="center"><i class="fa fa-refresh"></i> Reset two factor authentication (HOTP Yubikey)</button>
+  <button class="sd-button" type="submit" class="pull-right">RESET TWO FACTOR AUTHENTICATION (HOTP YUBIKEY)</button>
 </form>
 {% endblock %}
diff --git a/securedrop/journalist_templates/admin_new_user_two_factor.html b/securedrop/journalist_templates/admin_new_user_two_factor.html
index 329eff4308..5da6c78aa5 100644
--- a/securedrop/journalist_templates/admin_new_user_two_factor.html
+++ b/securedrop/journalist_templates/admin_new_user_two_factor.html
@@ -20,6 +20,6 @@ <h1>Enable Yubikey (OATH-HOTP)</h1>
   <input name="csrf_token" type="hidden" value="{{ csrf_token() }}"/>
   <label for="token">Verification code</label>
   <input name="token" id="token" type="text" placeholder="123456" />
-  <button type="submit">Submit</button>
+  <button class "sd-button" type="submit">SUBMIT</button>
 </form>
 {% endblock %}
diff --git a/securedrop/journalist_templates/col.html b/securedrop/journalist_templates/col.html
index 45de6689fe..0950b82a83 100644
--- a/securedrop/journalist_templates/col.html
+++ b/securedrop/journalist_templates/col.html
@@ -10,10 +10,10 @@
       <a href="/">All Sources</a>
       <i class="fa fa-chevron-right"></i>
       <strong>{{ source.journalist_designation }}</strong>
-      <a href="#change-codename-{{ source.journalist_designation }}" title="Generate a new random codename for this source. We recommend doing this if the first random codename is difficult to say or remember. You can generate new random codenames as many times as you like." class="plain" id="regenerate-codename-btn"><i class="fa fa-refresh"></i> <span id="regenerate-codename-btn-label">Change codename</span></a>
+      <a href="#change-codename-{{ source.journalist_designation }}" title="Generate a new random codename for this source. We recommend doing this if the first random codename is difficult to say or remember. You can generate new random codenames as many times as you like." class="plain" id="regenerate-codename-btn"><span id="regenerate-codename-btn-label">Change codename</span></a>
       <div id="change-codename-{{ source.journalist_designation }}" class="confirm-prompt">Are you sure you want to generate a new codename?
         <a href="#regenerate-code">Cancel</a>
-        <button type="submit">Confirm</button>
+        <button class="sd-button" type="submit">CONFIRM</button>
       </div>
     </p>
   </form>
@@ -23,8 +23,8 @@
     <form action="/bulk" method="post">
       <div class="document-actions">
         <div id='select-container'></div>
-        <button type="submit" name="action" value="download"><i class="fa fa-download"></i> Download</button>
-        <button type="submit" name="action" value="confirm_delete" class="danger" id="delete_selected"><i class="fa fa-trash-o"></i> Delete</button>
+        <button class="sd-button" type="submit" name="action" value="download"></i> DOWNLOAD</button>
+        <button class="sd-button" type="submit" name="action" value="confirm_delete" class="danger" id="delete_selected">DELETE</button>
       </div>
       <ul id="submissions" class="plain submissions">
         {% for doc in source.collection %}
@@ -76,7 +76,7 @@ <h3><i class="fa fa-reply"></i> Reply</h3>
       <input type="hidden" name="sid" value="{{ sid }}"/>
       <textarea name="msg" cols="72" rows="10"></textarea>
       <hr class="no-line" />
-      <button id="reply-button" class="button-custom" type="submit">Submit</button>
+      <button id="reply-button" class="sd-button" type="submit">SUBMIT</button>
     </form>
   {% elif source.flagged %}
     <p class="notification">You've flagged this source for reply.</p>
@@ -86,7 +86,7 @@ <h3><i class="fa fa-reply"></i> Reply</h3>
     <form action="/flag" method="post">
       <input type="hidden" name="sid" value="{{ sid }}"/>
       <input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
-      <button id="flag-button" class="button-custom" type="submit"><i class="fa fa-flag"></i> Flag this source for reply</button>
+      <button id="flag-button" class="sd-button" type="submit">FLAG THIS SOURCE FOR REPLY</button>
     </form>
   {% endif %}
   <hr class="no-line" />
@@ -97,7 +97,7 @@ <h3><i class="fa fa-reply"></i> Reply</h3>
     <input name="csrf_token" type="hidden" value="{{ csrf_token() }}"/>
     <input type="hidden" name="sid" value="{{ sid }}"/>
     <input type="hidden" name="col_name" value="{{ source.journalist_designation }}"/>
-    <button type="submit" class="danger"><i class="fa fa-trash-o"></i> Delete Collection</button>
+    <button type="submit" class="sd-button danger">DELETE COLLECTION</button>
   </form>
 
 </div>
diff --git a/securedrop/journalist_templates/delete.html b/securedrop/journalist_templates/delete.html
index 4db1703e04..3131f90e10 100644
--- a/securedrop/journalist_templates/delete.html
+++ b/securedrop/journalist_templates/delete.html
@@ -17,7 +17,7 @@
   <input name="csrf_token" type="hidden" value="{{ csrf_token() }}"/>
   <input type="hidden" name="sid" value="{{ sid }}" autocomplete="off"/>
   <input type="hidden" name="confirm_delete" value="true" />
-  <p><button type="submit" name="action" value="delete"><i class="fa fa-trash-o"></i> Permanently delete files</button></p>
+  <p><button class="sd-button" type="submit" name="action" value="delete">PERMANENTLY DELETE FILES</button></p>
 </form>
 
 <p><a href="/col/{{ sid }}">Return to the list of documents for {{ source.journalist_designation }}...</a></p>
diff --git a/securedrop/journalist_templates/edit_account.html b/securedrop/journalist_templates/edit_account.html
index d52f249115..79f2157f7f 100644
--- a/securedrop/journalist_templates/edit_account.html
+++ b/securedrop/journalist_templates/edit_account.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% block body %}
-<h2>Edit your account</h2>
+<h1>Edit your account</h1>
 
 <form method="post">
   <input name="csrf_token" type="hidden" value="{{ csrf_token() }}"/>
@@ -12,7 +12,7 @@ <h2>Edit your account</h2>
     <label for="password_again">Change password (confirm)</label>
     <input name="password_again" id="password_again" type="password" />
   </p>
-  <button type="submit" id="update">Update</button>
+  <button class="sd-button" type="submit" id="update">UPDATE</button>
 </form>
 
 <hr class="no-line">
@@ -21,11 +21,11 @@ <h2>Reset Two Factor Authentication</h2>
 <p>If your two factor authentication credentials have been lost or compromised, or you got a new device, you can reset your credentials here. <em>If you do this, make sure you are ready to set up your new device, otherwise you will be locked out of your account.</em></p>
 <form method="post" action="{{ url_for('account_reset_two_factor_totp') }}" id="reset-two-factor-totp">
   <input name="csrf_token" type="hidden" value="{{ csrf_token() }}"/>
-  <button type="submit" class="center"><i class="fa fa-refresh"></i> Reset two factor authentication (Google Authenticator)</button>
+  <button class="sd-button" type="submit" class="pull-right">RESET TWO FACTOR AUTHENTICATION (GOOGLE AUTHENTICATOR)</button>
 </form>
 <br />
 <form method="post" action="{{ url_for('account_reset_two_factor_hotp') }}" id="reset-two-factor-hotp">
   <input name="csrf_token" type="hidden" value="{{ csrf_token() }}"/>
-  <button type="submit" class="center"><i class="fa fa-refresh"></i> Reset two factor authentication (HOTP Yubikey)</button>
+  <button class="sd-button" type="submit" class="pull-right">RESET TWO FACTOR AUTHENTICATION (HOTP YUBIKEY)</button>
 </form>
 {% endblock %}
diff --git a/securedrop/journalist_templates/index.html b/securedrop/journalist_templates/index.html
index 5489c46458..0c6a3beb98 100644
--- a/securedrop/journalist_templates/index.html
+++ b/securedrop/journalist_templates/index.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {% block body %}
 <div id="content" class="journalist-view-all">
-  <h2><span class="headline">Sources</span></h2>
+  <h1><span class="headline">Sources</span></h1>
   {% if unstarred or starred %}
     <div id='filter-container'></div>
     <form id="process_collections" action="/col/process" method="post">
diff --git a/securedrop/journalist_templates/login.html b/securedrop/journalist_templates/login.html
index cf595aed34..4765676588 100644
--- a/securedrop/journalist_templates/login.html
+++ b/securedrop/journalist_templates/login.html
@@ -1,14 +1,14 @@
 {% extends "base.html" %}
 {% block body %}
 
-<h2>Login to access the journalist interface</h2>
+<h1>Login to access the journalist interface</h1>
 
 <form method="post" action="/login" autocomplete="off">
   <input name="csrf_token" type="hidden" value="{{ csrf_token() }}">
   <p class="center"><input type="text" name="username" autocomplete="off" placeholder="Username" autofocus></p>
   <p class="center"><input type="password" name="password" placeholder="Password"></p>
   <p class="center"><input name="token" id="token" type="text" placeholder="Two-factor Code"></p>
-  <p class="center"><button type="submit">Log in <i class="fa fa-arrow-circle-o-right"></i></button></p>
+  <p class="pull-right"><button class="sd-button" type="submit">LOG IN</i></button></p>
 </form>
 
 {% endblock %}
diff --git a/securedrop/sass/_base.sass b/securedrop/sass/_base.sass
index 04480c0a96..b7a2aa7ee0 100644
--- a/securedrop/sass/_base.sass
+++ b/securedrop/sass/_base.sass
@@ -20,14 +20,24 @@
 
   h1, h2, h3
     font-weight: bold
-    text-align: center
+
+  h1, h2
+    color: #7985aa
 
   h1
+    text-align: left
     font-size: 30px
 
   h2
     font-size: 25px
 
+    &.welcome-text
+      color: inherit
+      text-align: center
+
+  h3
+    text-align: center
+
   .content
     position: relative
     margin: 15px auto
@@ -52,6 +62,10 @@
   a.text-link
     color: $color_purple_medium
 
+  .sd-button
+    font-weight: normal
+    letter-spacing: 0.15em
+
   .select
     border: 1px #C4C2C2 solid
     padding: 3px 10px
@@ -226,14 +240,6 @@
       .file-options
         padding-top: 8px
 
-      .upload-icon
-        display: inline-block
-        width: 100%
-        text-align: center
-        font-size: 52pt
-        color: rgba(0, 0, 0, 0.5)
-        margin-bottom: 8px
-
       input[type="file"]
         background-color: rgba(0, 0, 0, 0.05)
         padding: 10px
@@ -281,32 +287,47 @@
     display: block
     margin: 0 auto
 
-  .flash
+  $color_error_border: #F68E8E
+  $color_error_background: #FCE3E3
+
+  aside, .flash, .banner-warning
+    border-radius: 10px
+
+    i
+      font-size: 18pt
+
+  aside
+    background-color: #fffbe6
+    color: #82572d
+
+  aside, .flash
     padding: 10px
     margin: 10px
     text-align: left
     font-size: medium
 
-  .notification
-    border: 1px solid #8ed9f6
-    background-color: #e3f7fc
-    border-radius: 10px
-    padding: 9px
-    font-size: medium
-    font-weight: normal
+    &.notification
+      border: 1px solid #8ed9f6
+      background-color: #e3f7fc
+      font-size: medium
+      font-weight: normal
 
-    i
-      color: #4f7685
-      font-size: 18pt
+      i
+        color: #4f7685
 
-  .error, .banner-warning
-    border: 1px solid #F68E8E
-    background-color: #FCE3E3
-    border-radius: 10px
+    &.error
+      border: 1px solid $color_error_border
+      background-color: $color_error_background
+
+      i
+        color: #D62727
 
-  .error i, .banner-warning i
-    color: #D62727
-    font-size: 18pt
+  .banner-warning
+    border: 1px solid $color_error_border
+    background-color: $color_error_background
+
+    i
+      color: #D62727
 
   div
     &#select-container
@@ -324,7 +345,7 @@
     display: inline-block
     width: 30%
     min-width: 300px
-    min-height: 290px
+    min-height: 310px
     margin: 1%
     padding: 25px
     border: 1px solid #c3c3c3
@@ -375,17 +396,6 @@
   ul.plain
     list-style: none
 
-  a#already-have-codename
-    float: right
-    margin-right: 12px
-    margin-top: 10px
-    color: #888
-    text-decoration: none
-
-    &:hover
-      text-decoration: underline
-      color: #666
-
   ul.starred
     margin-bottom: 1.33em
 
@@ -428,10 +438,6 @@
   #regenerate-codename-btn-label
     font-size: 10px
 
-  .journalist-view-single
-    padding-top: 0px
-    text-align: center
-
   footer
     clear: both
     text-align: center
diff --git a/securedrop/sass/_button-rules.sass b/securedrop/sass/_button-rules.sass
index 2386a1804f..c37d58b9c2 100644
--- a/securedrop/sass/_button-rules.sass
+++ b/securedrop/sass/_button-rules.sass
@@ -56,14 +56,20 @@
     &.primary
       display: block
       margin: 0 auto
-      width: 35%
       display: inline-block
 
     &.secondary
       @extend .primary
       background: white
-      color: $color_blue_medium
-      border: 1px solid $color_blue_medium
+      color: $color_purple_medium_darker
+      border: 1px solid $color_purple_medium_darker
+
+    &.index
+      display: block
+      position: absolute
+      bottom: 5%
+      left: 10%
+      right: 10%
 
   button.block, a.btn.block
     text-decoration: none
diff --git a/securedrop/sass/_variables.sass b/securedrop/sass/_variables.sass
index 9e317141c6..3e63575668 100644
--- a/securedrop/sass/_variables.sass
+++ b/securedrop/sass/_variables.sass
@@ -2,10 +2,9 @@ $color_warning_red: #ae3840
 $color_warning_red_pale: #d55c5c
 
 $color_purple_medium: #7985aa
+$color_purple_medium_darker: #727c9b
 
 $color_grey_dark: #626161
 $color_grey_medium: #9e9e9e
 $color_grey_light:  #f0f0f0
 $color_grey_xlight: #f3f3f3
-
-$color_blue_medium: #004080
diff --git a/securedrop/sass/journalist.sass b/securedrop/sass/journalist.sass
index cfe58f9584..e54329e7f0 100644
--- a/securedrop/sass/journalist.sass
+++ b/securedrop/sass/journalist.sass
@@ -74,3 +74,54 @@ button.small-danger, a.btn.small-danger, .btn.small-danger
   display: inline-block
   width: 3.5%
   color: $color_purple_medium
+
+#cols li.source
+  .button-star
+    background-color: $color_grey_light
+
+  .assignment
+    p
+      margin: 0
+      display: inline-block
+
+    .assign-current
+      margin-left: 7%
+
+      font-size: 0.8em
+      a
+
+        margin-left: 1%
+    .btn
+      padding: .3%
+      width: 10%
+      display: inline-block
+
+    button
+      margin-left: 3%
+      padding: .3%
+      width: 10%
+
+  .assign-select
+    height: 0
+    overflow: hidden
+
+    &:target
+      height: auto
+      overflow: visible
+      margin-top: 1%
+      text-align: center
+
+    p
+      font-weight: bold
+      font-style: italic
+
+    select
+      margin-left: 2%
+      width: 23%
+
+    .btn
+      background-color: #999
+
+      &:hover
+        color: #999
+        background-color: white
diff --git a/securedrop/sass/source.sass b/securedrop/sass/source.sass
index 6ca85aaa08..d6e7cf72e4 100644
--- a/securedrop/sass/source.sass
+++ b/securedrop/sass/source.sass
@@ -86,13 +86,17 @@ input#show
       font-size: 100%
       height: auto
 
-input.codename
+input.codename-box
   width: 400px
   padding: 10px
   font-weight: bold
 
-p#codename
+.codename
   font-family: monospace
+  letter-spacing: 0.15em
+  font-weight: normal
+
+p#codename
   /*
    * HACK: Firefox likes to add non-existent leading and/or trailing whitespace
    * to <span>s, but never does it to <p>s. This hack uses a <p> for the
diff --git a/securedrop/source_templates/base.html b/securedrop/source_templates/base.html
index 6e69bbecde..0bf8caebf9 100644
--- a/securedrop/source_templates/base.html
+++ b/securedrop/source_templates/base.html
@@ -26,7 +26,7 @@
 
       <div class="panel selected">
       {% if 'logged_in' in session %}
-        <a href="{{ url_for('logout') }}" class="btn pull-right" id="logout">Exit</a>
+        <a href="{{ url_for('logout') }}" class="sd-button btn pull-right" id="logout">EXIT</a>
       {% endif %}
         <hr class="no-line" />
 
diff --git a/securedrop/source_templates/error.html b/securedrop/source_templates/error.html
index b2a41c6776..bbadf9134c 100644
--- a/securedrop/source_templates/error.html
+++ b/securedrop/source_templates/error.html
@@ -2,7 +2,7 @@
 {% block body %}
 <div id="content">
 
-<h2>Server error</h2>
+<h1>Server error</h1>
 
 <p>Sorry, the website encountered an error and was unable to complete your request.</p>
 
diff --git a/securedrop/source_templates/generate.html b/securedrop/source_templates/generate.html
index 9e2921a341..0b7b27ce2f 100644
--- a/securedrop/source_templates/generate.html
+++ b/securedrop/source_templates/generate.html
@@ -1,14 +1,13 @@
 {% extends "base.html" %}
 
 {% block body %}
-<h2>Remember this codename and keep it secret</h2>
-<p class="center">To protect your identity, we're assigning you a unique codename.</p>
+<h1>Welcome</h1>
+<p>This codename is what you will use in future visits to receive messages from our journalists in response to what you submit on the next screen.</p>
 
 <hr class="no-line" />
 
 <div class="code">
-  <img class="pull-left" src="{{ url_for('static', filename='i/font-awesome/black/lock.svg') }}" width="20px" height="20px">
-  <p id="codename">{{ codename }}</p>
+  <p id="codename" class="codename">{{ codename }}</p>
   <div class="pull-right">
     <form id="regenerate-form" method="post">
       <input name="csrf_token" type="hidden" value="{{ csrf_token() }}">
@@ -21,19 +20,23 @@ <h2>Remember this codename and keep it secret</h2>
 </div>
 
 <div class="clearfix"></div>
+
 <hr class="no-line">
 
-<p>After you submit documents and messages, you can return to this SecureDrop site later to read replies from journalists and submit more information. <strong>You will need this codename to log in.</strong> This is the only way we can communicate back to you.</p>
+<p>Because we use none of the traditional means to track users of our <strong>SecureDrop</strong>
+ service, using this codename with future visits is the  only way we have to communicate with you, should we have
+ questions or are interested in additional documents. Unlike passwords, there is no way to retrieve a lost codename.
+</p>
 
-<p class="serious">The best way to protect your codename is to memorize it. If you cannot memorize it right away, we recommend writing it down and keeping it in a safe place at first, and gradually working to memorize it over time. Once you have memorized it, you should destroy the written copy.</p>
+<hr class="no-line"/>
 
-<hr class="no-line" />
+<aside class="center">
+  <p>Please either write this codename down and keep it in a safe place, or memorize it.</p>
+</aside>
 
-<form id="create-form" method="post" action="/create" autocomplete="off">
+<form id="create-form" method="post" action="/create" autocomplete="off" class="pull-right">
   <input name="csrf_token" type="hidden" value="{{ csrf_token() }}">
-  <button type="submit" class="btn block pull-right" id="continue-button">
-    <img class="pull-left" src="{{ url_for('static', filename='i/font-awesome/white/arrow-circle-o-right.svg') }}" width="20px" height="20px">
-    Continue</button>
-  <a id="already-have-codename" href="/login">Already have a codename?</a>
+  <a id="already-have-codename" href="/login" class="sd-button btn secondary">ALREADY HAVE A CODENAME?</a>
+  <button type="submit" class="sd-button btn primary" id="continue-button">CONTINUE</button>
 </form>
 {% endblock %}
diff --git a/securedrop/source_templates/index.html b/securedrop/source_templates/index.html
index 246cb9ccfe..85b386f00f 100644
--- a/securedrop/source_templates/index.html
+++ b/securedrop/source_templates/index.html
@@ -29,20 +29,20 @@
         </div>
 
         <div class="grid-item option alt">
-          <h2>
+          <h2 class="welcome-text">
             Submit documents for the first time
           </h2>
           <hr class="cut-out" />
           <p>If this is your first time submitting documents to journalists, start here.</p>
-          <a href="/generate" class="btn alt block" id="submit-documents-button"><img id="warning-close" src="{{ url_for('static', filename='i/font-awesome/white/cloud-upload.svg') }}" width="17px" height="17px"> Submit Documents</a>
+          <a href="/generate" class="sd-button btn alt index" id="submit-documents-button">SUBMIT<br/>DOCUMENTS</a>
         </div>
         <div class="grid-item option">
-          <h2>
+          <h2 class="welcome-text">
             Already submitted something?
           </h2>
           <hr class="cut-out" />
           <p>If you have already submitted documents in the past, log in here to check for responses.</p>
-          <a href="/login" class="btn block" id="login-button"><img id="warning-close" src="{{ url_for('static', filename='i/font-awesome/white/comments.svg') }}" width="17px" height="17px"> Check for a response</a>
+          <a href="/login" id="login-button" class="sd-button btn primary index">CHECK FOR A RESPONSE</a>
         </div>
       </div>
 
diff --git a/securedrop/source_templates/login.html b/securedrop/source_templates/login.html
index 386a1f3cbd..2e489cbf79 100644
--- a/securedrop/source_templates/login.html
+++ b/securedrop/source_templates/login.html
@@ -1,16 +1,16 @@
 {% extends "base.html" %}
 {% block body %}
 
-<h2>Enter Codename</h2>
+<h1>Enter Codename</h1>
 
 {% include 'flashed.html' %}
 
 <form method="post" action="/login" autocomplete="off">
 <input name="csrf_token" type="hidden" value="{{ csrf_token() }}">
-<p class="center"><input id="login-with-existing-codename" type="password" name="codename" class="codename" autocomplete="off" placeholder="Enter your codename" autofocus /></p>
-<p class="center">
-    <a href="{{ url_for('index') }}" class="btn secondary" id="cancel">Cancel</a>
-    <button type="submit" class="btn primary">Continue</button>
-</p>
+<p class="center"><input id="login-with-existing-codename" type="password" name="codename" class="codename-box" autocomplete="off" placeholder="Enter your codename" autofocus /></p>
+<div class="pull-right">
+  <a href="{{ url_for('index') }}" class="btn secondary" id="cancel">CANCEL</a>
+  <button type="submit" class="sd-button btn primary">CONTINUE</button>
+</div>
 </form>
 {% endblock %}
diff --git a/securedrop/source_templates/lookup.html b/securedrop/source_templates/lookup.html
index 3d6e0bf7c8..c9bf96ac5f 100644
--- a/securedrop/source_templates/lookup.html
+++ b/securedrop/source_templates/lookup.html
@@ -7,38 +7,33 @@
   {% if flagged and not haskey %}
   <p class="notification"> <img class="pull-left" src="{{ url_for('static', filename='i/font-awesome/black/info-circle.svg') }}" width="20px" height="20px">A journalist has been waiting for you to log in again so SecureDrop can generate a crypto key for you. Now that you have logged in, they are able to write you a reply. Check back later for replies.</p>
   {% endif %}
+</div>
 
-  <h2 class="headline">Submit Materials</h2>
-  <p class="explanation">If you are already familiar with GPG, you can optionally encrypt your files and messages with our <a href="/journalist-key" class="text-link">public key</a> before submission. Files are encrypted as they are received by SecureDrop. <a href="/why-journalist-key" class="text-link">Learn more</a>.</p>
+<h1 class="headline">Submit Materials</h1>
+<p class="explanation">If you are already familiar with GPG, you can optionally encrypt your files and messages with our <a href="/journalist-key" class="text-link">public key</a> before submission. Files are encrypted as they are received by SecureDrop. <a href="/why-journalist-key" class="text-link">Learn more</a>.</p>
 
-  <hr class="no-line">
-</div>
+<p>You can send a file, a message, or both.</p>
+<hr class="no-line">
 
 <form id="upload" method="post" action="/submit" enctype="multipart/form-data" autocomplete="off">
   <input name="csrf_token" type="hidden" value="{{ csrf_token() }}"/>
   <div class="snippet">
     <div class="attachment grid-item center">
-      <svg width="73" height="62" viewBox="0 0 73 61.8">
-        <path d="M47.6 8.6c0 3.7-9.4 6.7-21 6.7 -11.6 0-21-3-21-6.7 0-3.7 9.4-6.7 21-6.7C38.2 2 47.6 4.9 47.6 8.6" class="icon"/>
-        <path d="M47.8 18.1c0 3.7-9.5 6.7-21.1 6.7 -11.7 0-21.1-3-21.1-6.7l0.1-5.6c2.5 2.8 11 4.9 21 4.9 10.1 0 18.6-2.1 21.1-5L47.8 18.1z" class="icon"/>
-        <path d="M30.7 34.4c-1.2 0.1-2.5 0.1-3.8 0.1 -11.7 0-21.1-3-21.1-6.7l0.1-5.6c2.5 2.8 11 4.9 21 4.9 3.5 0 6.8-0.2 9.7-0.7C34 28.5 31.9 31.3 30.7 34.4z" class="icon"/>
-        <path d="M29.3 43.9c-0.8 0-1.6 0-2.5 0 -11.7 0-21.1-3-21.1-6.7l0.1-5.6c2.5 2.8 11 4.9 21 4.9 1.1 0 2.1 0 3.1-0.1 -0.5 1.8-0.8 3.6-0.8 5.5C29.2 42.6 29.3 43.2 29.3 43.9z" class="icon"/>
-        <path d="M49.2 23.9c-9.9 0-17.9 8-17.9 17.9s8 17.9 17.9 17.9c9.9 0 17.9-8 17.9-17.9S59.1 23.9 49.2 23.9zM49.2 30.4c0.7-0.7 1.4 0.1 1.4 0.1s8.1 8.2 9.2 9.3c1.6 1.5-0.2 1.9-0.2 1.9h-6v10.5h-7.5v-10.6h-5.9c-1.3 0-0.4-1.7-0.4-1.7L49.2 30.4" class="icon"/>
-      </svg>
+      {% include 'svg/server_upload.svg' %}
       <input type="file" name="fh" autocomplete="off">
       <p class="center" id="max-file-size">Maximum upload size: 500 MB</p>
     </div>
     <div class="message grid-item">
-      <textarea name="msg" class="fill-parent" placeholder="Add message"></textarea>
+      <textarea name="msg" class="fill-parent" placeholder="Write a message."></textarea>
     </div>
   </div>
 
   <hr class="no-line">
-  <div class="center">
-    <a href="{{ url_for('lookup') }}" class="btn secondary" id="cancel">Cancel</a>
-    <button type="submit" class="btn primary">Submit</button>
-    </form>
+  <div class="pull-right">
+    <a href="{{ url_for('lookup') }}" class="btn secondary" id="cancel">CANCEL</a>
+    <button type="submit" class="sd-button btn primary">SUBMIT</button>
   </div>
+</form>
 
 <hr class="no-line"/>
 
@@ -59,7 +54,7 @@ <h2 class="headline">Get Replies</h2>
           <div id="confirm-delete-{{ reply.filename }}" class="confirm-prompt">
             <p>Delete this reply?
               <a href="#delete">Cancel</a>
-              <button type="submit" class="btn danger">Delete</button>
+              <button type="submit" class="sd-button btn danger">DELETE</button>
               </p>
           </div>
         </form>
@@ -68,12 +63,12 @@ <h2 class="headline">Get Replies</h2>
       </div>
     {% endfor %}
     <form id="delete-all" method="post" action="/delete-all">
-      <a class="btn" href="#delete-all-confirm">Delete all replies</a>
+      <a class="sd-button btn" href="#delete-all-confirm">DELETE ALL REPLIES</a>
       <input name="csrf_token" type="hidden" value="{{ csrf_token() }}"/>
       <div id="delete-all-confirm" class="hidden-prompt">
         <p>Are you finished with the replies?</p>
-        <button class="danger" type="submit">Yes, delete all replies</button>
-        <a class="btn cancel" href="#delete-all">No, not yet</a>
+        <button class="sd-button danger" type="submit">YES, DELETE ALL REPLIES</button>
+        <a class="sd-button btn cancel" href="#delete-all">NO, NOT YET</a>
       </div>
     </form>
   {% else %}
@@ -83,12 +78,10 @@ <h2 class="headline">Get Replies</h2>
 
 <hr class="no-line">
 
-
 <div class="code-reminder">
-
   <img class="pull-left" src="{{ url_for('static', filename='i/font-awesome/black/lock.svg') }}" width="20px" height="20px"> Remember your codename is:
   <div id="show" class="show pull-right"></div>
-  <span id="content"><p class="alert"><strong>{{ codename }}</strong></p></span>
+  <span id="content" class="codename"><p class="alert">{{ codename }}</p></span>
 </div>
 
 {% endblock %}
diff --git a/securedrop/source_templates/notfound.html b/securedrop/source_templates/notfound.html
index d99c59e261..cad6a84239 100644
--- a/securedrop/source_templates/notfound.html
+++ b/securedrop/source_templates/notfound.html
@@ -2,7 +2,7 @@
 {% block body %}
 <div id="content">
 
-<h2>Page not found</h2>
+<h1>Page not found</h1>
 
 <p>Sorry, we couldn't locate what you requested.</p>
 
diff --git a/securedrop/source_templates/svg/server_upload.svg b/securedrop/source_templates/svg/server_upload.svg
new file mode 100644
index 0000000000..82b67709e5
--- /dev/null
+++ b/securedrop/source_templates/svg/server_upload.svg
@@ -0,0 +1,7 @@
+<svg width="73" height="62" viewBox="0 0 73 61.8" xmlns="http://www.w3.org/2000/svg" version="1.1">
+  <path d="M47.6 8.6c0 3.7-9.4 6.7-21 6.7 -11.6 0-21-3-21-6.7 0-3.7 9.4-6.7 21-6.7C38.2 2 47.6 4.9 47.6 8.6" class="icon"/>
+  <path d="M47.8 18.1c0 3.7-9.5 6.7-21.1 6.7 -11.7 0-21.1-3-21.1-6.7l0.1-5.6c2.5 2.8 11 4.9 21 4.9 10.1 0 18.6-2.1 21.1-5L47.8 18.1z" class="icon"/>
+  <path d="M30.7 34.4c-1.2 0.1-2.5 0.1-3.8 0.1 -11.7 0-21.1-3-21.1-6.7l0.1-5.6c2.5 2.8 11 4.9 21 4.9 3.5 0 6.8-0.2 9.7-0.7C34 28.5 31.9 31.3 30.7 34.4z" class="icon"/>
+  <path d="M29.3 43.9c-0.8 0-1.6 0-2.5 0 -11.7 0-21.1-3-21.1-6.7l0.1-5.6c2.5 2.8 11 4.9 21 4.9 1.1 0 2.1 0 3.1-0.1 -0.5 1.8-0.8 3.6-0.8 5.5C29.2 42.6 29.3 43.2 29.3 43.9z" class="icon"/>
+  <path d="M49.2 23.9c-9.9 0-17.9 8-17.9 17.9s8 17.9 17.9 17.9c9.9 0 17.9-8 17.9-17.9S59.1 23.9 49.2 23.9zM49.2 30.4c0.7-0.7 1.4 0.1 1.4 0.1s8.1 8.2 9.2 9.3c1.6 1.5-0.2 1.9-0.2 1.9h-6v10.5h-7.5v-10.6h-5.9c-1.3 0-0.4-1.7-0.4-1.7L49.2 30.4" class="icon"/>
+</svg>
diff --git a/securedrop/source_templates/tor2web-warning.html b/securedrop/source_templates/tor2web-warning.html
index 4c71ed2511..f6aa69a283 100644
--- a/securedrop/source_templates/tor2web-warning.html
+++ b/securedrop/source_templates/tor2web-warning.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% block body %}
-<h2>Why is there a warning about Tor2Web?</h2>
+<h1>Why is there a warning about Tor2Web?</h1>
 <p><a href='https://tor2web.org'>Tor2Web</a> is a proxy service that lets you browse Tor Hidden Services (.onion sites) without installing Tor. It was designed to facilitate anonymous publishing.</p>
 <p>Tor2Web only protects publishers, not readers. If you upload documents to us using Tor2Web, you are <strong>not anonymous</strong> and could be identified by your ISP or the Tor2Web proxy operators. Additionally, since Tor2Web sites typically use HTTPS, it is possible that your connection could be MITM'ed by a capable adversary.</p>
 <p>If you want to submit information, we <strong>strongly advise you</strong> to install <a href='https://www.torproject.org/download.html.en'>Tor</a> and use it to access our site safely and anonymously.</p>
diff --git a/securedrop/source_templates/why-journalist-key.html b/securedrop/source_templates/why-journalist-key.html
index 21ad0d922f..0babf1e003 100644
--- a/securedrop/source_templates/why-journalist-key.html
+++ b/securedrop/source_templates/why-journalist-key.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% block body %}
-<h2>Why download the journalist's public key?</h2>
+<h1>Why download the journalist's public key?</h1>
 <p>SecureDrop encrypts files and messages after they are submitted. Encrypting messages and files before submission can provide an extra layer of security before your data reaches the SecureDrop server.</p>
 <p>If you are already familiar with the GPG encryption software, you may wish to encrypt your submissions yourself. To do so:
 <ol>
diff --git a/securedrop/tests/functional/journalist_navigation_steps.py b/securedrop/tests/functional/journalist_navigation_steps.py
index c1b296a8ce..bbc6dc70bb 100644
--- a/securedrop/tests/functional/journalist_navigation_steps.py
+++ b/securedrop/tests/functional/journalist_navigation_steps.py
@@ -93,8 +93,8 @@ def _admin_visits_admin_interface(self):
         admin_interface_link = self.driver.find_element_by_link_text('Admin')
         admin_interface_link.click()
 
-        h2s = self.driver.find_elements_by_tag_name('h2')
-        self.assertIn("Admin Interface", [el.text for el in h2s])
+        h1s = self.driver.find_elements_by_tag_name('h1')
+        self.assertIn("Admin Interface", [el.text for el in h1s])
 
         users_table_rows = self.driver.find_elements_by_css_selector(
             'table#users tr.user')
@@ -126,9 +126,9 @@ def _admin_adds_a_user(self):
             'button#add-user')
         add_user_btn.click()
 
-        # The add user page has a form with an "Add user" button
+        # The add user page has a form with an "ADD USER" button
         btns = self.driver.find_elements_by_tag_name('button')
-        self.assertIn('Add user', [el.text for el in btns])
+        self.assertIn('ADD USER', [el.text for el in btns])
 
         self.new_user = dict(
             username='dellsberg',
diff --git a/securedrop/tests/test_unit_journalist.py b/securedrop/tests/test_unit_journalist.py
index c9200cd251..04cff11352 100644
--- a/securedrop/tests/test_unit_journalist.py
+++ b/securedrop/tests/test_unit_journalist.py
@@ -355,7 +355,7 @@ def test_http_get_on_admin_add_user_page(self):
         self._login_admin()
         resp = self.client.get(url_for('admin_add_user'))
         # any GET req should take a user to the admin_add_user page
-        self.assertIn('Add user', resp.data)
+        self.assertIn('ADD USER', resp.data)
 
     def test_admin_add_user(self):
         self._login_admin()
diff --git a/securedrop/tests/test_unit_source.py b/securedrop/tests/test_unit_source.py
index 2519b8d1fb..c51cdd9dc3 100644
--- a/securedrop/tests/test_unit_source.py
+++ b/securedrop/tests/test_unit_source.py
@@ -39,7 +39,7 @@ def _find_codename(self, html):
         """Find a source codename (diceware passphrase) in HTML"""
         # Codenames may contain HTML escape characters, and the wordlist
         # contains various symbols.
-        codename_re = r'<p id="codename">(?P<codename>[a-z0-9 &#;?:=@_.*+()\'"$%!-]+)</p>'
+        codename_re = r'<p [^>]*id="codename"[^>]*>(?P<codename>[a-z0-9 &#;?:=@_.*+()\'"$%!-]+)</p>'
         codename_match = re.search(codename_re, html)
         self.assertIsNotNone(codename_match)
         return codename_match.group('codename')
@@ -49,10 +49,7 @@ def test_generate(self):
             resp = c.get('/generate')
             self.assertEqual(resp.status_code, 200)
             session_codename = session['codename']
-        self.assertIn("Remember this codename and keep it secret", resp.data)
-        self.assertIn(
-            "To protect your identity, we're assigning you a unique codename.",
-            resp.data)
+        self.assertIn("This codename is what you will use in future visits", resp.data)
         codename = self._find_codename(resp.data)
         # default codename length is 7 words
         self.assertEqual(len(codename.split()), 7)
@@ -65,7 +62,7 @@ def test_generate_has_login_link(self):
            if they already have a codename, rather than create a new one.
         """
         resp = self.client.get('/generate')
-        self.assertIn("Already have a codename?", resp.data)
+        self.assertIn("ALREADY HAVE A CODENAME?", resp.data)
         soup = BeautifulSoup(resp.data)
         already_have_codename_link = soup.select('a#already-have-codename')[0]
         self.assertEqual(already_have_codename_link['href'], '/login')