diff --git a/app/pods/components/music-tab/template.hbs b/app/pods/components/music-tab/template.hbs
index 53ff82f..ebcc03e 100644
--- a/app/pods/components/music-tab/template.hbs
+++ b/app/pods/components/music-tab/template.hbs
@@ -142,8 +142,8 @@
 <div id="playerBottom" class="row {{if dimmerOn "dimmerOn"}}">
 <div id="beatArea" class="col-sm-7 col-xs-12">
 {{#if usingBeatPreferences}}
-  <span data-toggle="tooltip" data-placement="bottom" data-title="Using the saved sensitivity preference from the last time you listened to this song" class="bootstrapTooltip savedStarTooltip">
-  {{paper-icon id="saveBeatPreferencesStar" class=dimmerOnClass icon="star"}}
+  <span data-toggle="tooltip" data-placement="bottom" data-title="Using the saved sensitivity preference from the last time you listened to this song" class="bootstrapTooltip savedStarTooltip" id="saveBeatPreferencesStar">
+  {{paper-icon class=dimmerOnClass icon="star"}}
   </span>
 {{/if}}
 
diff --git a/app/styles/app.scss b/app/styles/app.scss
index c1069f8..afacdc7 100644
--- a/app/styles/app.scss
+++ b/app/styles/app.scss
@@ -844,10 +844,6 @@ md-switch.md-default-theme.md-checked .md-thumb {
   cursor: auto !important;
 }
 
-.savedStarTooltip + .tooltip .tooltip-arrow {
-  margin-left: 12px;
-}
-
 #beatOptionButtonGroup {
   margin: 20px 0 10px 0;
 }
@@ -1011,8 +1007,10 @@ body.dimmerOn {
   position: absolute;
   top: 3px;
   left: 3px;
-  color: $secondaryThemeColor !important;
-  font-size: 25px;
+  md-icon {
+    color: $secondaryThemeColor !important;
+    font-size: 25px;
+  }
 }
 
 button.md-warn {