diff --git a/packages/ui/src/components/Button.svelte b/packages/ui/src/components/Button.svelte
index 94f4016488..9af85da036 100644
--- a/packages/ui/src/components/Button.svelte
+++ b/packages/ui/src/components/Button.svelte
@@ -30,7 +30,7 @@
 </script>
 
 <button class="button {size}" class:primary class:transparent disabled={disabled || loading} style={width ? 'width: ' + width : ''} on:click>
-  {#if icon}
+  {#if icon && !loading}
     <div class="icon">
       {#if typeof (icon) === 'string'}
         <Icon {icon} size={'small'}/>
diff --git a/packages/ui/src/components/CircleButton.svelte b/packages/ui/src/components/CircleButton.svelte
index 2cabf630d6..888648d963 100644
--- a/packages/ui/src/components/CircleButton.svelte
+++ b/packages/ui/src/components/CircleButton.svelte
@@ -51,11 +51,11 @@
 
     &:hover {
       background-color: rgba(255, 255, 255, .25);
-      box-shadow: 0 0 1rem rgba(0, 0, 0, .3);
+      box-shadow: 0 0 .5rem rgba(0, 0, 0, .3);
     }
     &:active {
       background-color: rgba(255, 255, 255, .15);
-      box-shadow: 0 0 1rem rgba(0, 0, 0, .1);
+      box-shadow: 0 0 .5rem rgba(0, 0, 0, .1);
     }
   }
 </style>