diff --git a/src-docs/src/components/guide_page/guide_page_chrome.js b/src-docs/src/components/guide_page/guide_page_chrome.js
index c1a92fec25f7..0483d04b94c1 100644
--- a/src-docs/src/components/guide_page/guide_page_chrome.js
+++ b/src-docs/src/components/guide_page/guide_page_chrome.js
@@ -159,7 +159,7 @@ export class GuidePageChrome extends Component {
         <EuiSpacer size="m" />
 
         <EuiFieldSearch
-          placeholder="Search..."
+          placeholder="Search"
           value={this.state.search}
           onChange={this.onSearchChange}
         />
diff --git a/src-docs/src/routes.js b/src-docs/src/routes.js
index 1fe616fa232b..62837d86aa4b 100644
--- a/src-docs/src/routes.js
+++ b/src-docs/src/routes.js
@@ -233,7 +233,6 @@ const navigation = [{
   }, {
     name: 'Toasts',
     component: ToastGuidelines,
-    hidden: true,
   }, {
     name: 'Writing',
     component: WritingGuidelines,
diff --git a/src-docs/src/views/guidelines/button.js b/src-docs/src/views/guidelines/button.js
index ef6a3c6d7089..b5c5a44b99d5 100644
--- a/src-docs/src/views/guidelines/button.js
+++ b/src-docs/src/views/guidelines/button.js
@@ -197,7 +197,7 @@ export default() => (
       >
         <EuiImage
           alt="button placement in form"
-          url="https://i.imgur.com/m4vtsdx.png"
+          url="https://i.imgur.com/2nvcgEU.png"
         />
       </GuideRuleExample>
 
@@ -209,7 +209,7 @@ export default() => (
       >
         <EuiImage
           alt="form buttons go on the left, not right"
-          url="https://i.imgur.com/6XCOBPH.png"
+          url="https://i.imgur.com/Y1rOaoN.png"
         />
       </GuideRuleExample>
 
diff --git a/src-docs/src/views/guidelines/toasts.js b/src-docs/src/views/guidelines/toasts.js
index bbf56ac6ff69..b63ed44d9973 100644
--- a/src-docs/src/views/guidelines/toasts.js
+++ b/src-docs/src/views/guidelines/toasts.js
@@ -237,7 +237,7 @@ export default () => (
 
     <EuiHorizontalRule/>
 
-    <GuideRuleTitle>Toasts can have one action</GuideRuleTitle>
+    <GuideRuleTitle>Toasts should only contain a single action</GuideRuleTitle>
 
     <GuideRule
       description="A toast can have a single action, styled as a standard button.
@@ -248,16 +248,20 @@ export default () => (
         panel={false}
         type="do"
         frame
-        text="Do. Use only one action per toast and favor a one-word label."
+        text="Do. Use only one action per toast and favor a one-word label.
+          Align actions to the right, which follows our button guidelines for
+          usage within restricted width containers."
       >
         <EuiToast
           style={{ maxWidth: 300 }}
           color="success"
           title="Your report is complete"
         >
-          <EuiButton size="s">
-            Download
-          </EuiButton>
+          <div style={{ textAlign: 'right' }}>
+            <EuiButton size="s">
+              Download
+            </EuiButton>
+          </div>
 
         </EuiToast>
       </GuideRuleExample>
@@ -266,19 +270,26 @@ export default () => (
         type="dont"
         panel={false}
         frame
-        text="Dont use multiple actions. This message is better in a confirmation modal."
+        text="Don&apos;t use multiple actions. Don&apos;t align buttons in toasts to the left.
+          This message is better in a confirmation modal."
       >
         <EuiToast
           style={{ maxWidth: 300 }}
           title="All messages will be deleted"
           color="danger"
         >
-          <EuiButton size="s">
-            Cancel
-          </EuiButton>&nbsp;&nbsp;
-          <EuiButton size="s" color="danger">
-            Delete
-          </EuiButton>
+          <EuiFlexGroup justifyContent="flexEnd" gutterSize="s">
+            <EuiFlexItem grow={false}>
+              <EuiButton size="s">
+                Cancel
+              </EuiButton>
+            </EuiFlexItem>
+            <EuiFlexItem grow={false}>
+              <EuiButton size="s" color="danger">
+                Delete
+              </EuiButton>
+            </EuiFlexItem>
+          </EuiFlexGroup>
         </EuiToast>
       </GuideRuleExample>
     </GuideRule>
@@ -368,9 +379,11 @@ export default () => (
             color="danger"
             title="There was a problem with your node"
           >
-            <EuiButton size="s">
-              Learn more
-            </EuiButton>
+            <div style={{ textAlign: 'right' }}>
+              <EuiButton size="s">
+                Learn more
+              </EuiButton>
+            </div>
           </EuiToast>
           <EuiSpacer />
 
@@ -386,7 +399,7 @@ export default () => (
 
     <EuiHorizontalRule/>
 
-    <GuideRuleTitle>Writing minimal messages</GuideRuleTitle>
+    <GuideRuleTitle>Keep messages as short as possible</GuideRuleTitle>
 
     <GuideRule
       description="For common actions such as create, add, delete, remove, and save,
@@ -414,7 +427,7 @@ export default () => (
         type="dont"
         panel={false}
         frame
-        text="Dont use the generic &quot;Your object.&quot;"
+        text="Don&apos;t use the generic &quot;Your object.&quot;"
       >
         <EuiToast
           color="success"
@@ -445,7 +458,7 @@ export default () => (
         type="dont"
         panel={false}
         frame
-        text="Dont include &quot;successfully.&quot;"
+        text="Don&apos;t include &quot;successfully.&quot;"
       >
         <EuiToast
           color="success"
diff --git a/src-docs/src/views/toast/success.js b/src-docs/src/views/toast/success.js
index 48891b05ccfd..c76fe4c46222 100644
--- a/src-docs/src/views/toast/success.js
+++ b/src-docs/src/views/toast/success.js
@@ -4,6 +4,8 @@ import {
   EuiButton,
   EuiLink,
   EuiToast,
+  EuiFlexGroup,
+  EuiFlexItem,
 } from '../../../../src/components';
 
 export default () => (
@@ -22,8 +24,12 @@ export default () => (
       And some other stuff on another line, just for kicks. And <EuiLink href="#">here&rsquo;s a link</EuiLink>.
     </p>
 
-    <EuiButton>
-      Download report
-    </EuiButton>
+    <EuiFlexGroup justifyContent="flexEnd" gutterSize="s">
+      <EuiFlexItem grow={false}>
+        <EuiButton size="s">
+          Download report
+        </EuiButton>
+      </EuiFlexItem>
+    </EuiFlexGroup>
   </EuiToast>
 );