diff --git a/packages/dapp-svelte-wallet/ui/lib/Button.svelte b/packages/dapp-svelte-wallet/ui/lib/Button.svelte
new file mode 100644
index 00000000000..734e9153420
--- /dev/null
+++ b/packages/dapp-svelte-wallet/ui/lib/Button.svelte
@@ -0,0 +1,166 @@
+<script>
+  import Icon from "smelte/src/components/Icon";
+  import utils, { ClassBuilder, filterProps } from "smelte/src/utils/classes.js";
+  import createRipple from "smelte/src/components/Ripple/ripple.js";
+
+
+
+  export let value = false;
+  export let outlined = false;
+  export let text = false;
+  export let block = false;
+  export let disabled = false;
+  export let icon = null;
+  export let small = false;
+  export let light = false;
+  export let dark = false;
+  export let flat = false;
+  export let iconClass = "";
+  export let color = "primary";
+  export let href = null;
+  export let fab = false;
+
+  export let remove = "";
+  export let add = "";
+  export let replace = {};
+
+  const classesDefault = 'py-2 px-4 uppercase text-sm font-medium relative overflow-hidden';
+  const basicDefault = 'text-white duration-200 ease-in';
+  const outlinedDefault = 'bg-transparent border border-solid';
+  const textDefault = 'bg-transparent border-none px-4 hover:bg-transparent';
+  const iconDefault = 'p-4 flex items-center select-none';
+  const fabDefault = 'hover:bg-transparent';
+  const smallDefault = 'pt-1 pb-1 pl-2 pr-2 text-xs';
+  const disabledDefault = 'bg-gray-300 text-gray-500 dark:bg-dark-400 elevation-none pointer-events-none hover:bg-gray-300 cursor-default';
+  const elevationDefault = 'hover:elevation-5 elevation-3';
+
+  export let classes = classesDefault;
+  export let basicClasses = basicDefault;
+  export let outlinedClasses = outlinedDefault;
+  export let textClasses = textDefault;
+  export let iconClasses = iconDefault;
+  export let fabClasses = fabDefault;
+  export let smallClasses = smallDefault;
+  export let disabledClasses = disabledDefault;
+  export let elevationClasses = elevationDefault;
+
+  fab = fab || (text && icon);
+  const basic = !outlined && !text && !fab;
+  const elevation = (basic || icon) && !disabled && !flat && !text;
+
+  let Classes = i => i;
+  let iClasses = i => i;
+  let shade = 0;
+
+  $: {
+    shade = light ? 200 : 0;
+    shade = dark ? -400 : shade;
+  }
+  $: normal = 500 - shade;
+  $: lighter = 400 - shade;
+
+  $: ({
+    bg,
+    border,
+    txt,
+  } = utils(color));
+
+  const cb = new ClassBuilder(classes, classesDefault);
+  let iconCb;
+
+  if (icon) {
+    iconCb = new ClassBuilder(iconClass);
+  }
+
+  $: classes = cb
+      .flush()
+      .add(basicClasses, basic, basicDefault)
+      .add(`${bg(normal)} hover:${bg(lighter)}`, basic)
+      .add(elevationClasses, elevation, elevationDefault)
+      .add(outlinedClasses, outlined, outlinedDefault)
+      .add(
+        `${border(lighter)} ${txt(normal)} hover:${bg("trans")} dark-hover:${bg("transDark")}`,
+        outlined)
+      .add(`${txt(lighter)}`, text)
+      .add(textClasses, text, textDefault)
+      .add(iconClasses, icon, iconDefault)
+      .remove("py-2", icon)
+      .remove(txt(lighter), fab)
+      .add(disabledClasses, disabled, disabledDefault)
+      .add(smallClasses, small, smallDefault)
+      .add("flex items-center justify-center h-8 w-8", small && icon)
+      .add("border-solid", outlined)
+      .add("rounded-full", icon)
+      .add("w-full", block)
+      .add("rounded", basic || outlined || text)
+      .add("button", !icon)
+      .add(fabClasses, fab, fabDefault)
+      .add(`hover:${bg("transLight")}`, fab)
+      .add($$props.class)
+      .remove(remove)
+      .replace(replace)
+      .add(add)
+      .get();
+
+  $: if (iconCb) {
+    iClasses = iconCb.flush().add(txt(), fab && !iconClass).get();
+  }
+
+  const ripple = createRipple((text || fab || outlined) ? color : "white");
+
+  const props = filterProps([
+    'outlined',
+    'text',
+    'color',
+    'block',
+    'disabled',
+    'icon',
+    'small',
+    'light',
+    'dark',
+    'flat',
+    'add',
+    'remove',
+    'replace',
+  ], $$props);
+</script>
+
+
+{#if href}
+  <a
+    {href}
+    {...props}
+  >
+    <button
+      use:ripple
+      class={classes}
+      {...props}
+      {disabled}
+      on:click={() => (value = !value)}
+      on:click
+      on:mouseover
+      on:*
+    >
+      {#if icon}
+        <Icon class={iClasses} {small}>{icon}</Icon>
+      {/if}
+      <slot />
+    </button>
+  </a>
+{:else}
+  <button
+    use:ripple
+    class={classes}
+    {...props}
+    {disabled}
+    on:click={() => (value = !value)}
+    on:click
+    on:mouseover
+    on:*
+  >
+    {#if icon}
+      <Icon class={iClasses} {small}>{icon}</Icon>
+    {/if}
+    <slot />
+  </button>
+{/if}
diff --git a/packages/dapp-svelte-wallet/ui/lib/MenuButton.svelte b/packages/dapp-svelte-wallet/ui/lib/MenuButton.svelte
index 9a968f5c286..f4d89ddd8a6 100644
--- a/packages/dapp-svelte-wallet/ui/lib/MenuButton.svelte
+++ b/packages/dapp-svelte-wallet/ui/lib/MenuButton.svelte
@@ -1,5 +1,6 @@
 <script>
-  import Button from 'smelte/src/components/Button';
+  import Button from './Button.svelte';
+  // import Button from 'smelte/src/components/Button';
 
   export let text = '';
   export let id;
@@ -8,15 +9,7 @@
   $: highlighted = value === id;
 </script>
 
-<style>
-  .highlighted {
-    background-color: var(--color-secondary-500);
-  }
-</style>
-
-<div class:highlighted>
-  <Button outlined={id === value}
-    text fab flat
-    on:click={() => (value = id)} {color}
-  ><slot>{text}</slot></Button>
-</div>
+<Button outlined={id === value}
+  text fab flat
+  on:click={() => (value = id)} color={value === id ? 'secondary' : color}
+><slot>{text}</slot></Button>
diff --git a/packages/dapp-svelte-wallet/ui/src/App.svelte b/packages/dapp-svelte-wallet/ui/src/App.svelte
index eff302310a8..1740f51108b 100644
--- a/packages/dapp-svelte-wallet/ui/src/App.svelte
+++ b/packages/dapp-svelte-wallet/ui/src/App.svelte
@@ -102,7 +102,6 @@
   nav :global(button) {
     /* remove the padding at the bottom */
     margin: auto;
-    color: var(--color-secondary);
   }
   nav h6 {
     text-transform: uppercase;
@@ -176,7 +175,7 @@
       <nav>
         <ListItems horizontal items={menu} on:change>
           <div slot="item" let:item>
-            <MenuButton id={item.id} text={item.text} bind:value={navPanel} color="secondary"/>
+            <MenuButton id={item.id} text={item.text} bind:value={navPanel} color="primary"/>
           </div>
         </ListItems>