diff --git a/radiant-player-mac/css/common.css b/radiant-player-mac/css/common.css
index 6e9c7c30..b4412568 100644
--- a/radiant-player-mac/css/common.css
+++ b/radiant-player-mac/css/common.css
@@ -14,4 +14,10 @@
     top: 128px;
     height: auto;
     margin-top: 0;
+}
+
+/* Fix the display of the menu bar on OS X 10.10 */
+#material-app-bar .material-header-bar.visible {
+    display: -webkit-flex;
+    display: flex;
 }
\ No newline at end of file
diff --git a/radiant-player-mac/css/spotify-black.css b/radiant-player-mac/css/spotify-black.css
index 0c71e2c8..30cd96fb 100644
--- a/radiant-player-mac/css/spotify-black.css
+++ b/radiant-player-mac/css/spotify-black.css
@@ -249,7 +249,7 @@ a, .simple-dialog a {
     border-color: #333;
 }
 
-#nav, core-header-panel#nav-container, .nav-toolbar {
+#nav, core-header-panel#nav-container, .material .nav-toolbar {
     background-color: #222326;
     border-right: 1px solid #292929;
 }
@@ -263,7 +263,7 @@ a, .simple-dialog a {
     font-size: 13px !important;
     font-weight: 400 !important;
     color: #949599 !important;
-    padding: 5px 0 5px 16px;
+    padding: 5px 0 5px 32px;
     border-left: 3px solid transparent;
 }
 
@@ -288,7 +288,7 @@ a, .simple-dialog a {
 }
 
 .material .nav-section-header {
-    padding-left: 0;
+    padding-left: 16px;
     font-weight: 300;
     color: #777;
     text-shadow: 0px -1px 0px #222;
diff --git a/radiant-player-mac/js/lastfm.js b/radiant-player-mac/js/lastfm.js
index efbe834d..56e43689 100644
--- a/radiant-player-mac/js/lastfm.js
+++ b/radiant-player-mac/js/lastfm.js
@@ -16,7 +16,7 @@ if (typeof window.LastFmButton === 'undefined') {
     window.LastFmButton = true;
 
     // Obtain the area on the top-right, containing the Google account information.
-    var rightArea = document.querySelector('#material-one-right > div:first-child > div:first-child > div:first-child');
+    var rightArea = document.querySelector('#material-one-right > div > div > div');
 
     // Add a button that, when clicked, opens the Last.fm popover.
     var lastfmButton = document.createElement('a');
diff --git a/radiant-player-mac/js/navigation.js b/radiant-player-mac/js/navigation.js
index 1fed1a22..0a3d0852 100644
--- a/radiant-player-mac/js/navigation.js
+++ b/radiant-player-mac/js/navigation.js
@@ -45,7 +45,7 @@ if (typeof window.GMNavigation === 'undefined') {
     if (!keepLinks)
     {
         // Obtain the area on the top-right, containing the Google account information.
-        var rightArea = document.querySelector('#material-one-right > div:first-child > div:first-child > div:first-child');
+        var rightArea = document.querySelector('#material-one-right > div > div > div');
         rightArea.style.minWidth = 0;
         
         // Remove all of the children, except the last (the user button).