diff --git a/packages/app/app/containers/AlbumViewContainer/__snapshots__/AlbumViewContainer.test.tsx.snap b/packages/app/app/containers/AlbumViewContainer/__snapshots__/AlbumViewContainer.test.tsx.snap
index e3d17fecb1..39278d0148 100644
--- a/packages/app/app/containers/AlbumViewContainer/__snapshots__/AlbumViewContainer.test.tsx.snap
+++ b/packages/app/app/containers/AlbumViewContainer/__snapshots__/AlbumViewContainer.test.tsx.snap
@@ -292,42 +292,44 @@ exports[`Album view container should display an album 1`] = `
                           />
                         </button>
                       </div>
-                      <div
-                        class="grid_track_table_cell text_cell title_cell"
-                        data-testid="title-cell"
-                        role="cell"
-                      >
-                        <span
-                          class="title_cell_content"
+                      <div>
+                        <div
+                          class="grid_track_table_cell text_cell title_cell"
+                          data-testid="title-cell"
+                          role="cell"
                         >
                           <span
-                            class="title_cell_value"
-                          >
-                            test track 1
-                          </span>
-                          <span
-                            class="title_cell_buttons"
+                            class="title_cell_content"
                           >
-                            <button
-                              class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
-                              data-testid="add-to-queue"
+                            <span
+                              class="title_cell_value"
                             >
-                              <i
-                                aria-hidden="true"
-                                class="plus icon"
-                              />
-                            </button>
-                            <button
-                              class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
-                              data-testid="track-popup-trigger"
+                              test track 1
+                            </span>
+                            <span
+                              class="title_cell_buttons"
                             >
-                              <i
-                                aria-hidden="true"
-                                class="ellipsis horizontal icon"
-                              />
-                            </button>
+                              <button
+                                class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
+                                data-testid="add-to-queue"
+                              >
+                                <i
+                                  aria-hidden="true"
+                                  class="plus icon"
+                                />
+                              </button>
+                              <button
+                                class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
+                                data-testid="track-popup-trigger"
+                              >
+                                <i
+                                  aria-hidden="true"
+                                  class="ellipsis horizontal icon"
+                                />
+                              </button>
+                            </span>
                           </span>
-                        </span>
+                        </div>
                       </div>
                       <div
                         class="grid_track_table_cell text_cell"
@@ -399,42 +401,44 @@ exports[`Album view container should display an album 1`] = `
                           />
                         </button>
                       </div>
-                      <div
-                        class="grid_track_table_cell text_cell title_cell"
-                        data-testid="title-cell"
-                        role="cell"
-                      >
-                        <span
-                          class="title_cell_content"
+                      <div>
+                        <div
+                          class="grid_track_table_cell text_cell title_cell"
+                          data-testid="title-cell"
+                          role="cell"
                         >
                           <span
-                            class="title_cell_value"
+                            class="title_cell_content"
                           >
-                            test track 2
-                          </span>
-                          <span
-                            class="title_cell_buttons"
-                          >
-                            <button
-                              class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
-                              data-testid="add-to-queue"
+                            <span
+                              class="title_cell_value"
                             >
-                              <i
-                                aria-hidden="true"
-                                class="plus icon"
-                              />
-                            </button>
-                            <button
-                              class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
-                              data-testid="track-popup-trigger"
+                              test track 2
+                            </span>
+                            <span
+                              class="title_cell_buttons"
                             >
-                              <i
-                                aria-hidden="true"
-                                class="ellipsis horizontal icon"
-                              />
-                            </button>
+                              <button
+                                class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
+                                data-testid="add-to-queue"
+                              >
+                                <i
+                                  aria-hidden="true"
+                                  class="plus icon"
+                                />
+                              </button>
+                              <button
+                                class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
+                                data-testid="track-popup-trigger"
+                              >
+                                <i
+                                  aria-hidden="true"
+                                  class="ellipsis horizontal icon"
+                                />
+                              </button>
+                            </span>
                           </span>
-                        </span>
+                        </div>
                       </div>
                       <div
                         class="grid_track_table_cell text_cell"
@@ -506,42 +510,44 @@ exports[`Album view container should display an album 1`] = `
                           />
                         </button>
                       </div>
-                      <div
-                        class="grid_track_table_cell text_cell title_cell"
-                        data-testid="title-cell"
-                        role="cell"
-                      >
-                        <span
-                          class="title_cell_content"
+                      <div>
+                        <div
+                          class="grid_track_table_cell text_cell title_cell"
+                          data-testid="title-cell"
+                          role="cell"
                         >
                           <span
-                            class="title_cell_value"
+                            class="title_cell_content"
                           >
-                            test track 3
-                          </span>
-                          <span
-                            class="title_cell_buttons"
-                          >
-                            <button
-                              class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
-                              data-testid="add-to-queue"
+                            <span
+                              class="title_cell_value"
                             >
-                              <i
-                                aria-hidden="true"
-                                class="plus icon"
-                              />
-                            </button>
-                            <button
-                              class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
-                              data-testid="track-popup-trigger"
+                              test track 3
+                            </span>
+                            <span
+                              class="title_cell_buttons"
                             >
-                              <i
-                                aria-hidden="true"
-                                class="ellipsis horizontal icon"
-                              />
-                            </button>
+                              <button
+                                class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
+                                data-testid="add-to-queue"
+                              >
+                                <i
+                                  aria-hidden="true"
+                                  class="plus icon"
+                                />
+                              </button>
+                              <button
+                                class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
+                                data-testid="track-popup-trigger"
+                              >
+                                <i
+                                  aria-hidden="true"
+                                  class="ellipsis horizontal icon"
+                                />
+                              </button>
+                            </span>
                           </span>
-                        </span>
+                        </div>
                       </div>
                       <div
                         class="grid_track_table_cell text_cell"
diff --git a/packages/app/app/containers/ArtistViewContainer/__snapshots__/ArtistViewContainer.test.tsx.snap b/packages/app/app/containers/ArtistViewContainer/__snapshots__/ArtistViewContainer.test.tsx.snap
index 44fb3e8f53..3aa5096d94 100644
--- a/packages/app/app/containers/ArtistViewContainer/__snapshots__/ArtistViewContainer.test.tsx.snap
+++ b/packages/app/app/containers/ArtistViewContainer/__snapshots__/ArtistViewContainer.test.tsx.snap
@@ -262,42 +262,44 @@ exports[`Artist view container should display an artist 1`] = `
                               />
                             </button>
                           </div>
-                          <div
-                            class="grid_track_table_cell text_cell title_cell"
-                            data-testid="title-cell"
-                            role="cell"
-                          >
-                            <span
-                              class="title_cell_content"
+                          <div>
+                            <div
+                              class="grid_track_table_cell text_cell title_cell"
+                              data-testid="title-cell"
+                              role="cell"
                             >
                               <span
-                                class="title_cell_value"
-                              >
-                                test artist top track 1
-                              </span>
-                              <span
-                                class="title_cell_buttons"
+                                class="title_cell_content"
                               >
-                                <button
-                                  class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
-                                  data-testid="add-to-queue"
+                                <span
+                                  class="title_cell_value"
                                 >
-                                  <i
-                                    aria-hidden="true"
-                                    class="plus icon"
-                                  />
-                                </button>
-                                <button
-                                  class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
-                                  data-testid="track-popup-trigger"
+                                  test artist top track 1
+                                </span>
+                                <span
+                                  class="title_cell_buttons"
                                 >
-                                  <i
-                                    aria-hidden="true"
-                                    class="ellipsis horizontal icon"
-                                  />
-                                </button>
+                                  <button
+                                    class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
+                                    data-testid="add-to-queue"
+                                  >
+                                    <i
+                                      aria-hidden="true"
+                                      class="plus icon"
+                                    />
+                                  </button>
+                                  <button
+                                    class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
+                                    data-testid="track-popup-trigger"
+                                  >
+                                    <i
+                                      aria-hidden="true"
+                                      class="ellipsis horizontal icon"
+                                    />
+                                  </button>
+                                </span>
                               </span>
-                            </span>
+                            </div>
                           </div>
                           <div
                             class="grid_track_table_cell text_cell"
@@ -353,42 +355,44 @@ exports[`Artist view container should display an artist 1`] = `
                               />
                             </button>
                           </div>
-                          <div
-                            class="grid_track_table_cell text_cell title_cell"
-                            data-testid="title-cell"
-                            role="cell"
-                          >
-                            <span
-                              class="title_cell_content"
+                          <div>
+                            <div
+                              class="grid_track_table_cell text_cell title_cell"
+                              data-testid="title-cell"
+                              role="cell"
                             >
                               <span
-                                class="title_cell_value"
+                                class="title_cell_content"
                               >
-                                test artist top track 2
-                              </span>
-                              <span
-                                class="title_cell_buttons"
-                              >
-                                <button
-                                  class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
-                                  data-testid="add-to-queue"
+                                <span
+                                  class="title_cell_value"
                                 >
-                                  <i
-                                    aria-hidden="true"
-                                    class="plus icon"
-                                  />
-                                </button>
-                                <button
-                                  class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
-                                  data-testid="track-popup-trigger"
+                                  test artist top track 2
+                                </span>
+                                <span
+                                  class="title_cell_buttons"
                                 >
-                                  <i
-                                    aria-hidden="true"
-                                    class="ellipsis horizontal icon"
-                                  />
-                                </button>
+                                  <button
+                                    class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
+                                    data-testid="add-to-queue"
+                                  >
+                                    <i
+                                      aria-hidden="true"
+                                      class="plus icon"
+                                    />
+                                  </button>
+                                  <button
+                                    class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
+                                    data-testid="track-popup-trigger"
+                                  >
+                                    <i
+                                      aria-hidden="true"
+                                      class="ellipsis horizontal icon"
+                                    />
+                                  </button>
+                                </span>
                               </span>
-                            </span>
+                            </div>
                           </div>
                           <div
                             class="grid_track_table_cell text_cell"
@@ -444,42 +448,44 @@ exports[`Artist view container should display an artist 1`] = `
                               />
                             </button>
                           </div>
-                          <div
-                            class="grid_track_table_cell text_cell title_cell"
-                            data-testid="title-cell"
-                            role="cell"
-                          >
-                            <span
-                              class="title_cell_content"
+                          <div>
+                            <div
+                              class="grid_track_table_cell text_cell title_cell"
+                              data-testid="title-cell"
+                              role="cell"
                             >
                               <span
-                                class="title_cell_value"
-                              >
-                                test artist top track 3
-                              </span>
-                              <span
-                                class="title_cell_buttons"
+                                class="title_cell_content"
                               >
-                                <button
-                                  class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
-                                  data-testid="add-to-queue"
+                                <span
+                                  class="title_cell_value"
                                 >
-                                  <i
-                                    aria-hidden="true"
-                                    class="plus icon"
-                                  />
-                                </button>
-                                <button
-                                  class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
-                                  data-testid="track-popup-trigger"
+                                  test artist top track 3
+                                </span>
+                                <span
+                                  class="title_cell_buttons"
                                 >
-                                  <i
-                                    aria-hidden="true"
-                                    class="ellipsis horizontal icon"
-                                  />
-                                </button>
+                                  <button
+                                    class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
+                                    data-testid="add-to-queue"
+                                  >
+                                    <i
+                                      aria-hidden="true"
+                                      class="plus icon"
+                                    />
+                                  </button>
+                                  <button
+                                    class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
+                                    data-testid="track-popup-trigger"
+                                  >
+                                    <i
+                                      aria-hidden="true"
+                                      class="ellipsis horizontal icon"
+                                    />
+                                  </button>
+                                </span>
                               </span>
-                            </span>
+                            </div>
                           </div>
                           <div
                             class="grid_track_table_cell text_cell"
diff --git a/packages/app/app/containers/DashboardContainer/__snapshots__/DashboardContainer.test.tsx.snap b/packages/app/app/containers/DashboardContainer/__snapshots__/DashboardContainer.test.tsx.snap
index 2a74d9665a..638932a217 100644
--- a/packages/app/app/containers/DashboardContainer/__snapshots__/DashboardContainer.test.tsx.snap
+++ b/packages/app/app/containers/DashboardContainer/__snapshots__/DashboardContainer.test.tsx.snap
@@ -768,46 +768,47 @@ exports[`Dashboard container should display top tracks after going to top tracks
                             />
                           </button>
                         </div>
-                        <div
-                          class="grid_track_table_cell text_cell title_cell"
-                          data-testid="title-cell"
-                          role="cell"
-                        >
-                          <span
-                            class="title_cell_content"
+                        <div>
+                          <div
+                            class="grid_track_table_cell text_cell title_cell"
+                            data-testid="title-cell"
+                            role="cell"
                           >
                             <span
-                              class="title_cell_value"
+                              class="title_cell_content"
                             >
-                              top track 1
-                            </span>
-                            <span
-                              class="title_cell_buttons"
-                            >
-                              <button
-                                class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
-                                data-testid="add-to-queue"
+                              <span
+                                class="title_cell_value"
                               >
-                                <i
-                                  aria-hidden="true"
-                                  class="plus icon"
-                                />
-                              </button>
-                              <button
-                                class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
-                                data-testid="track-popup-trigger"
+                                top track 1
+                              </span>
+                              <span
+                                class="title_cell_buttons"
                               >
-                                <i
-                                  aria-hidden="true"
-                                  class="ellipsis horizontal icon"
-                                />
-                              </button>
+                                <button
+                                  class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
+                                  data-testid="add-to-queue"
+                                >
+                                  <i
+                                    aria-hidden="true"
+                                    class="plus icon"
+                                  />
+                                </button>
+                                <button
+                                  class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
+                                  data-testid="track-popup-trigger"
+                                >
+                                  <i
+                                    aria-hidden="true"
+                                    class="ellipsis horizontal icon"
+                                  />
+                                </button>
+                              </span>
                             </span>
-                          </span>
+                          </div>
                         </div>
                         <div
                           class="grid_track_table_cell text_cell"
-                          role="cell"
                         >
                           top track artist 1
                         </div>
@@ -885,46 +886,47 @@ exports[`Dashboard container should display top tracks after going to top tracks
                             />
                           </button>
                         </div>
-                        <div
-                          class="grid_track_table_cell text_cell title_cell"
-                          data-testid="title-cell"
-                          role="cell"
-                        >
-                          <span
-                            class="title_cell_content"
+                        <div>
+                          <div
+                            class="grid_track_table_cell text_cell title_cell"
+                            data-testid="title-cell"
+                            role="cell"
                           >
                             <span
-                              class="title_cell_value"
+                              class="title_cell_content"
                             >
-                              top track 2
-                            </span>
-                            <span
-                              class="title_cell_buttons"
-                            >
-                              <button
-                                class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
-                                data-testid="add-to-queue"
+                              <span
+                                class="title_cell_value"
                               >
-                                <i
-                                  aria-hidden="true"
-                                  class="plus icon"
-                                />
-                              </button>
-                              <button
-                                class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
-                                data-testid="track-popup-trigger"
+                                top track 2
+                              </span>
+                              <span
+                                class="title_cell_buttons"
                               >
-                                <i
-                                  aria-hidden="true"
-                                  class="ellipsis horizontal icon"
-                                />
-                              </button>
+                                <button
+                                  class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
+                                  data-testid="add-to-queue"
+                                >
+                                  <i
+                                    aria-hidden="true"
+                                    class="plus icon"
+                                  />
+                                </button>
+                                <button
+                                  class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
+                                  data-testid="track-popup-trigger"
+                                >
+                                  <i
+                                    aria-hidden="true"
+                                    class="ellipsis horizontal icon"
+                                  />
+                                </button>
+                              </span>
                             </span>
-                          </span>
+                          </div>
                         </div>
                         <div
                           class="grid_track_table_cell text_cell"
-                          role="cell"
                         >
                           top track artist 2
                         </div>
diff --git a/packages/app/app/containers/DeezerPlaylistAdapter/__snapshots__/DeezerPlaylistAdapter.test.tsx.snap b/packages/app/app/containers/DeezerPlaylistAdapter/__snapshots__/DeezerPlaylistAdapter.test.tsx.snap
index e904158232..c353d4c2d4 100644
--- a/packages/app/app/containers/DeezerPlaylistAdapter/__snapshots__/DeezerPlaylistAdapter.test.tsx.snap
+++ b/packages/app/app/containers/DeezerPlaylistAdapter/__snapshots__/DeezerPlaylistAdapter.test.tsx.snap
@@ -99,7 +99,7 @@ exports[`Deezer playlist adapter should display a Deezer playlist 1`] = `
               />
             </div>
             <button
-              class="ui blue icon button nuclear button borderless track_table_filter_button"
+              class="ui blue icon button track_table_filter_button"
             >
               <i
                 aria-hidden="true"
@@ -298,46 +298,47 @@ exports[`Deezer playlist adapter should display a Deezer playlist 1`] = `
                         />
                       </button>
                     </div>
-                    <div
-                      class="grid_track_table_cell text_cell title_cell"
-                      data-testid="title-cell"
-                      role="cell"
-                    >
-                      <span
-                        class="title_cell_content"
+                    <div>
+                      <div
+                        class="grid_track_table_cell text_cell title_cell"
+                        data-testid="title-cell"
+                        role="cell"
                       >
                         <span
-                          class="title_cell_value"
+                          class="title_cell_content"
                         >
-                          track 1
-                        </span>
-                        <span
-                          class="title_cell_buttons"
-                        >
-                          <button
-                            class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
-                            data-testid="add-to-queue"
+                          <span
+                            class="title_cell_value"
                           >
-                            <i
-                              aria-hidden="true"
-                              class="plus icon"
-                            />
-                          </button>
-                          <button
-                            class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
-                            data-testid="track-popup-trigger"
+                            track 1
+                          </span>
+                          <span
+                            class="title_cell_buttons"
                           >
-                            <i
-                              aria-hidden="true"
-                              class="ellipsis horizontal icon"
-                            />
-                          </button>
+                            <button
+                              class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
+                              data-testid="add-to-queue"
+                            >
+                              <i
+                                aria-hidden="true"
+                                class="plus icon"
+                              />
+                            </button>
+                            <button
+                              class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
+                              data-testid="track-popup-trigger"
+                            >
+                              <i
+                                aria-hidden="true"
+                                class="ellipsis horizontal icon"
+                              />
+                            </button>
+                          </span>
                         </span>
-                      </span>
+                      </div>
                     </div>
                     <div
                       class="grid_track_table_cell text_cell"
-                      role="cell"
                     >
                       artist 1
                     </div>
@@ -409,46 +410,47 @@ exports[`Deezer playlist adapter should display a Deezer playlist 1`] = `
                         />
                       </button>
                     </div>
-                    <div
-                      class="grid_track_table_cell text_cell title_cell"
-                      data-testid="title-cell"
-                      role="cell"
-                    >
-                      <span
-                        class="title_cell_content"
+                    <div>
+                      <div
+                        class="grid_track_table_cell text_cell title_cell"
+                        data-testid="title-cell"
+                        role="cell"
                       >
                         <span
-                          class="title_cell_value"
+                          class="title_cell_content"
                         >
-                          track 2
-                        </span>
-                        <span
-                          class="title_cell_buttons"
-                        >
-                          <button
-                            class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
-                            data-testid="add-to-queue"
+                          <span
+                            class="title_cell_value"
                           >
-                            <i
-                              aria-hidden="true"
-                              class="plus icon"
-                            />
-                          </button>
-                          <button
-                            class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
-                            data-testid="track-popup-trigger"
+                            track 2
+                          </span>
+                          <span
+                            class="title_cell_buttons"
                           >
-                            <i
-                              aria-hidden="true"
-                              class="ellipsis horizontal icon"
-                            />
-                          </button>
+                            <button
+                              class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
+                              data-testid="add-to-queue"
+                            >
+                              <i
+                                aria-hidden="true"
+                                class="plus icon"
+                              />
+                            </button>
+                            <button
+                              class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
+                              data-testid="track-popup-trigger"
+                            >
+                              <i
+                                aria-hidden="true"
+                                class="ellipsis horizontal icon"
+                              />
+                            </button>
+                          </span>
                         </span>
-                      </span>
+                      </div>
                     </div>
                     <div
                       class="grid_track_table_cell text_cell"
-                      role="cell"
                     >
                       artist 2
                     </div>
diff --git a/packages/app/app/containers/FavoritesContainer/__snapshots__/FavoritesContainer.tracks.test.tsx.snap b/packages/app/app/containers/FavoritesContainer/__snapshots__/FavoritesContainer.tracks.test.tsx.snap
index 94f4eefaee..17aadee9fa 100644
--- a/packages/app/app/containers/FavoritesContainer/__snapshots__/FavoritesContainer.tracks.test.tsx.snap
+++ b/packages/app/app/containers/FavoritesContainer/__snapshots__/FavoritesContainer.tracks.test.tsx.snap
@@ -211,7 +211,7 @@ exports[`Favorite tracks view container should display favorite tracks 1`] = `
               />
             </div>
             <button
-              class="ui blue icon button nuclear button borderless track_table_filter_button"
+              class="ui blue icon button track_table_filter_button"
             >
               <i
                 aria-hidden="true"
@@ -393,46 +393,47 @@ exports[`Favorite tracks view container should display favorite tracks 1`] = `
                       class="grid_track_table_cell thumbnail_cell"
                       role="cell"
                     />
-                    <div
-                      class="grid_track_table_cell text_cell title_cell"
-                      data-testid="title-cell"
-                      role="cell"
-                    >
-                      <span
-                        class="title_cell_content"
+                    <div>
+                      <div
+                        class="grid_track_table_cell text_cell title_cell"
+                        data-testid="title-cell"
+                        role="cell"
                       >
                         <span
-                          class="title_cell_value"
+                          class="title_cell_content"
                         >
-                          test track 2
-                        </span>
-                        <span
-                          class="title_cell_buttons"
-                        >
-                          <button
-                            class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
-                            data-testid="add-to-queue"
+                          <span
+                            class="title_cell_value"
                           >
-                            <i
-                              aria-hidden="true"
-                              class="plus icon"
-                            />
-                          </button>
-                          <button
-                            class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
-                            data-testid="track-popup-trigger"
+                            test track 2
+                          </span>
+                          <span
+                            class="title_cell_buttons"
                           >
-                            <i
-                              aria-hidden="true"
-                              class="ellipsis horizontal icon"
-                            />
-                          </button>
+                            <button
+                              class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
+                              data-testid="add-to-queue"
+                            >
+                              <i
+                                aria-hidden="true"
+                                class="plus icon"
+                              />
+                            </button>
+                            <button
+                              class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
+                              data-testid="track-popup-trigger"
+                            >
+                              <i
+                                aria-hidden="true"
+                                class="ellipsis horizontal icon"
+                              />
+                            </button>
+                          </span>
                         </span>
-                      </span>
+                      </div>
                     </div>
                     <div
                       class="grid_track_table_cell text_cell"
-                      role="cell"
                     >
                       test artist 2
                     </div>
@@ -504,46 +505,47 @@ exports[`Favorite tracks view container should display favorite tracks 1`] = `
                       class="grid_track_table_cell thumbnail_cell"
                       role="cell"
                     />
-                    <div
-                      class="grid_track_table_cell text_cell title_cell"
-                      data-testid="title-cell"
-                      role="cell"
-                    >
-                      <span
-                        class="title_cell_content"
+                    <div>
+                      <div
+                        class="grid_track_table_cell text_cell title_cell"
+                        data-testid="title-cell"
+                        role="cell"
                       >
                         <span
-                          class="title_cell_value"
+                          class="title_cell_content"
                         >
-                          test track 1
-                        </span>
-                        <span
-                          class="title_cell_buttons"
-                        >
-                          <button
-                            class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
-                            data-testid="add-to-queue"
+                          <span
+                            class="title_cell_value"
                           >
-                            <i
-                              aria-hidden="true"
-                              class="plus icon"
-                            />
-                          </button>
-                          <button
-                            class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
-                            data-testid="track-popup-trigger"
+                            test track 1
+                          </span>
+                          <span
+                            class="title_cell_buttons"
                           >
-                            <i
-                              aria-hidden="true"
-                              class="ellipsis horizontal icon"
-                            />
-                          </button>
+                            <button
+                              class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
+                              data-testid="add-to-queue"
+                            >
+                              <i
+                                aria-hidden="true"
+                                class="plus icon"
+                              />
+                            </button>
+                            <button
+                              class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
+                              data-testid="track-popup-trigger"
+                            >
+                              <i
+                                aria-hidden="true"
+                                class="ellipsis horizontal icon"
+                              />
+                            </button>
+                          </span>
                         </span>
-                      </span>
+                      </div>
                     </div>
                     <div
                       class="grid_track_table_cell text_cell"
-                      role="cell"
                     >
                       test artist 1
                     </div>
@@ -766,7 +768,7 @@ exports[`Favorite tracks view container should show a popup when a track is clic
               />
             </div>
             <button
-              class="ui blue icon button nuclear button borderless track_table_filter_button"
+              class="ui blue icon button track_table_filter_button"
             >
               <i
                 aria-hidden="true"
@@ -948,46 +950,47 @@ exports[`Favorite tracks view container should show a popup when a track is clic
                       class="grid_track_table_cell thumbnail_cell"
                       role="cell"
                     />
-                    <div
-                      class="grid_track_table_cell text_cell title_cell"
-                      data-testid="title-cell"
-                      role="cell"
-                    >
-                      <span
-                        class="title_cell_content"
+                    <div>
+                      <div
+                        class="grid_track_table_cell text_cell title_cell"
+                        data-testid="title-cell"
+                        role="cell"
                       >
                         <span
-                          class="title_cell_value"
+                          class="title_cell_content"
                         >
-                          test track 2
-                        </span>
-                        <span
-                          class="title_cell_buttons"
-                        >
-                          <button
-                            class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
-                            data-testid="add-to-queue"
+                          <span
+                            class="title_cell_value"
                           >
-                            <i
-                              aria-hidden="true"
-                              class="plus icon"
-                            />
-                          </button>
-                          <button
-                            class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
-                            data-testid="track-popup-trigger"
+                            test track 2
+                          </span>
+                          <span
+                            class="title_cell_buttons"
                           >
-                            <i
-                              aria-hidden="true"
-                              class="ellipsis horizontal icon"
-                            />
-                          </button>
+                            <button
+                              class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
+                              data-testid="add-to-queue"
+                            >
+                              <i
+                                aria-hidden="true"
+                                class="plus icon"
+                              />
+                            </button>
+                            <button
+                              class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
+                              data-testid="track-popup-trigger"
+                            >
+                              <i
+                                aria-hidden="true"
+                                class="ellipsis horizontal icon"
+                              />
+                            </button>
+                          </span>
                         </span>
-                      </span>
+                      </div>
                     </div>
                     <div
                       class="grid_track_table_cell text_cell"
-                      role="cell"
                     >
                       test artist 2
                     </div>
@@ -1059,46 +1062,47 @@ exports[`Favorite tracks view container should show a popup when a track is clic
                       class="grid_track_table_cell thumbnail_cell"
                       role="cell"
                     />
-                    <div
-                      class="grid_track_table_cell text_cell title_cell"
-                      data-testid="title-cell"
-                      role="cell"
-                    >
-                      <span
-                        class="title_cell_content"
+                    <div>
+                      <div
+                        class="grid_track_table_cell text_cell title_cell"
+                        data-testid="title-cell"
+                        role="cell"
                       >
                         <span
-                          class="title_cell_value"
+                          class="title_cell_content"
                         >
-                          test track 1
-                        </span>
-                        <span
-                          class="title_cell_buttons"
-                        >
-                          <button
-                            class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
-                            data-testid="add-to-queue"
+                          <span
+                            class="title_cell_value"
                           >
-                            <i
-                              aria-hidden="true"
-                              class="plus icon"
-                            />
-                          </button>
-                          <button
-                            class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
-                            data-testid="track-popup-trigger"
+                            test track 1
+                          </span>
+                          <span
+                            class="title_cell_buttons"
                           >
-                            <i
-                              aria-hidden="true"
-                              class="ellipsis horizontal icon"
-                            />
-                          </button>
+                            <button
+                              class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
+                              data-testid="add-to-queue"
+                            >
+                              <i
+                                aria-hidden="true"
+                                class="plus icon"
+                              />
+                            </button>
+                            <button
+                              class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
+                              data-testid="track-popup-trigger"
+                            >
+                              <i
+                                aria-hidden="true"
+                                class="ellipsis horizontal icon"
+                              />
+                            </button>
+                          </span>
                         </span>
-                      </span>
+                      </div>
                     </div>
                     <div
                       class="grid_track_table_cell text_cell"
-                      role="cell"
                     >
                       test artist 1
                     </div>
diff --git a/packages/app/app/containers/LibraryViewContainer/__snapshots__/LibraryViewContainer.test.tsx.snap b/packages/app/app/containers/LibraryViewContainer/__snapshots__/LibraryViewContainer.test.tsx.snap
index 183bfd3c3b..df0e90f846 100644
--- a/packages/app/app/containers/LibraryViewContainer/__snapshots__/LibraryViewContainer.test.tsx.snap
+++ b/packages/app/app/containers/LibraryViewContainer/__snapshots__/LibraryViewContainer.test.tsx.snap
@@ -1020,46 +1020,47 @@ exports[`Library view container should display local library in simple list mode
                         class="grid_track_table_cell thumbnail_cell"
                         role="cell"
                       />
-                      <div
-                        class="grid_track_table_cell text_cell title_cell"
-                        data-testid="title-cell"
-                        role="cell"
-                      >
-                        <span
-                          class="title_cell_content"
+                      <div>
+                        <div
+                          class="grid_track_table_cell text_cell title_cell"
+                          data-testid="title-cell"
+                          role="cell"
                         >
                           <span
-                            class="title_cell_value"
+                            class="title_cell_content"
                           >
-                            local track 1
-                          </span>
-                          <span
-                            class="title_cell_buttons"
-                          >
-                            <button
-                              class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
-                              data-testid="add-to-queue"
+                            <span
+                              class="title_cell_value"
                             >
-                              <i
-                                aria-hidden="true"
-                                class="plus icon"
-                              />
-                            </button>
-                            <button
-                              class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
-                              data-testid="track-popup-trigger"
+                              local track 1
+                            </span>
+                            <span
+                              class="title_cell_buttons"
                             >
-                              <i
-                                aria-hidden="true"
-                                class="ellipsis horizontal icon"
-                              />
-                            </button>
+                              <button
+                                class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
+                                data-testid="add-to-queue"
+                              >
+                                <i
+                                  aria-hidden="true"
+                                  class="plus icon"
+                                />
+                              </button>
+                              <button
+                                class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
+                                data-testid="track-popup-trigger"
+                              >
+                                <i
+                                  aria-hidden="true"
+                                  class="ellipsis horizontal icon"
+                                />
+                              </button>
+                            </span>
                           </span>
-                        </span>
+                        </div>
                       </div>
                       <div
                         class="grid_track_table_cell text_cell"
-                        role="cell"
                       >
                         local artist 1
                       </div>
@@ -1128,46 +1129,47 @@ exports[`Library view container should display local library in simple list mode
                         class="grid_track_table_cell thumbnail_cell"
                         role="cell"
                       />
-                      <div
-                        class="grid_track_table_cell text_cell title_cell"
-                        data-testid="title-cell"
-                        role="cell"
-                      >
-                        <span
-                          class="title_cell_content"
+                      <div>
+                        <div
+                          class="grid_track_table_cell text_cell title_cell"
+                          data-testid="title-cell"
+                          role="cell"
                         >
                           <span
-                            class="title_cell_value"
+                            class="title_cell_content"
                           >
-                            local track 2
-                          </span>
-                          <span
-                            class="title_cell_buttons"
-                          >
-                            <button
-                              class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
-                              data-testid="add-to-queue"
+                            <span
+                              class="title_cell_value"
                             >
-                              <i
-                                aria-hidden="true"
-                                class="plus icon"
-                              />
-                            </button>
-                            <button
-                              class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
-                              data-testid="track-popup-trigger"
+                              local track 2
+                            </span>
+                            <span
+                              class="title_cell_buttons"
                             >
-                              <i
-                                aria-hidden="true"
-                                class="ellipsis horizontal icon"
-                              />
-                            </button>
+                              <button
+                                class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
+                                data-testid="add-to-queue"
+                              >
+                                <i
+                                  aria-hidden="true"
+                                  class="plus icon"
+                                />
+                              </button>
+                              <button
+                                class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
+                                data-testid="track-popup-trigger"
+                              >
+                                <i
+                                  aria-hidden="true"
+                                  class="ellipsis horizontal icon"
+                                />
+                              </button>
+                            </span>
                           </span>
-                        </span>
+                        </div>
                       </div>
                       <div
                         class="grid_track_table_cell text_cell"
-                        role="cell"
                       >
                         local artist 1
                       </div>
@@ -1236,46 +1238,47 @@ exports[`Library view container should display local library in simple list mode
                         class="grid_track_table_cell thumbnail_cell"
                         role="cell"
                       />
-                      <div
-                        class="grid_track_table_cell text_cell title_cell"
-                        data-testid="title-cell"
-                        role="cell"
-                      >
-                        <span
-                          class="title_cell_content"
+                      <div>
+                        <div
+                          class="grid_track_table_cell text_cell title_cell"
+                          data-testid="title-cell"
+                          role="cell"
                         >
                           <span
-                            class="title_cell_value"
-                          >
-                            local track 3
-                          </span>
-                          <span
-                            class="title_cell_buttons"
+                            class="title_cell_content"
                           >
-                            <button
-                              class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
-                              data-testid="add-to-queue"
+                            <span
+                              class="title_cell_value"
                             >
-                              <i
-                                aria-hidden="true"
-                                class="plus icon"
-                              />
-                            </button>
-                            <button
-                              class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
-                              data-testid="track-popup-trigger"
+                              local track 3
+                            </span>
+                            <span
+                              class="title_cell_buttons"
                             >
-                              <i
-                                aria-hidden="true"
-                                class="ellipsis horizontal icon"
-                              />
-                            </button>
+                              <button
+                                class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
+                                data-testid="add-to-queue"
+                              >
+                                <i
+                                  aria-hidden="true"
+                                  class="plus icon"
+                                />
+                              </button>
+                              <button
+                                class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
+                                data-testid="track-popup-trigger"
+                              >
+                                <i
+                                  aria-hidden="true"
+                                  class="ellipsis horizontal icon"
+                                />
+                              </button>
+                            </span>
                           </span>
-                        </span>
+                        </div>
                       </div>
                       <div
                         class="grid_track_table_cell text_cell"
-                        role="cell"
                       >
                         local artist 2
                       </div>
diff --git a/packages/app/app/containers/PlaylistViewContainer/__snapshots__/PlaylistViewContainer.test.tsx.snap b/packages/app/app/containers/PlaylistViewContainer/__snapshots__/PlaylistViewContainer.test.tsx.snap
index f18beda0d3..a7af1b2b50 100644
--- a/packages/app/app/containers/PlaylistViewContainer/__snapshots__/PlaylistViewContainer.test.tsx.snap
+++ b/packages/app/app/containers/PlaylistViewContainer/__snapshots__/PlaylistViewContainer.test.tsx.snap
@@ -102,7 +102,7 @@ exports[`Playlist view container should display a playlist 1`] = `
               />
             </div>
             <button
-              class="ui blue icon button nuclear button borderless track_table_filter_button"
+              class="ui blue icon button track_table_filter_button"
             >
               <i
                 aria-hidden="true"
@@ -312,46 +312,47 @@ exports[`Playlist view container should display a playlist 1`] = `
                         />
                       </button>
                     </div>
-                    <div
-                      class="grid_track_table_cell text_cell title_cell"
-                      data-testid="title-cell"
-                      role="cell"
-                    >
-                      <span
-                        class="title_cell_content"
+                    <div>
+                      <div
+                        class="grid_track_table_cell text_cell title_cell"
+                        data-testid="title-cell"
+                        role="cell"
                       >
                         <span
-                          class="title_cell_value"
+                          class="title_cell_content"
                         >
-                          test track
-                        </span>
-                        <span
-                          class="title_cell_buttons"
-                        >
-                          <button
-                            class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
-                            data-testid="add-to-queue"
+                          <span
+                            class="title_cell_value"
                           >
-                            <i
-                              aria-hidden="true"
-                              class="plus icon"
-                            />
-                          </button>
-                          <button
-                            class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
-                            data-testid="track-popup-trigger"
+                            test track
+                          </span>
+                          <span
+                            class="title_cell_buttons"
                           >
-                            <i
-                              aria-hidden="true"
-                              class="ellipsis horizontal icon"
-                            />
-                          </button>
+                            <button
+                              class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
+                              data-testid="add-to-queue"
+                            >
+                              <i
+                                aria-hidden="true"
+                                class="plus icon"
+                              />
+                            </button>
+                            <button
+                              class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
+                              data-testid="track-popup-trigger"
+                            >
+                              <i
+                                aria-hidden="true"
+                                class="ellipsis horizontal icon"
+                              />
+                            </button>
+                          </span>
                         </span>
-                      </span>
+                      </div>
                     </div>
                     <div
                       class="grid_track_table_cell text_cell"
-                      role="cell"
                     >
                       test artist 1
                     </div>
@@ -442,46 +443,47 @@ exports[`Playlist view container should display a playlist 1`] = `
                         />
                       </button>
                     </div>
-                    <div
-                      class="grid_track_table_cell text_cell title_cell"
-                      data-testid="title-cell"
-                      role="cell"
-                    >
-                      <span
-                        class="title_cell_content"
+                    <div>
+                      <div
+                        class="grid_track_table_cell text_cell title_cell"
+                        data-testid="title-cell"
+                        role="cell"
                       >
                         <span
-                          class="title_cell_value"
+                          class="title_cell_content"
                         >
-                          test track 22
-                        </span>
-                        <span
-                          class="title_cell_buttons"
-                        >
-                          <button
-                            class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
-                            data-testid="add-to-queue"
+                          <span
+                            class="title_cell_value"
                           >
-                            <i
-                              aria-hidden="true"
-                              class="plus icon"
-                            />
-                          </button>
-                          <button
-                            class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
-                            data-testid="track-popup-trigger"
+                            test track 22
+                          </span>
+                          <span
+                            class="title_cell_buttons"
                           >
-                            <i
-                              aria-hidden="true"
-                              class="ellipsis horizontal icon"
-                            />
-                          </button>
+                            <button
+                              class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
+                              data-testid="add-to-queue"
+                            >
+                              <i
+                                aria-hidden="true"
+                                class="plus icon"
+                              />
+                            </button>
+                            <button
+                              class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
+                              data-testid="track-popup-trigger"
+                            >
+                              <i
+                                aria-hidden="true"
+                                class="ellipsis horizontal icon"
+                              />
+                            </button>
+                          </span>
                         </span>
-                      </span>
+                      </div>
                     </div>
                     <div
                       class="grid_track_table_cell text_cell"
-                      role="cell"
                     >
                       test artist 2
                     </div>
diff --git a/packages/app/app/containers/SpotifyPlaylistAdapter/__snapshots__/SpotifyPlaylistAdapter.test.tsx.snap b/packages/app/app/containers/SpotifyPlaylistAdapter/__snapshots__/SpotifyPlaylistAdapter.test.tsx.snap
index 35343f310d..dadf695a7b 100644
--- a/packages/app/app/containers/SpotifyPlaylistAdapter/__snapshots__/SpotifyPlaylistAdapter.test.tsx.snap
+++ b/packages/app/app/containers/SpotifyPlaylistAdapter/__snapshots__/SpotifyPlaylistAdapter.test.tsx.snap
@@ -99,7 +99,7 @@ exports[`Spotfiy playlist adapter should display a Spotify playlist 1`] = `
               />
             </div>
             <button
-              class="ui blue icon button nuclear button borderless track_table_filter_button"
+              class="ui blue icon button track_table_filter_button"
             >
               <i
                 aria-hidden="true"
@@ -311,46 +311,47 @@ exports[`Spotfiy playlist adapter should display a Spotify playlist 1`] = `
                         />
                       </button>
                     </div>
-                    <div
-                      class="grid_track_table_cell text_cell title_cell"
-                      data-testid="title-cell"
-                      role="cell"
-                    >
-                      <span
-                        class="title_cell_content"
+                    <div>
+                      <div
+                        class="grid_track_table_cell text_cell title_cell"
+                        data-testid="title-cell"
+                        role="cell"
                       >
                         <span
-                          class="title_cell_value"
+                          class="title_cell_content"
                         >
-                          Test track
-                        </span>
-                        <span
-                          class="title_cell_buttons"
-                        >
-                          <button
-                            class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
-                            data-testid="add-to-queue"
+                          <span
+                            class="title_cell_value"
                           >
-                            <i
-                              aria-hidden="true"
-                              class="plus icon"
-                            />
-                          </button>
-                          <button
-                            class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
-                            data-testid="track-popup-trigger"
+                            Test track
+                          </span>
+                          <span
+                            class="title_cell_buttons"
                           >
-                            <i
-                              aria-hidden="true"
-                              class="ellipsis horizontal icon"
-                            />
-                          </button>
+                            <button
+                              class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
+                              data-testid="add-to-queue"
+                            >
+                              <i
+                                aria-hidden="true"
+                                class="plus icon"
+                              />
+                            </button>
+                            <button
+                              class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
+                              data-testid="track-popup-trigger"
+                            >
+                              <i
+                                aria-hidden="true"
+                                class="ellipsis horizontal icon"
+                              />
+                            </button>
+                          </span>
                         </span>
-                      </span>
+                      </div>
                     </div>
                     <div
                       class="grid_track_table_cell text_cell"
-                      role="cell"
                     >
                       Test artist
                     </div>
@@ -428,46 +429,47 @@ exports[`Spotfiy playlist adapter should display a Spotify playlist 1`] = `
                         />
                       </button>
                     </div>
-                    <div
-                      class="grid_track_table_cell text_cell title_cell"
-                      data-testid="title-cell"
-                      role="cell"
-                    >
-                      <span
-                        class="title_cell_content"
+                    <div>
+                      <div
+                        class="grid_track_table_cell text_cell title_cell"
+                        data-testid="title-cell"
+                        role="cell"
                       >
                         <span
-                          class="title_cell_value"
+                          class="title_cell_content"
                         >
-                          Another test track
-                        </span>
-                        <span
-                          class="title_cell_buttons"
-                        >
-                          <button
-                            class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
-                            data-testid="add-to-queue"
+                          <span
+                            class="title_cell_value"
                           >
-                            <i
-                              aria-hidden="true"
-                              class="plus icon"
-                            />
-                          </button>
-                          <button
-                            class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
-                            data-testid="track-popup-trigger"
+                            Another test track
+                          </span>
+                          <span
+                            class="title_cell_buttons"
                           >
-                            <i
-                              aria-hidden="true"
-                              class="ellipsis horizontal icon"
-                            />
-                          </button>
+                            <button
+                              class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
+                              data-testid="add-to-queue"
+                            >
+                              <i
+                                aria-hidden="true"
+                                class="plus icon"
+                              />
+                            </button>
+                            <button
+                              class="ui tiny basic circular icon button nuclear button borderless title_cell_button"
+                              data-testid="track-popup-trigger"
+                            >
+                              <i
+                                aria-hidden="true"
+                                class="ellipsis horizontal icon"
+                              />
+                            </button>
+                          </span>
                         </span>
-                      </span>
+                      </div>
                     </div>
                     <div
                       class="grid_track_table_cell text_cell"
-                      role="cell"
                     >
                       Another test artist
                     </div>