diff --git a/apps/dapp/components/BetaWarning.tsx b/apps/dapp/components/BetaWarning.tsx
index 8d7bbde6a..b81e08c90 100644
--- a/apps/dapp/components/BetaWarning.tsx
+++ b/apps/dapp/components/BetaWarning.tsx
@@ -1,4 +1,5 @@
 import { ChevronRightIcon, XIcon } from '@heroicons/react/outline'
+
 import { Button } from '@components'
 
 import SvgMessage from 'components/icons/Message'
diff --git a/apps/dapp/components/CodeIdSelect.tsx b/apps/dapp/components/CodeIdSelect.tsx
index 999e9a38a..478339a32 100644
--- a/apps/dapp/components/CodeIdSelect.tsx
+++ b/apps/dapp/components/CodeIdSelect.tsx
@@ -20,11 +20,8 @@ export default function CodeIdSelect({
     <div className="flex items-center">
       <span className="font-medium px-2">Contract Version</span>
       <div className="dropdown dropdown-end">
-        <Button
-          size="sm"
-          iconAfter={<ChevronDownIcon className="inline h-4 w-4" />}
-        >
-          {currentVersion.name}
+        <Button size="sm">
+          {currentVersion.name} <ChevronDownIcon className="inline h-4 w-4" />
         </Button>
         <ul
           tabIndex={0}
diff --git a/apps/dapp/components/ConnectWalletButton.tsx b/apps/dapp/components/ConnectWalletButton.tsx
index 3ab665b5f..b464c2810 100644
--- a/apps/dapp/components/ConnectWalletButton.tsx
+++ b/apps/dapp/components/ConnectWalletButton.tsx
@@ -26,8 +26,8 @@ import {
   convertMicroDenomToDenomWithDecimals,
 } from 'util/conversion'
 
-import SvgWallet from './icons/Wallet'
 import SvgCopy from './icons/Copy'
+import SvgWallet from './icons/Wallet'
 
 function CopyButton({ text }: { text: string }) {
   const [copied, setCopied] = useState(false)
diff --git a/apps/dapp/components/ContractCard.tsx b/apps/dapp/components/ContractCard.tsx
index 6bfe76996..dade90df6 100644
--- a/apps/dapp/components/ContractCard.tsx
+++ b/apps/dapp/components/ContractCard.tsx
@@ -37,7 +37,7 @@ function DIYLogo({
   proposals?: number
   balance?: string
   children: ReactNode
-  token: boolean
+  token?: boolean
 }) {
   return (
     <Link href={href}>
diff --git a/apps/dapp/components/ContractView.tsx b/apps/dapp/components/ContractView.tsx
index 9d1f14daf..30b0e6f57 100644
--- a/apps/dapp/components/ContractView.tsx
+++ b/apps/dapp/components/ContractView.tsx
@@ -4,10 +4,11 @@ import Link from 'next/link'
 
 import { useRecoilValue, waitForAll } from 'recoil'
 
-import { Button } from '@components'
-
 import { StarIcon as StarOutline, PlusIcon } from '@heroicons/react/outline'
 import { StarIcon as StarSolid } from '@heroicons/react/solid'
+import { useThemeContext } from 'ui'
+
+import { Button } from '@components'
 
 import { contractInstantiateTime } from 'selectors/contracts'
 import { isMemberSelector } from 'selectors/daos'
@@ -28,7 +29,6 @@ import {
 
 import { Logo, LogoNoBorder } from './Logo'
 import { ProposalList } from './ProposalList'
-import { useThemeContext } from 'ui'
 
 export function GradientHero({ children }: { children: ReactNode }) {
   const theme = useThemeContext()
diff --git a/apps/dapp/components/CopyToClipboard.tsx b/apps/dapp/components/CopyToClipboard.tsx
index d497248b2..21b40608e 100644
--- a/apps/dapp/components/CopyToClipboard.tsx
+++ b/apps/dapp/components/CopyToClipboard.tsx
@@ -1,6 +1,8 @@
-import { CheckCircleIcon, PaperClipIcon } from '@heroicons/react/outline'
 import { useState } from 'react'
+
+import { CheckCircleIcon, PaperClipIcon } from '@heroicons/react/outline'
 import toast from 'react-hot-toast'
+
 import SvgCopy from './icons/Copy'
 
 function concatAddressImpl(
diff --git a/apps/dapp/components/Execute.tsx b/apps/dapp/components/Execute.tsx
index 5c8aca166..997477cf5 100644
--- a/apps/dapp/components/Execute.tsx
+++ b/apps/dapp/components/Execute.tsx
@@ -1,6 +1,8 @@
 import { useState } from 'react'
 import { FC } from 'react'
+
 import { Button } from 'ui'
+
 import SvgAirplane from './icons/Airplane'
 
 export interface ExecuteProps {
diff --git a/apps/dapp/components/Paginator.tsx b/apps/dapp/components/Paginator.tsx
index af40575b2..b95a3b81c 100644
--- a/apps/dapp/components/Paginator.tsx
+++ b/apps/dapp/components/Paginator.tsx
@@ -1,4 +1,5 @@
 import Link from 'next/link'
+
 import { Button } from 'ui'
 
 function Paginator({
diff --git a/apps/dapp/components/ProposalDetails.tsx b/apps/dapp/components/ProposalDetails.tsx
index df48a174d..6631d484e 100644
--- a/apps/dapp/components/ProposalDetails.tsx
+++ b/apps/dapp/components/ProposalDetails.tsx
@@ -21,6 +21,7 @@ import {
 } from '@heroicons/react/outline'
 import { FormProvider, useForm } from 'react-hook-form'
 import toast from 'react-hot-toast'
+import { Button } from 'ui'
 
 import { ProposalStatus } from '@components'
 
@@ -60,12 +61,11 @@ import { decodedMessagesString, decodeMessages } from 'util/messagehelpers'
 import { treasuryTokenListUpdates } from '../atoms/treasury'
 import { CopyToClipboard } from './CopyToClipboard'
 import { CosmosMessageDisplay } from './CosmosMessageDisplay'
-import { getEnd } from './ProposalList'
+import { Execute } from './Execute'
+import SvgAbstain from './icons/Abstain'
 import { Progress } from './Progress'
-import { Button } from 'ui'
+import { getEnd } from './ProposalList'
 import { Vote, VoteChoice } from './Vote'
-import SvgAbstain from './icons/Abstain'
-import { Execute } from './Execute'
 
 function executeProposalVote(
   choice: VoteChoice,
diff --git a/apps/dapp/components/ProposalForm.tsx b/apps/dapp/components/ProposalForm.tsx
index 699f3a394..f036944ec 100644
--- a/apps/dapp/components/ProposalForm.tsx
+++ b/apps/dapp/components/ProposalForm.tsx
@@ -5,6 +5,7 @@ import { useRecoilValue } from 'recoil'
 import { CosmosMsgFor_Empty } from '@dao-dao/types/contracts/cw3-dao'
 import { EyeIcon, EyeOffIcon, PlusIcon, XIcon } from '@heroicons/react/outline'
 import { FormProvider, useFieldArray, useForm } from 'react-hook-form'
+import { Button } from 'ui'
 
 import { walletAddress } from 'selectors/treasury'
 import {
@@ -29,7 +30,6 @@ import { TextareaInput } from './input/TextAreaInput'
 import { TextInput } from './input/TextInput'
 import { MarkdownPreview } from './MarkdownPreview'
 import { ProposalTemplateSelector } from './TemplateSelector'
-import { Button } from 'ui'
 
 interface FormProposalData {
   title: string
diff --git a/apps/dapp/components/ProposalVoteStatus.tsx b/apps/dapp/components/ProposalVoteStatus.tsx
deleted file mode 100644
index 240771100..000000000
--- a/apps/dapp/components/ProposalVoteStatus.tsx
+++ /dev/null
@@ -1,68 +0,0 @@
-import { Suspense } from 'react'
-
-import { useRecoilValue } from 'recoil'
-
-import { CheckIcon, XIcon } from '@heroicons/react/outline'
-
-import { walletVotedSelector } from 'selectors/proposals'
-
-import { LogoNoBorder } from './Logo'
-
-const VoteStatusLoading = () => {
-  return (
-    <div className="flex flex-row flex-wrap items-center gap-1">
-      <div className="animate-spin-medium inline-block">
-        <LogoNoBorder />
-      </div>
-      <p className="text-secondary text-sm">Loading vote status.</p>
-    </div>
-  )
-}
-
-const VoteStatusLoaded = ({
-  contractAddress,
-  proposalId,
-}: {
-  contractAddress: string
-  proposalId: number
-}) => {
-  const voted = useRecoilValue(
-    walletVotedSelector({
-      contractAddress,
-      proposalId,
-    })
-  )
-  if (voted) {
-    return (
-      <div className="flex items-center flex-row flex-wrap gap-1">
-        <CheckIcon className="text-success w-4" />
-        <p className="text-secondary text-sm">You have voted.</p>
-      </div>
-    )
-  }
-  return (
-    <div className="flex items-center flex-row flex-wrap gap-1">
-      <XIcon className="w-4" />
-      <p className="text-secondary text-sm">You have not voted.</p>
-    </div>
-  )
-}
-
-const ProposalVoteStatus = ({
-  contractAddress,
-  proposalId,
-}: {
-  contractAddress: string
-  proposalId: number
-}) => {
-  return (
-    <Suspense fallback={<VoteStatusLoading />}>
-      <VoteStatusLoaded
-        contractAddress={contractAddress}
-        proposalId={proposalId}
-      />
-    </Suspense>
-  )
-}
-
-export default ProposalVoteStatus
diff --git a/apps/dapp/components/SidebarLayout.tsx b/apps/dapp/components/SidebarLayout.tsx
index c72f2bf55..c10f8a769 100644
--- a/apps/dapp/components/SidebarLayout.tsx
+++ b/apps/dapp/components/SidebarLayout.tsx
@@ -4,11 +4,11 @@ import { useState } from 'react'
 import Link from 'next/link'
 
 import { MenuIcon } from '@heroicons/react/outline'
+import ReactTooltip from 'react-tooltip'
 
 import { SITE_TITLE } from '../util/constants'
 import { Logo } from './Logo'
 import Nav from './Nav'
-import ReactTooltip from 'react-tooltip'
 
 const SmallScreenNav = ({ onMenuClick }: { onMenuClick: () => void }) => {
   return (
diff --git a/apps/dapp/components/StakingModal.tsx b/apps/dapp/components/StakingModal.tsx
index 8c8460cdc..da952ebd8 100644
--- a/apps/dapp/components/StakingModal.tsx
+++ b/apps/dapp/components/StakingModal.tsx
@@ -18,6 +18,7 @@ import {
   XIcon,
 } from '@heroicons/react/outline'
 import toast from 'react-hot-toast'
+import { Button } from 'ui'
 
 import {
   cosmWasmSigningClient,
@@ -36,7 +37,7 @@ import {
   convertMicroDenomToDenomWithDecimals,
   humanReadableDuration,
 } from 'util/conversion'
-import { Button } from 'ui'
+
 import { Modal } from './Modal'
 
 export enum StakingMode {
diff --git a/apps/dapp/components/TemplateSelector.tsx b/apps/dapp/components/TemplateSelector.tsx
index 4706d6afe..c181a706f 100644
--- a/apps/dapp/components/TemplateSelector.tsx
+++ b/apps/dapp/components/TemplateSelector.tsx
@@ -1,7 +1,9 @@
-import { Config } from 'util/contractConfigWrapper'
+import { XIcon } from '@heroicons/react/outline'
+
 import { ContractSupport, MessageTemplate } from 'templates/templateList'
+import { Config } from 'util/contractConfigWrapper'
+
 import { Modal } from './Modal'
-import { XIcon } from '@heroicons/react/outline'
 
 export function MessageTemplateDisplayItem({
   template,
diff --git a/apps/dapp/components/Vote.tsx b/apps/dapp/components/Vote.tsx
index 66a4e2e34..7338ea320 100644
--- a/apps/dapp/components/Vote.tsx
+++ b/apps/dapp/components/Vote.tsx
@@ -1,6 +1,8 @@
-import { CheckIcon, XIcon } from '@heroicons/react/outline'
 import { FC, useState } from 'react'
+
+import { CheckIcon, XIcon } from '@heroicons/react/outline'
 import { Button } from 'ui'
+
 import SvgAbstain from './icons/Abstain'
 import SvgAirplane from './icons/Airplane'
 
diff --git a/apps/dapp/pages/_app.tsx b/apps/dapp/pages/_app.tsx
index a80697831..252038fde 100644
--- a/apps/dapp/pages/_app.tsx
+++ b/apps/dapp/pages/_app.tsx
@@ -8,6 +8,7 @@ import { useRouter } from 'next/router'
 
 import { RecoilRoot } from 'recoil'
 
+import ReactTooltip from 'react-tooltip'
 import { DEFAULT_THEME_NAME, ThemeProvider } from 'ui'
 
 import ErrorBoundary from 'components/ErrorBoundary'
@@ -15,7 +16,6 @@ import { HomepageLayout } from 'components/HomepageLayout'
 import SidebarLayout from 'components/Layout'
 import LoadingScreen from 'components/LoadingScreen'
 import Notifications from 'components/Notifications'
-import ReactTooltip from 'react-tooltip'
 
 function MyApp({ Component, pageProps }: AppProps) {
   const router = useRouter()
diff --git a/apps/dapp/pages/index.tsx b/apps/dapp/pages/index.tsx
index 33cf105a5..015333c18 100644
--- a/apps/dapp/pages/index.tsx
+++ b/apps/dapp/pages/index.tsx
@@ -12,6 +12,7 @@ import {
 
 import { Button } from '@components'
 
+import SvgArrowUpRight from '@components/icons/ArrowUpRight'
 import SvgDiscord from '@components/icons/Discord'
 import { GradientWrapper } from 'components/GradientWrapper'
 import SvgGithub from 'components/icons/Github'
@@ -20,7 +21,6 @@ import { Logo } from 'components/Logo'
 import ThemeToggle from 'components/ThemeToggle'
 
 import { SITE_TITLE } from '../util/constants'
-import SvgArrowUpRight from '@components/icons/ArrowUpRight'
 
 function EnterAppButton({ small }: { small?: boolean }) {
   return (
diff --git a/apps/dapp/pages/multisig/[contractAddress]/index.tsx b/apps/dapp/pages/multisig/[contractAddress]/index.tsx
index b3baef1d0..6149c7c9f 100644
--- a/apps/dapp/pages/multisig/[contractAddress]/index.tsx
+++ b/apps/dapp/pages/multisig/[contractAddress]/index.tsx
@@ -10,6 +10,7 @@ import {
   VariableIcon,
 } from '@heroicons/react/outline'
 
+import { CopyToClipboard } from '@components/CopyToClipboard'
 import { MultisigContractInfo } from '@components/MultisigContractInfo'
 import { pinnedMultisigsAtom } from 'atoms/pinned'
 import { sidebarExpandedAtom } from 'atoms/sidebar'
@@ -31,7 +32,6 @@ import {
   totalWeight,
 } from 'selectors/multisigs'
 import { walletAddress } from 'selectors/treasury'
-import { CopyToClipboard } from '@components/CopyToClipboard'
 
 const thresholdString = (t: Threshold) => {
   if ('absolute_count' in t) {
diff --git a/apps/dapp/pages/multisig/list.tsx b/apps/dapp/pages/multisig/list.tsx
index b32363665..2f14aa324 100644
--- a/apps/dapp/pages/multisig/list.tsx
+++ b/apps/dapp/pages/multisig/list.tsx
@@ -18,6 +18,7 @@ import {
   SparklesIcon,
   UserIcon,
 } from '@heroicons/react/outline'
+import { Button } from 'ui'
 
 import { pinnedMultisigsAtom } from 'atoms/pinned'
 import { sidebarExpandedAtom } from 'atoms/sidebar'
@@ -38,7 +39,6 @@ import {
   MULTISIG_CODE_ID,
   NATIVE_DENOM,
 } from 'util/constants'
-import { Button } from 'ui'
 
 export function MultisigCard({
   multisig,
diff --git a/apps/dapp/templates/addToken.tsx b/apps/dapp/templates/addToken.tsx
index e3051eafb..30401168e 100644
--- a/apps/dapp/templates/addToken.tsx
+++ b/apps/dapp/templates/addToken.tsx
@@ -110,7 +110,6 @@ export const TokenSelector = ({
           register={register}
           error={errors?.to}
           validation={[validateRequired, validateContractAddress]}
-          border={false}
           disabled={readOnly}
         />
         <InputErrorMessage error={errors?.to} />
diff --git a/apps/dapp/templates/changeMembers.tsx b/apps/dapp/templates/changeMembers.tsx
index 94b181eb2..4793717aa 100644
--- a/apps/dapp/templates/changeMembers.tsx
+++ b/apps/dapp/templates/changeMembers.tsx
@@ -124,7 +124,6 @@ export const ChangeMembersComponent: TemplateComponent = ({
                     validateRequired,
                     validateNotMember,
                   ]}
-                  border={false}
                   disabled={readOnly}
                 />
                 <InputErrorMessage error={addrError} />
@@ -136,7 +135,6 @@ export const ChangeMembersComponent: TemplateComponent = ({
                     register={register}
                     error={weightError}
                     validation={[validatePositive, validateRequired]}
-                    border={false}
                     disabled={readOnly}
                   />
                   <InputErrorMessage error={weightError} />
@@ -183,7 +181,6 @@ export const ChangeMembersComponent: TemplateComponent = ({
                 register={register}
                 error={addrError}
                 validation={[validateAddress, validateRequired, validateMember]}
-                border={false}
                 disabled={readOnly}
               />
               <InputErrorMessage error={addrError} />
diff --git a/apps/dapp/templates/removeToken.tsx b/apps/dapp/templates/removeToken.tsx
index 78e92c67c..2d90e3f32 100644
--- a/apps/dapp/templates/removeToken.tsx
+++ b/apps/dapp/templates/removeToken.tsx
@@ -113,7 +113,6 @@ export const RemoveTokenComponent: TemplateComponent = ({
             validateContractAddress,
             validateIsTreasuryToken,
           ]}
-          border={false}
           disabled={readOnly}
         />
         <InputErrorMessage error={errors?.address} />
diff --git a/packages/ui/package.json b/packages/ui/package.json
index a89b2c6d0..4694b33bc 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -13,9 +13,6 @@
     "storybook": "start-storybook --ci -p 6006 --no-manager-cache",
     "build-storybook": "build-storybook"
   },
-    "dependencies": {
-	"@dao-dao/dapp": "*"
-    },
   "devDependencies": {
     "@babel/core": "^7.17.5",
     "@storybook/addon-actions": "^6.4.19",