diff --git a/lib/views/git-logo.js b/lib/views/git-logo.js
deleted file mode 100644
index 51012c5618..0000000000
--- a/lib/views/git-logo.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import React from 'react';
-
-export default class GitLogo extends React.Component {
-  render() {
-    /* eslint-disable max-len */
-    return (
-      <svg width="114px" height="115px" viewBox="0 0 114 115">
-        <g stroke="none" strokeWidth="1" fill="none" fillRule="evenodd">
-          <g className="git-logo-path">
-            <path d="M111.78,51.977 L62.035,2.2381 C59.1728,-0.6267 54.5268,-0.6267 51.661,2.2381 L41.332,12.5681 L54.434,25.6701 C57.4799,24.6417 60.9711,25.33122 63.3979,27.7585 C65.8373,30.2009 66.5219,33.7219 65.4677,36.778 L78.0957,49.406 C81.1508,48.3532 84.6757,49.03338 87.1152,51.4772 C90.5258,54.8868 90.5258,60.4117 87.1152,63.8222 C83.7041,67.2338 78.1792,67.2338 74.7662,63.8222 C72.2017,61.2557 71.5674,57.4877 72.8663,54.328 L61.0893,42.551 L61.0883,73.542 C61.9198,73.95362 62.7045,74.503 63.3974,75.1929 C66.807,78.6021 66.807,84.126 63.3974,87.5409 C59.9868,90.95 54.4594,90.95 51.0524,87.5409 C47.6423,84.1263 47.6423,78.6024 51.0524,75.1929 C51.89515,74.35165 52.8703,73.7149 53.9108,73.2881 L53.9108,42.0091 C52.8698,41.5841 51.8958,40.9521 51.0518,40.1041 C48.4688,37.5231 47.8467,33.7321 49.1714,30.5602 L36.2554,17.6422 L2.1494,51.7472 C-0.7163,54.6142 -0.7163,59.2602 2.1494,62.1252 L51.8914,111.8642 C54.7552,114.729 59.3996,114.729 62.2674,111.8642 L111.7794,62.3602 C114.6442,59.494 114.6442,54.8466 111.7794,51.9812" id="Shape" />
-          </g>
-        </g>
-      </svg>
-    );
-    /* eslint-enable max-len */
-  }
-}
diff --git a/lib/views/git-tab-view.js b/lib/views/git-tab-view.js
index 4ec74fde66..20e54b9164 100644
--- a/lib/views/git-tab-view.js
+++ b/lib/views/git-tab-view.js
@@ -4,7 +4,6 @@ import cx from 'classnames';
 import {CompositeDisposable} from 'atom';
 
 import StagingView from './staging-view';
-import GitLogo from './git-logo';
 import CommitController from '../controllers/commit-controller';
 import RecentCommitsController from '../controllers/recent-commits-controller';
 import RefHolder from '../models/ref-holder';
@@ -89,11 +88,9 @@ export default class GitTabView extends React.Component {
     if (this.props.repository.isTooLarge()) {
       return (
         <div className="github-Git is-empty" tabIndex="-1" ref={this.props.refRoot.setter}>
-          <div ref="noRepoMessage" className="github-Git no-repository">
-            <div className="large-icon">
-              <GitLogo />
-            </div>
-            <h3>Too many changes</h3>
+          <div ref="noRepoMessage" className="github-Git too-many-changes">
+            <div className="github-Git-LargeIcon icon icon-diff" />
+            <h1>Too many changes</h1>
             <div className="initialize-repo-description">
               The repository at <strong>{this.props.workingDirectoryPath}</strong> has too many changed files
               to display in Atom. Ensure that you have set up an appropriate <code>.gitignore</code> file.
@@ -105,11 +102,9 @@ export default class GitTabView extends React.Component {
       !isValidWorkdir(this.props.repository.getWorkingDirectoryPath())) {
       return (
         <div className="github-Git is-empty" tabIndex="-1" ref={this.props.refRoot.setter}>
-          <div ref="noRepoMessage" className="github-Git no-repository">
-            <div className="large-icon">
-              <GitLogo />
-            </div>
-            <h3>Unsupported directory</h3>
+          <div ref="noRepoMessage" className="github-Git unsupported-directory">
+            <div className="github-Git-LargeIcon icon icon-alert" />
+            <h1>Unsupported directory</h1>
             <div className="initialize-repo-description">
               Atom does not support managing Git repositories in your home or root directories.
             </div>
@@ -129,9 +124,8 @@ export default class GitTabView extends React.Component {
       return (
         <div className="github-Git is-empty" tabIndex="-1" ref={this.props.refRoot.setter}>
           <div ref="noRepoMessage" className="github-Git no-repository">
-            <div className="large-icon">
-              <GitLogo />
-            </div>
+            <div className="github-Git-LargeIcon icon icon-repo" />
+            <h1>Create Repository</h1>
             <div className="initialize-repo-description">{message}</div>
             <button onClick={this.initializeRepo} disabled={inProgress} className="btn btn-primary">
               {inProgress ? 'Creating repository...' : 'Create repository'}
diff --git a/lib/views/github-login-view.js b/lib/views/github-login-view.js
index e959d06576..b641b8cb15 100644
--- a/lib/views/github-login-view.js
+++ b/lib/views/github-login-view.js
@@ -10,7 +10,10 @@ export default class GithubLoginView extends React.Component {
   }
 
   static defaultProps = {
-    children: <p>Log in to GitHub to access PR information and more!</p>,
+    children:
+  <div className="initialize-repo-description">
+    <span>Log in to GitHub to access PR information and more!</span>
+  </div>,
     onLogin: token => {},
   }
 
@@ -44,8 +47,10 @@ export default class GithubLoginView extends React.Component {
   renderLogin() {
     return (
       <div className="github-GithubLoginView-Subview">
+        <div className="github-GitHub-LargeIcon icon icon-mark-github" />
+        <h1>Log in to GitHub</h1>
         {this.props.children}
-        <button onClick={this.handleLoginClick} className="btn btn-primary btn-lg icon icon-octoface">
+        <button onClick={this.handleLoginClick} className="btn btn-primary icon icon-octoface">
           Login
         </button>
       </div>
@@ -55,13 +60,14 @@ export default class GithubLoginView extends React.Component {
   renderTokenInput() {
     return (
       <form className="github-GithubLoginView-Subview" onSubmit={this.handleSubmitToken}>
-        <p>
-          Step 1: Visit <a href="https://github.atom.io/login">github.atom.io/login</a> to generate
-          an authentication token.
-        </p>
-        <p>
-          Step 2: Enter the token below:
-        </p>
+        <div className="github-GitHub-LargeIcon icon icon-mark-github" />
+        <h1>Enter Token</h1>
+        <ol>
+          <li>Visit <a href="https://github.atom.io/login">github.atom.io/login</a> to generate
+          an authentication token.</li>
+          <li>Enter the token below:</li>
+        </ol>
+
         <input
           type="text"
           className="input-text native-key-bindings"
@@ -69,16 +75,19 @@ export default class GithubLoginView extends React.Component {
           value={this.state.token}
           onChange={this.handleTokenChange}
         />
-        <div>
-          <button type="button" onClick={this.handleCancelTokenClick} className="btn icon inline-block-tight">
-            Cancel
-          </button>
-          <input
-            type="submit"
-            value="Login"
-            onClick={this.handleSubmitTokenClick} className="btn btn-primary icon icon-check inline-block-tight"
-          />
-        </div>
+        <ul>
+          <li>
+            <button type="button" onClick={this.handleCancelTokenClick} className="btn icon icon-remove-close">
+              Cancel
+            </button>
+          </li>
+          <li>
+            <button
+              type="submit" onClick={this.handleSubmitTokenClick} className="btn btn-primary icon icon-check">
+                Login
+            </button>
+          </li>
+        </ul>
       </form>
     );
   }
diff --git a/lib/views/github-tab-view.js b/lib/views/github-tab-view.js
index 5417345ad9..48dbd17119 100644
--- a/lib/views/github-tab-view.js
+++ b/lib/views/github-tab-view.js
@@ -81,7 +81,8 @@ export default class GitHubTabView extends React.Component {
     // TODO: display a view that lets you create a repository on GitHub
     return (
       <div className="github-GitHub-noRemotes">
-        <div className="github-GitHub-largeGitHubLogo icon icon-mark-github" />
+        <div className="github-GitHub-LargeIcon icon icon-mark-github" />
+        <h1>No Remotes</h1>
         <div className="initialize-repo-description">
           <span>This repository does not have any remotes hosted at GitHub.com.</span>
         </div>
diff --git a/lib/views/remote-selector-view.js b/lib/views/remote-selector-view.js
index 9dd3624372..4f31aa36fb 100644
--- a/lib/views/remote-selector-view.js
+++ b/lib/views/remote-selector-view.js
@@ -15,8 +15,8 @@ export default class RemoteSelectorView extends React.Component {
     // todo: ask Ash how to test this before merging.
     return (
       <div className="github-RemoteSelector">
-        <div className="github-GitHub-largeGitHubLogo icon icon-mark-github" />
-
+        <div className="github-GitHub-LargeIcon icon icon-mirror" />
+        <h1>Select a Remote</h1>
         <div className="initialize-repo-description">
           <span>This repository has multiple remotes hosted at GitHub.com.
           Select a remote to see pull requests associated
diff --git a/styles/git-tab.less b/styles/git-tab.less
index 54d6ff2bcf..26a955d4ed 100644
--- a/styles/git-tab.less
+++ b/styles/git-tab.less
@@ -17,31 +17,39 @@
   -webkit-user-select: none;
   cursor: default;
 
-  &.no-repository {
-    padding: @component-padding * 3;
-    text-align: center;
-  }
-
   &.is-loading {
     color: @text-color-subtle;
   }
 
-  &.no-repository {
+  &.no-repository,
+  &.too-many-changes,
+  &.unsupported-directory {
     display: flex;
     justify-content: center;
     font-size: 1.25em;
+    padding: @component-padding * 3;
+    text-align: center;
 
     > * {
       margin: @component-padding 0;
     }
 
-    .git-logo-path {
-      fill: mix(@base-background-color, @text-color, 66%); // 2/3 of bg color
+    h1 {
+      margin-bottom: @component-padding * 3;
     }
 
-    .btn.btn-primary {
+    button {
       overflow: hidden;
       text-overflow: ellipsis;
     }
   }
+
+  &-LargeIcon:before {
+    margin-right: 0;
+    margin-bottom: @component-padding * 5;
+    width: auto;
+    height: auto;
+    font-size: 8em;
+    color: mix(@base-background-color, @text-color, 66%); // 2/3 of bg color
+  }
 }
diff --git a/styles/github-login-view.less b/styles/github-login-view.less
index 974ff37e4f..9559a89ac8 100644
--- a/styles/github-login-view.less
+++ b/styles/github-login-view.less
@@ -1,40 +1,47 @@
-.github-GithubLoginView-Container {
-  height: 100%;
-  display: flex;
-}
-
 .github-GithubLoginView {
-  height: 100%;
+  flex: 1;
   display: flex;
+  flex-direction: column;
+  font-size: 1.25em;
 
   .github-GithubLoginView-Subview {
     flex: 1;
     display: flex;
     flex-direction: column;
-    align-self: center;
-    align-items: center;
-    padding: 20px;
+    justify-content: center;
+    text-align: center;
+    padding: @component-padding * 3;
 
-    > button, > input {
-      margin: @component-padding;
+    > * {
+      margin: @component-padding 0;
     }
-  }
 
-  p {
-    text-align: center;
-    font-size: @font-size * 1.25;
-    margin: 0;
+    h1 {
+      margin-bottom: @component-padding * 3;
+    }
 
-    &:first-child {
-      margin-bottom: 20px;
+    button {
+      width: 100%;
+      overflow: hidden;
+      text-overflow: ellipsis;
     }
 
-    a {
-      color: @text-color-info;
+    ol {
+      text-align: left;
+      padding: @component-padding 0;
+
+      a {
+        color: @text-color-info;
+      }
     }
-  }
 
-  input[type=text] {
-    width: 100%;
+    ul {
+      list-style: none;
+      padding-left: 0;
+
+      li:not(:last-child) {
+        margin-bottom: @component-padding;
+      }
+    }
   }
 }
diff --git a/styles/github-tab.less b/styles/github-tab.less
index d837b1fb1b..5d9dc35114 100644
--- a/styles/github-tab.less
+++ b/styles/github-tab.less
@@ -33,27 +33,35 @@
     > * {
       margin: @component-padding 0;
     }
+
+    h1 {
+      margin-bottom: @component-padding * 3;
+    }
   }
 
   .github-RemoteSelector {
     ul {
       list-style: none;
       padding-left: 0;
+
+      li:not(:last-child) {
+        margin-bottom: @component-padding;
+      }
     }
 
     button {
       width: 100%;
-      margin-bottom: 10px;
       overflow: hidden;
       text-overflow: ellipsis;
     }
   }
 
-  &-largeGitHubLogo:before {
+  &-LargeIcon:before {
     margin-right: 0;
+    margin-bottom: @component-padding * 5;
     width: auto;
     height: auto;
-    font-size: 6em;
+    font-size: 8em;
     color: mix(@base-background-color, @text-color, 66%); // 2/3 of bg color
   }
 }