diff --git a/app/pods/components/music-tab/template.hbs b/app/pods/components/music-tab/template.hbs
index 2a15014..3237d53 100644
--- a/app/pods/components/music-tab/template.hbs
+++ b/app/pods/components/music-tab/template.hbs
@@ -89,8 +89,8 @@
                 {{/if}}
               </div>
 
-              <div data-toggle="tooltip" data-placement="bottom auto" data-title="Remove" class="audioRemoveButton cursorPointer bootstrapTooltip" {{action "removeAudio" index bubbles=false}}>{{paper-icon icon="close"}}
-              </div>
+              <span data-toggle="tooltip" data-placement="bottom auto" data-title="Remove" data-container="body" class="audioRemoveButton cursorPointer bootstrapTooltip" {{action "removeAudio" index bubbles=false}}>{{paper-icon icon="close"}}
+              </span>
             </div>
           {{/each}}
         </div>
diff --git a/app/styles/app.scss b/app/styles/app.scss
index 10b4420..5f0ee7c 100644
--- a/app/styles/app.scss
+++ b/app/styles/app.scss
@@ -254,8 +254,8 @@ md-slider.md-default-theme .md-thumb:after {
 .lightGroup {
   margin: 0 auto 0 auto;
   .tooltip.top {
-    margin-top: -10px;
-    margin-left: -3px;
+    margin-top: 4px;
+    margin-left: 0;
   }
   div {
     display: inline-block;
@@ -273,8 +273,8 @@ md-slider.md-default-theme .md-thumb:after {
   font-weight: bold;
   position: absolute;
   content: "X";
-  top: 0;
-  left: 15px;
+  top: -10px;
+  left: 5px;
   font-size: 40px;
   color: rgba(255, 0, 0, 0.37);
   font-family: cursive;
@@ -286,8 +286,8 @@ md-slider.md-default-theme .md-thumb:after {
     left: 6px;
   }
   .tooltip.top {
-    margin-top: 2px;
-    margin-left: 0;
+    margin-top: 1px;
+    margin-left: 2px;
   }
 }
 
@@ -653,9 +653,6 @@ md-switch.md-default-theme.md-checked .md-thumb {
   color: black;
   background: darken(white, 5%);
   .close {
-    position: absolute;
-    top: 10%;
-    right: 10px;
     font-size: 18px;
   }
   .albumArt {
@@ -673,6 +670,11 @@ md-switch.md-default-theme.md-checked .md-thumb {
       overflow: hidden;
     }
   }
+  .audioRemoveButton {
+    position: absolute;
+    top: 40%;
+    right: 0;
+  }
 }
 
 .playlistItem.active {