diff --git a/web-src/src/components/ListItemAlbum.vue b/web-src/src/components/ListItemAlbum.vue
index a0eff23a..ef16d23e 100644
--- a/web-src/src/components/ListItemAlbum.vue
+++ b/web-src/src/components/ListItemAlbum.vue
@@ -1,5 +1,5 @@
 <template functional>
-  <div class="media" :id="'index_' + props.anchor">
+  <div class="media" :id="'index_' + props.album.name.charAt(0).toUpperCase()">
     <div class="media-content fd-has-action is-clipped" @click="listeners.click">
       <h1 class="title is-6">{{ props.album.name }}</h1>
       <h2 class="subtitle is-7 has-text-grey"><b>{{ props.album.artist }}</b></h2>
@@ -13,7 +13,7 @@
 <script>
 export default {
   name: 'ListItemAlbum',
-  props: ['album', 'media_kind', 'anchor']
+  props: ['album', 'media_kind']
 }
 </script>
 
diff --git a/web-src/src/components/ListItemArtist.vue b/web-src/src/components/ListItemArtist.vue
index 6d48b57f..d117614e 100644
--- a/web-src/src/components/ListItemArtist.vue
+++ b/web-src/src/components/ListItemArtist.vue
@@ -1,5 +1,5 @@
 <template functional>
-  <div class="media" :id="'index_' + props.anchor">
+  <div class="media" :id="'index_' + props.artist.name.charAt(0).toUpperCase()">
     <div class="media-content fd-has-action is-clipped" @click="listeners.click">
       <h1 class="title is-6">{{ props.artist.name }}</h1>
     </div>
@@ -12,7 +12,7 @@
 <script>
 export default {
   name: 'ListItemArtist',
-  props: ['artist', 'anchor']
+  props: ['artist']
 }
 </script>
 
diff --git a/web-src/src/components/ListItemGenre.vue b/web-src/src/components/ListItemGenre.vue
index 80d46adc..71bf4e68 100644
--- a/web-src/src/components/ListItemGenre.vue
+++ b/web-src/src/components/ListItemGenre.vue
@@ -1,5 +1,5 @@
 <template functional>
-  <div class="media" :id="'index_' + props.anchor">
+  <div class="media" :id="'index_' + props.genre.name.charAt(0).toUpperCase()">
     <div class="media-content fd-has-action is-clipped" @click="listeners.click">
       <h1 class="title is-6">{{ props.genre.name }}</h1>
     </div>
@@ -12,7 +12,7 @@
 <script>
 export default {
   name: 'ListItemGenre',
-  props: [ 'genre', 'anchor' ]
+  props: [ 'genre' ]
 }
 </script>
 
diff --git a/web-src/src/components/ListItemTrack.vue b/web-src/src/components/ListItemTrack.vue
index 951ce63e..3cc5e892 100644
--- a/web-src/src/components/ListItemTrack.vue
+++ b/web-src/src/components/ListItemTrack.vue
@@ -1,5 +1,5 @@
 <template functional>
-  <div class="media">
+  <div class="media" :id="'index_' + props.track.title.charAt(0).toUpperCase()">
     <div class="media-content fd-has-action is-clipped" @click="listeners.click">
       <h1 class="title is-6">{{ props.track.title }}</h1>
       <h2 class="subtitle is-7 has-text-grey"><b>{{ props.track.artist }}</b></h2>
diff --git a/web-src/src/pages/PageAlbums.vue b/web-src/src/pages/PageAlbums.vue
index 0e0dc4f8..85c4ce04 100644
--- a/web-src/src/pages/PageAlbums.vue
+++ b/web-src/src/pages/PageAlbums.vue
@@ -19,10 +19,9 @@
         </a>
       </template>
       <template slot="content">
-        <list-item-album v-for="(album, index) in albums.items"
+        <list-item-album v-for="album in albums.items"
           :key="album.id"
           :album="album"
-          :anchor="anchor(album, index)"
           @click="open_album(album)"
           v-if="!hide_singles || album.track_count > 2">
             <template slot="actions">
@@ -86,10 +85,6 @@ export default {
       this.$store.commit(types.HIDE_SINGLES, !this.hide_singles)
     },
 
-    anchor: function (album, index) {
-      return album.name_sort.charAt(0).toUpperCase()
-    },
-
     open_album: function (album) {
       this.$router.push({ path: '/music/albums/' + album.id })
     },
diff --git a/web-src/src/pages/PageArtists.vue b/web-src/src/pages/PageArtists.vue
index 15b9f191..48ec4640 100644
--- a/web-src/src/pages/PageArtists.vue
+++ b/web-src/src/pages/PageArtists.vue
@@ -19,10 +19,9 @@
         </a>
       </template>
       <template slot="content">
-        <list-item-artist v-for="(artist, index) in artists.items"
+        <list-item-artist v-for="artist in artists.items"
           :key="artist.id"
           :artist="artist"
-          :anchor="anchor(artist, index)"
           @click="open_artist(artist)"
           v-if="!hide_singles || artist.track_count > (artist.album_count * 2)">
             <template slot="actions">
@@ -88,10 +87,6 @@ export default {
       this.$store.commit(types.HIDE_SINGLES, !this.hide_singles)
     },
 
-    anchor: function (artist, index) {
-      return artist.name_sort.charAt(0).toUpperCase()
-    },
-
     open_artist: function (artist) {
       this.$router.push({ path: '/music/artists/' + artist.id })
     },
diff --git a/web-src/src/pages/PageGenre.vue b/web-src/src/pages/PageGenre.vue
index 90532b1c..9c7430b8 100644
--- a/web-src/src/pages/PageGenre.vue
+++ b/web-src/src/pages/PageGenre.vue
@@ -1,6 +1,9 @@
 <template>
   <div>
     <content-with-heading>
+      <template slot="options">
+        <index-button-list :index="index_list"></index-button-list>
+      </template>
       <template slot="heading-left">
         <p class="title is-4">{{ name }}</p>
       </template>
@@ -10,8 +13,8 @@
         </a>
       </template>
       <template slot="content">
-        <p class="heading has-text-centered-mobile">{{ genreAlbums.total }} albums | <a class="has-text-link" @click="open_tracks">tracks</a></p>
-        <list-item-albums v-for="album in genreAlbums.items" :key="album.id" :album="album" :links="links" @click="open_album(album)">
+        <p class="heading has-text-centered-mobile">{{ genre_albums.total }} albums | <a class="has-text-link" @click="open_tracks">tracks</a></p>
+        <list-item-albums v-for="album in genre_albums.items" :key="album.id" :album="album" @click="open_album(album)">
           <template slot="actions">
             <a @click="open_dialog(album)">
               <span class="icon has-text-dark"><i class="mdi mdi-dots-vertical mdi-18px"></i></span>
@@ -28,6 +31,7 @@
 import { LoadDataBeforeEnterMixin } from './mixin'
 import ContentWithHeading from '@/templates/ContentWithHeading'
 import TabsMusic from '@/components/TabsMusic'
+import IndexButtonList from '@/components/IndexButtonList'
 import ListItemAlbums from '@/components/ListItemAlbum'
 import ModalDialogAlbum from '@/components/ModalDialogAlbum'
 import webapi from '@/webapi'
@@ -39,40 +43,32 @@ const genreData = {
 
   set: function (vm, response) {
     vm.name = vm.$route.params.genre
-    vm.genreAlbums = response.data.albums
-    var li = 0
-    var v = null
-    var i
-    for (i = 0; i < vm.genreAlbums.items.length; i++) {
-      var n = vm.genreAlbums.items[i].name_sort.charAt(0).toUpperCase()
-      if (n !== v) {
-        var obj = {}
-        obj.n = n
-        obj.a = 'idx_nav_' + li
-        vm.links.push(obj)
-        li++
-        v = n
-      }
-    }
+    vm.genre_albums = response.data.albums
   }
 }
 
 export default {
   name: 'PageGenre',
   mixins: [ LoadDataBeforeEnterMixin(genreData) ],
-  components: { ContentWithHeading, TabsMusic, ListItemAlbums, ModalDialogAlbum },
+  components: { ContentWithHeading, TabsMusic, IndexButtonList, ListItemAlbums, ModalDialogAlbum },
 
   data () {
     return {
       name: '',
-      genreAlbums: {},
-      links: [],
+      genre_albums: { items: [] },
 
       show_details_modal: false,
       selected_album: {}
     }
   },
 
+  computed: {
+    index_list () {
+      return [...new Set(this.genre_albums.items
+        .map(album => album.name.charAt(0).toUpperCase()))]
+    }
+  },
+
   methods: {
     open_tracks: function () {
       this.show_details_modal = false
@@ -80,7 +76,7 @@ export default {
     },
 
     play: function () {
-      webapi.player_play_uri(this.genreAlbums.items.map(a => a.uri).join(','), true)
+      webapi.player_play_uri(this.genre_albums.items.map(a => a.uri).join(','), true)
     },
 
     open_album: function (album) {
diff --git a/web-src/src/pages/PageGenreTracks.vue b/web-src/src/pages/PageGenreTracks.vue
index 3e3f63f0..37eae310 100644
--- a/web-src/src/pages/PageGenreTracks.vue
+++ b/web-src/src/pages/PageGenreTracks.vue
@@ -1,6 +1,9 @@
 <template>
   <div>
     <content-with-heading>
+      <template slot="options">
+        <index-button-list :index="index_list"></index-button-list>
+      </template>
       <template slot="heading-left">
         <p class="title is-4">{{ genre }}</p>
       </template>
@@ -27,6 +30,7 @@
 <script>
 import { LoadDataBeforeEnterMixin } from './mixin'
 import ContentWithHeading from '@/templates/ContentWithHeading'
+import IndexButtonList from '@/components/IndexButtonList'
 import ListItemTrack from '@/components/ListItemTrack'
 import ModalDialogTrack from '@/components/ModalDialogTrack'
 import webapi from '@/webapi'
@@ -45,11 +49,11 @@ const tracksData = {
 export default {
   name: 'PageGenreTracks',
   mixins: [ LoadDataBeforeEnterMixin(tracksData) ],
-  components: { ContentWithHeading, ListItemTrack, ModalDialogTrack },
+  components: { ContentWithHeading, ListItemTrack, IndexButtonList, ModalDialogTrack },
 
   data () {
     return {
-      tracks: {},
+      tracks: { items: [] },
       genre: '',
 
       show_details_modal: false,
@@ -57,6 +61,13 @@ export default {
     }
   },
 
+  computed: {
+    index_list () {
+      return [...new Set(this.tracks.items
+        .map(track => track.title.charAt(0).toUpperCase()))]
+    }
+  },
+
   methods: {
     open_genre: function () {
       this.show_details_modal = false
diff --git a/web-src/src/pages/PageGenres.vue b/web-src/src/pages/PageGenres.vue
index 1db7adec..76055bcc 100644
--- a/web-src/src/pages/PageGenres.vue
+++ b/web-src/src/pages/PageGenres.vue
@@ -11,7 +11,7 @@
         <p class="heading">{{ genres.total }} genres</p>
       </template>
       <template slot="content">
-        <list-item-genre v-for="(genre, index) in genres.items" :key="genre.name" :genre="genre" :anchor="anchor(genre, index)" @click="open_genre(genre)">
+        <list-item-genre v-for="genre in genres.items" :key="genre.name" :genre="genre" @click="open_genre(genre)">
           <template slot="actions">
             <a @click="open_dialog(genre)">
               <span class="icon has-text-dark"><i class="mdi mdi-dots-vertical mdi-18px"></i></span>
@@ -65,10 +65,6 @@ export default {
   },
 
   methods: {
-    anchor: function (genre, index) {
-      return genre.name.charAt(0).toUpperCase()
-    },
-
     open_genre: function (genre) {
       this.$router.push({ name: 'Genre', params: { genre: genre.name } })
     },
diff --git a/web-src/src/router/index.js b/web-src/src/router/index.js
index 90287fbc..1faddcfa 100644
--- a/web-src/src/router/index.js
+++ b/web-src/src/router/index.js
@@ -112,13 +112,13 @@ export const router = new VueRouter({
       path: '/music/genres/:genre',
       name: 'Genre',
       component: PageGenre,
-      meta: { show_progress: true }
+      meta: { show_progress: true, has_index: true }
     },
     {
       path: '/music/genres/:genre/tracks',
       name: 'GenreTracks',
       component: PageGenreTracks,
-      meta: { show_progress: true }
+      meta: { show_progress: true, has_index: true }
     },
     {
       path: '/podcasts',