diff --git a/app/components/ErrorBoundary.js b/app/components/ErrorBoundary.js
index e7f5b334..4a36afd4 100644
--- a/app/components/ErrorBoundary.js
+++ b/app/components/ErrorBoundary.js
@@ -56,11 +56,11 @@ class ErrorBoundary extends React.Component<Props> {
           <p>
             <Button onClick={this.handleReload}>Reload</Button>{' '}
             {this.showDetails ? (
-              <Button onClick={this.handleReportBug} light>
+              <Button onClick={this.handleReportBug} neutral>
                 Report a Bug…
               </Button>
             ) : (
-              <Button onClick={this.handleShowDetails} light>
+              <Button onClick={this.handleShowDetails} neutral>
                 Show Details…
               </Button>
             )}
diff --git a/app/scenes/Settings/Details.js b/app/scenes/Settings/Details.js
index 5cff1feb..d0de9f37 100644
--- a/app/scenes/Settings/Details.js
+++ b/app/scenes/Settings/Details.js
@@ -128,7 +128,7 @@ class Details extends React.Component<Props> {
               />
               {this.subdomain && (
                 <HelpText small>
-                  Your knowledgebase will be accessed at{' '}
+                  Your knowledgebase will be accessible at{' '}
                   <strong>{this.subdomain}.getoutline.com</strong>
                 </HelpText>
               )}
diff --git a/app/scenes/Settings/Security.js b/app/scenes/Settings/Security.js
index 9daa6e82..2b6e7dee 100644
--- a/app/scenes/Settings/Security.js
+++ b/app/scenes/Settings/Security.js
@@ -59,7 +59,7 @@ class Security extends React.Component<Props> {
         <PageTitle title="Security" />
         <h1>Security</h1>
         <HelpText>
-          Settings that impact the access, security and content of your
+          Settings that impact the access, security, and content of your
           knowledgebase.
         </HelpText>
 
diff --git a/app/scenes/Settings/Shares.js b/app/scenes/Settings/Shares.js
index acd91b23..82affea9 100644
--- a/app/scenes/Settings/Shares.js
+++ b/app/scenes/Settings/Shares.js
@@ -27,15 +27,16 @@ class Shares extends React.Component<Props> {
     const { shares, auth } = this.props;
     const { user } = auth;
     const canShareDocuments = auth.team && auth.team.sharing;
+    const hasSharedDocuments = shares.orderedData.length > 0;
 
     return (
       <CenteredContent>
         <PageTitle title="Share Links" />
         <h1>Share Links</h1>
         <HelpText>
-          Documents that have been shared appear below. Anyone that has the link
-          can access a read-only version of the document until the link has been
-          revoked.
+          Documents that have been shared are listed below. Anyone that has the
+          public link can access a read-only version of the document until the
+          link has been revoked.
         </HelpText>
         {user &&
           user.isAdmin && (
@@ -47,12 +48,16 @@ class Shares extends React.Component<Props> {
               sharing in <Link to="/settings/security">security settings</Link>.
             </HelpText>
           )}
-        <Subheading>Shared Documents</Subheading>
-        <List>
-          {shares.orderedData.map(share => (
-            <ShareListItem key={share.id} share={share} />
-          ))}
-        </List>
+        {hasSharedDocuments && (
+          <React.Fragment>
+            <Subheading>Shared Documents</Subheading>
+            <List>
+              {shares.orderedData.map(share => (
+                <ShareListItem key={share.id} share={share} />
+              ))}
+            </List>
+          </React.Fragment>
+        )}
       </CenteredContent>
     );
   }
diff --git a/app/scenes/Settings/components/TokenListItem.js b/app/scenes/Settings/components/TokenListItem.js
index cc96377c..6eea21cd 100644
--- a/app/scenes/Settings/components/TokenListItem.js
+++ b/app/scenes/Settings/components/TokenListItem.js
@@ -16,7 +16,7 @@ const TokenListItem = ({ token, onDelete }: Props) => {
       title={token.name}
       subtitle={<code>{token.secret}</code>}
       actions={
-        <Button onClick={() => onDelete(token.id)} light>
+        <Button onClick={() => onDelete(token.id)} neutral>
           Revoke
         </Button>
       }