diff --git a/webapp/assets/_new/styles/resets.scss b/webapp/assets/_new/styles/resets.scss
index edc495821..2784add5f 100644
--- a/webapp/assets/_new/styles/resets.scss
+++ b/webapp/assets/_new/styles/resets.scss
@@ -3,6 +3,7 @@
 }
 
 button {
+  padding: 0;
   background: transparent;
   border: none;
   font-family: inherit;
diff --git a/webapp/components/_new/generic/BaseButton/BaseButton.story.js b/webapp/components/_new/generic/BaseButton/BaseButton.story.js
new file mode 100644
index 000000000..5b33a9f8f
--- /dev/null
+++ b/webapp/components/_new/generic/BaseButton/BaseButton.story.js
@@ -0,0 +1,21 @@
+import { storiesOf } from '@storybook/vue'
+import helpers from '~/storybook/helpers'
+import BaseButton from './BaseButton.vue'
+
+storiesOf('BaseButton', module)
+  .addDecorator(helpers.layout)
+
+  .add('Default', () => ({
+    components: { BaseButton },
+    template: '<base-button>Click me</base-button>',
+  }))
+
+  .add('With Icon', () => ({
+    components: { BaseButton },
+    template: '<base-button icon="edit">With Icon</base-button>',
+  }))
+
+  .add('Icon Only', () => ({
+    components: { BaseButton },
+    template: '<base-button icon="trash" />',
+  }))
diff --git a/webapp/components/_new/generic/BaseButton/BaseButton.vue b/webapp/components/_new/generic/BaseButton/BaseButton.vue
new file mode 100644
index 000000000..6e6497d6d
--- /dev/null
+++ b/webapp/components/_new/generic/BaseButton/BaseButton.vue
@@ -0,0 +1,40 @@
+<template>
+  <button class="base-button">
+    <base-icon v-if="icon" :name="icon" :class="iconClass" />
+    <slot />
+  </button>
+</template>
+
+<script>
+export default {
+  props: {
+    icon: {
+      type: String,
+    },
+  },
+  computed: {
+    iconClass() {
+      return this.$slots.default == null ? '--icon-only' : ''
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+.base-button {
+  display: inline-flex;
+  align-items: center;
+  height: 36px;
+  padding: 0 12px;
+  color: $color-primary;
+  background-color: $color-neutral-90;
+  border: 1px solid $color-primary;
+  border-radius: 6px;
+  font-weight: $font-weight-bold;
+  cursor: pointer;
+
+  > .base-icon:not(.--icon-only) {
+    margin-right: 6px;
+  }
+}
+</style>