diff --git a/client/.eslintrc.js b/client/.eslintrc.js
index 815fac91fd..4115400825 100644
--- a/client/.eslintrc.js
+++ b/client/.eslintrc.js
@@ -26,7 +26,6 @@ module.exports = {
     "consistent-return": "off",
     "no-control-regex": "off",
     "no-multiple-empty-lines": "warn",
-    "no-script-url": "off", // some <a> tags should have href="javascript:void(0)"
     "no-only-tests/no-only-tests": "error",
     "operator-linebreak": "off",
     "react/destructuring-assignment": "off",
diff --git a/client/app/assets/less/redash/redash-newstyle.less b/client/app/assets/less/redash/redash-newstyle.less
index d43090a2eb..f82457a9d4 100644
--- a/client/app/assets/less/redash/redash-newstyle.less
+++ b/client/app/assets/less/redash/redash-newstyle.less
@@ -173,6 +173,7 @@ body {
 
   &:hover, &:focus {
     color: @yellow-darker;
+    cursor: pointer;
   }
 
   .fa-star {
@@ -814,11 +815,14 @@ body {
 }
 
 .tags-list {
-
   .badge-light {
     background: fade(@redash-gray, 10%);
     color: fade(@redash-gray, 75%);
   }
+
+  a:hover {
+    cursor: pointer;
+  }
 }
 
 .dropdown-menu--profile {
diff --git a/client/app/components/FavoritesControl.jsx b/client/app/components/FavoritesControl.jsx
index 665d7e7b83..9496737363 100644
--- a/client/app/components/FavoritesControl.jsx
+++ b/client/app/components/FavoritesControl.jsx
@@ -37,7 +37,6 @@ export class FavoritesControl extends React.Component {
     const title = item.is_favorite ? 'Remove from favorites' : 'Add to favorites';
     return (
       <a
-        href="javascript:void(0)"
         title={title}
         className="btn-favourite"
         onClick={event => this.toggleItem(event, item, onChange)}
diff --git a/client/app/components/HelpTrigger.jsx b/client/app/components/HelpTrigger.jsx
index dbc437c127..ce2bbd20ad 100644
--- a/client/app/components/HelpTrigger.jsx
+++ b/client/app/components/HelpTrigger.jsx
@@ -152,7 +152,7 @@ export class HelpTrigger extends React.Component {
     return (
       <React.Fragment>
         <Tooltip title={tooltip}>
-          <a href="javascript: void(0)" onClick={this.openDrawer} className={className}>
+          <a onClick={this.openDrawer} className={className}>
             {this.props.children}
           </a>
         </Tooltip>
diff --git a/client/app/components/HelpTrigger.less b/client/app/components/HelpTrigger.less
index 602a20750c..cee9f63abf 100644
--- a/client/app/components/HelpTrigger.less
+++ b/client/app/components/HelpTrigger.less
@@ -4,6 +4,10 @@
 
 .help-trigger {
   font-size: 15px;
+
+  &:hover {
+    cursor: pointer;
+  }
 }
 
 .help-drawer {
diff --git a/client/app/components/QuerySelector.jsx b/client/app/components/QuerySelector.jsx
index 979ce63a61..5681b367e5 100644
--- a/client/app/components/QuerySelector.jsx
+++ b/client/app/components/QuerySelector.jsx
@@ -112,7 +112,6 @@ export function QuerySelector(props) {
       <div className="list-group">
         {searchResults.map(q => (
           <a
-            href="javascript:void(0)"
             className={cx('query-selector-result', 'list-group-item', { inactive: q.is_draft })}
             key={q.id}
             onClick={() => selectQuery(q.id)}
diff --git a/client/app/components/TagsList.jsx b/client/app/components/TagsList.jsx
index 8bd6df7559..e2f63a4f50 100644
--- a/client/app/components/TagsList.jsx
+++ b/client/app/components/TagsList.jsx
@@ -63,7 +63,6 @@ export class TagsList extends React.Component {
           {map(allTags, tag => (
             <a
               key={tag.name}
-              href="javascript:void(0)"
               className={classNames('list-group-item', 'max-character', { active: selectedTags.has(tag.name) })}
               onClick={event => this.toggleTag(event, tag.name)}
             >
diff --git a/client/app/components/empty-state/EmptyState.jsx b/client/app/components/empty-state/EmptyState.jsx
index b53424d1aa..81a7fcf7a3 100644
--- a/client/app/components/empty-state/EmptyState.jsx
+++ b/client/app/components/empty-state/EmptyState.jsx
@@ -15,7 +15,7 @@ function Step({ show, completed, text, url, urlText, onClick }) {
 
   return (
     <li className={classNames({ done: completed })}>
-      <a href={url || 'javascript:void(0)'} onClick={onClick}>
+      <a href={url} onClick={onClick}>
         {urlText}
       </a>{' '}
       {text}
diff --git a/client/app/components/empty-state/empty-state.less b/client/app/components/empty-state/empty-state.less
index 24e8702683..7219df9733 100644
--- a/client/app/components/empty-state/empty-state.less
+++ b/client/app/components/empty-state/empty-state.less
@@ -48,6 +48,10 @@
     margin-bottom: 0;
   }
 
+  a:hover {
+    cursor: pointer;
+  }
+
   @media (max-width: 767px) {
     flex-direction: column;
 
diff --git a/client/app/pages/dashboards/dashboard.html b/client/app/pages/dashboards/dashboard.html
index 9b8ebf4447..cc89ae3e61 100644
--- a/client/app/pages/dashboards/dashboard.html
+++ b/client/app/pages/dashboards/dashboard.html
@@ -57,7 +57,7 @@ <h3>
             </button>
             <ul class="dropdown-menu pull-right" ng-model="$ctrl.refreshRate" uib-dropdown-menu role="menu" aria-labelledby="split-button">
               <li role="menuitem" ng-repeat="refreshRate in $ctrl.refreshRates" ng-class="{disabled: !refreshRate.enabled}">
-                <a href="javascript:void(0)" ng-click="$ctrl.setRefreshRate(refreshRate)">{{refreshRate.name}}</a>
+                <a ng-click="$ctrl.setRefreshRate(refreshRate)">{{refreshRate.name}}</a>
               </li>
               <li role="menuitem" ng-if="$ctrl.refreshRate !== null">
                 <a href="#" ng-click="$ctrl.setRefreshRate(null)">Stop auto refresh</a>
diff --git a/client/app/pages/groups/GroupDataSources.jsx b/client/app/pages/groups/GroupDataSources.jsx
index 12abc166ea..8570dedbb8 100644
--- a/client/app/pages/groups/GroupDataSources.jsx
+++ b/client/app/pages/groups/GroupDataSources.jsx
@@ -183,12 +183,13 @@ class GroupDataSources extends React.Component {
             {!controller.isLoaded && <LoadingState className="" />}
             {controller.isLoaded && controller.isEmpty && (
               <div className="text-center">
-                There are no data sources in this group yet.
+                <p>
+                  There are no data sources in this group yet.
+                </p>
                 {currentUser.isAdmin && (
-                  <div className="m-t-5">
-                    <a href="javascript:void(0)" onClick={this.addDataSources}>Click here</a>
-                    {' '} to add data sources.
-                  </div>
+                  <Button type="primary" onClick={this.addDataSources}>
+                    <i className="fa fa-plus m-r-5" />Add Data Sources
+                  </Button>
                 )}
               </div>
             )}
diff --git a/client/app/pages/groups/GroupMembers.jsx b/client/app/pages/groups/GroupMembers.jsx
index b7c73e6102..e08f158f1a 100644
--- a/client/app/pages/groups/GroupMembers.jsx
+++ b/client/app/pages/groups/GroupMembers.jsx
@@ -148,12 +148,13 @@ class GroupMembers extends React.Component {
             {!controller.isLoaded && <LoadingState className="" />}
             {controller.isLoaded && controller.isEmpty && (
               <div className="text-center">
-                There are no members in this group yet.
+                <p>
+                  There are no members in this group yet.
+                </p>
                 {currentUser.isAdmin && (
-                  <div className="m-t-5">
-                    <a href="javascript:void(0)" onClick={this.addMembers}>Click here</a>
-                    {' '} to add members.
-                  </div>
+                  <Button type="primary" onClick={this.addMembers}>
+                    <i className="fa fa-plus m-r-5" />Add Members
+                  </Button>
                 )}
               </div>
             )}