diff --git a/app/ui/components/base/prompt-button.js b/app/ui/components/base/prompt-button.js
index 32c447abff..31d6418210 100644
--- a/app/ui/components/base/prompt-button.js
+++ b/app/ui/components/base/prompt-button.js
@@ -86,12 +86,16 @@ class PromptButton extends PureComponent {
     let innerMsg;
     if (state === STATE_ASK && addIcon) {
       innerMsg = (
-        <span className="danger">
-          <i className="fa fa-exclamation-circle"/> {CONFIRM_MESSAGE}
+        <span className="warning" title="Click again to confirm">
+          <i className="fa fa-minus-circle"/> {CONFIRM_MESSAGE}
         </span>
       );
     } else if (state === STATE_ASK) {
-      innerMsg = <span className="danger">{CONFIRM_MESSAGE}</span>;
+      innerMsg = (
+        <span className="warning" title="Click again to confirm">
+          {CONFIRM_MESSAGE}
+        </span>
+      );
     } else if (state === STATE_DONE) {
       innerMsg = DONE_MESSAGE;
     } else {
diff --git a/app/ui/components/sidebar/sidebar-request-row.js b/app/ui/components/sidebar/sidebar-request-row.js
index ab39835146..c1d3393f35 100644
--- a/app/ui/components/sidebar/sidebar-request-row.js
+++ b/app/ui/components/sidebar/sidebar-request-row.js
@@ -99,8 +99,7 @@ class SidebarRequestRow extends PureComponent {
       node = (
         <li className={classes}>
           <div className="sidebar__item" tabIndex={0}>
-            <button className="sidebar__clickable"
-                    onClick={this._handleRequestCreateFromEmpty}>
+            <button className="sidebar__clickable" onClick={this._handleRequestCreateFromEmpty}>
               <em className="faded">click to add first request...</em>
             </button>
           </div>
@@ -123,11 +122,11 @@ class SidebarRequestRow extends PureComponent {
                             onEditStart={this._handleEditStart}
                             onSubmit={this._handleRequestUpdateName}/>
                   {request.description && (
-                    <button title="View description"
+                    <a title="View description"
                             onClick={this._handleClickDescription}
                             className="icon space-left txt-sm super-faint">
                       <i className="fa fa-file-text-o"/>
-                    </button>
+                    </a>
                   )}
                 </div>
               </div>